44 files changed, 14 insertions, 143 deletions
diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp
index 4356d59893..1a2177a73a 100644
--- a/plugins/Clist_modern/src/cluiframes.cpp
+++ b/plugins/Clist_modern/src/cluiframes.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "m_skin_eng.h"
-#include "modern_commonprototypes.h"
 #include "modern_sync.h"
 
 // ALL THIS MODULE FUNCTION SHOULD BE EXECUTED FROM MAIN THREAD
diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp
index 61c606bd4c..0c33a8b972 100644
--- a/plugins/Clist_modern/src/groupmenu.cpp
+++ b/plugins/Clist_modern/src/groupmenu.cpp
@@ -21,9 +21,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_clc.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////         Group MENU          //////////////////////////////
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 49ed1febea..0ddd291b3a 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -22,9 +22,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
 #include "stdafx.h"
-#include "modern_commonprototypes.h"
 #include "version.h"
 
 #include "modern_clui.h"
diff --git a/plugins/Clist_modern/src/modern_cache_funcs.h b/plugins/Clist_modern/src/modern_cache_funcs.h
index c7316308c2..6e5a7c082b 100644
--- a/plugins/Clist_modern/src/modern_cache_funcs.h
+++ b/plugins/Clist_modern/src/modern_cache_funcs.h
@@ -29,9 +29,6 @@ Created by Pescuma
 #ifndef __CACHE_FUNCS_H__
 # define __CACHE_FUNCS_H__
 
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
-
 void Cache_GetText(ClcData *dat, ClcContact *contact);
 void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact);
 void Cache_GetNthLineText(ClcData *dat, ClcCacheEntry *pdnce, int n);
diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp
index 59f54be0f7..58d61c52bd 100644
--- a/plugins/Clist_modern/src/modern_cachefuncs.cpp
+++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp
@@ -29,8 +29,6 @@ Modified by FYR
 // Module for working with lines text and avatars
 
 #include "stdafx.h"
-#include "modern_cache_funcs.h"
-#include "newpluginapi.h"
 #include "modern_sync.h"
 
 typedef BOOL(*ExecuteOnAllContactsFuncPtr) (ClcContact *contact, BOOL subcontact, void *param);
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 7c7fa0815a..34b0e84474 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -27,15 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /************************************************************************/
 
 #include "stdafx.h"
-#include "m_skin.h"
-#include "modern_commonprototypes.h"
-
-#include "modern_clc.h"
-#include "modern_clist.h"
 #include "modern_clcpaint.h"
 
-#include "m_modernopt.h"
-
 int ModernOptInit(WPARAM wParam, LPARAM lParam);
 int ModernSkinOptInit(WPARAM wParam, LPARAM lParam);
 
diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index 6a34f47988..f5908e29c4 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -29,9 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "modern_image_array.h"
 #include "m_xpTheme.h"
 
-#include "modern_defsettings.h"
-#include "modern_clist.h"
-
 // ����� ������ ��������.
 #define TRAY_ICON_MODE_GLOBAL		1
 #define TRAY_ICON_MODE_ACC			2
diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp
index 3b0a0090a7..d22ac3a75f 100644
--- a/plugins/Clist_modern/src/modern_clcidents.cpp
+++ b/plugins/Clist_modern/src/modern_clcidents.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
 
 /* the CLC uses 3 different ways to identify elements in its list, this file
 contains routines to convert between them.
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 4c9e685e2f..eee821e4d1 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_clist.h"
-#include "m_metacontacts.h"
-#include "modern_commonprototypes.h"
 
 void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
 {
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 8a654ba13f..5e372e365d 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
 //processing of all the CLM_ messages incoming
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 78d275012f..81c4142a91 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -23,13 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
-#include "modern_defsettings.h"
 #include "modern_effectenum.h"
 #include "modern_sync.h"
-#include <m_modernopt.h>
-#include "m_fontservice.h"
 
 #pragma comment(lib, "shlwapi.lib")
 
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 8f1e6d7563..c1c3176790 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -23,11 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-
-#include "modern_clc.h"
-#include "modern_skinengine.h"
-#include "modern_commonprototypes.h"
-#include "modern_row.h"
 #include "modern_clcpaint.h"
 
 CLCPaint g_clcPainter;
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index d6e132edff..c172e89ed1 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
-#include "modern_defsettings.h"
 
 //loads of stuff that didn't really fit anywhere else
 
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index bca83d69db..9fc3867367 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 #include "modern_clcpaint.h"
 
 /**************************************************/
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index 027da4c262..7c0108265e 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "m_genmenu.h"
-#include "modern_commonprototypes.h"
 
 int LoadFavoriteContactMenu();
 
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index 2377f671e9..fe2f583a82 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -23,11 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 #include "modern_sync.h"
 #include "modern_clui.h"
-#include <m_modernopt.h>
 
 int OnLoadLangpack(WPARAM, LPARAM);
 int UnloadFavoriteContactMenu();
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 29dcd0b5de..f918d50773 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "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 0c6ff8b492..4a5013b7c2 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 #include "modern_awaymsg.h"
 
 void InsertContactIntoTree(MCONTACT hContact, int status);
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index 3b713f0f01..6ab0f4926f 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -23,10 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 #include "modern_statusbar.h"
-#include <m_protoint.h>
 
 int g_mutex_bOnTrayRightClick = 0;
 BOOL g_bMultiConnectionMode = FALSE;
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index d2d3919cc2..74ff3c3c80 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -24,12 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-#include "m_skinbutton.h"
-#include "modern_skinengine.h"
-#include "modern_statusbar.h"
-
 #include "modern_static_clui.h"
-#include <locale.h>
 #include "modern_clcpaint.h"
 #include "modern_sync.h"
 
diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index e43ede7807..a15cbbab14 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_commonprototypes.h"
 
 INT_PTR CListTray_GetGlobalStatus(WPARAM wparam, LPARAM lparam);
 
diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h
index 78261efc32..d6f5af45df 100644
--- a/plugins/Clist_modern/src/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/modern_commonprototypes.h
@@ -3,18 +3,6 @@
 #ifndef _COMMONPROTOTYPES
 #define _COMMONPROTOTYPES
 
-#ifndef commonheaders_h__
-#error "stdafx.h have to be including first"
-#endif
-
-#include "stdafx.h"  //TO DO: Move contents of this file to commonheaders.h
-#include "modern_clist.h"
-#include "cluiframes.h"
-#include "modern_row.h"
-#include "modern_skinengine.h"
-#include "modern_skinselector.h"
-#include "modern_statusbar.h"
-
 #define SKIN  "ModernSkin"
 
 extern PLUGININFOEX pluginInfo;
diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 36efba43c6..71753c5aee 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 
 struct
 {
diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp
index 0f74245412..2eedbe2a50 100644
--- a/plugins/Clist_modern/src/modern_docking.cpp
+++ b/plugins/Clist_modern/src/modern_docking.cpp
@@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "m_skin_eng.h"
-#include "m_skinbutton.h"
-#include "modern_commonprototypes.h"
 #include "modern_sync.h"
 
 #define WM_DOCKCALLBACK   (WM_USER+121)
diff --git a/plugins/Clist_modern/src/modern_image_array.cpp b/plugins/Clist_modern/src/modern_image_array.cpp
index af9fe4684d..011d51a974 100644
--- a/plugins/Clist_modern/src/modern_image_array.cpp
+++ b/plugins/Clist_modern/src/modern_image_array.cpp
@@ -26,7 +26,6 @@ Created by Pescuma
 
 #include "stdafx.h"
 #include "modern_image_array.h"
-#include "modern_commonprototypes.h"
 
 #pragma comment(lib, "msimg32.lib")
 
diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp
index 5850aa616f..d55326fee4 100644
--- a/plugins/Clist_modern/src/modern_keyboard.cpp
+++ b/plugins/Clist_modern/src/modern_keyboard.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include <m_hotkeys.h>
 
 int InitSkinHotKeys(void);
 
diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp
index 3dcaf80782..159698e21a 100644
--- a/plugins/Clist_modern/src/modern_newrowopts.cpp
+++ b/plugins/Clist_modern/src/modern_newrowopts.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 #include "stdafx.h"
-#include "modern_clist.h"
 
 #define EMPTY_PLACE 255
 #define COLUMNS_PLACE 254
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp
index 998c3fe3e3..6ec51077f7 100644
--- a/plugins/Clist_modern/src/modern_row.cpp
+++ b/plugins/Clist_modern/src/modern_row.cpp
@@ -26,29 +26,10 @@ Created by Anton Senko aka ZORG , tweaked by Artem Shpynov aka FYR
 
 #include "stdafx.h"
 
-/*
-#include <windows.h>
-#include <commctrl.h>
-#include <stdio.h>
-#include <time.h>
-#include <stddef.h>
-#include <process.h>
-#include <io.h>
-#include <string.h>
-#include <direct.h>
-#include "resource.h"
-#include "stdafx.h"
-*/
-#include "modern_row.h"
-
-//Futher declaration
 void rowCalculateMinSize(ROWCELL* cell);
 void rowEqualize(ROWCELL* cell);
 void rowResetEmptyRects(ROWCELL* cell);
 void rowDeleteTree(ROWCELL* cell);
-////////
-
-
 
 //extern ROWCELL * gl_RowRoot;	// ��������� �� �������� ���  < contact> � �������
 //ROWOBJECTS RowTA;				// ���������, ����� ������� �������������� ������ � ��������� ��������.
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 7a09e62960..a71a40ba8e 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -25,9 +25,6 @@ Created by Pescuma, modified by Artem Shpynov
 */
 
 #include "stdafx.h"
-#include "modern_rowheight_funcs.h"
-#include "modern_commonprototypes.h"
-#include "modern_row.h"
 #include "modern_clcpaint.h"
 
 int g_mutex_nCalcRowHeightLock = 0;
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.h b/plugins/Clist_modern/src/modern_rowheight_funcs.h
index 86f8842dd5..31eeb5671e 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.h
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.h
@@ -29,14 +29,10 @@ Created by Pescuma
 #ifndef __ROWHEIGHT_FUNCS_H__
 # define __ROWHEIGHT_FUNCS_H__
 
-#include "modern_clc.h"
-
 #define ROW_SPACE_BEETWEEN_LINES 2
 #define ICON_HEIGHT 16
 #define ICON_WIDTH	16
 
-
-
 BOOL RowHeights_Initialize(ClcData *dat);
 void RowHeights_Free(ClcData *dat);
 void RowHeights_Clear(ClcData *dat);
diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
index 32efaf7636..097d889042 100644
--- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
+++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
-#include "modern_row.h"
 
 void RefreshTree(HWND hwndDlg, HTREEITEM hti);
 static char* rowOptTmplStr;
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index cae8335e4b..a57e469d8f 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -27,9 +27,7 @@ This file contains code related to new modern free positioned skinned buttons
 */
 
 #include "stdafx.h"
-#include "modern_skinengine.h"
 #include "modern_clcpaint.h"
-#include "m_skinbutton.h"
 
 #define MODERNSKINBUTTONCLASS "MirandaModernSkinButtonClass"
 BOOL ModernSkinButtonModuleIsLoaded = FALSE;
diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp
index bbbc605293..53c2e75153 100644
--- a/plugins/Clist_modern/src/modern_skinengine.cpp
+++ b/plugins/Clist_modern/src/modern_skinengine.cpp
@@ -24,16 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //Include
 #include "stdafx.h"
-#include "m_skin_eng.h"
-#include "modern_skinselector.h"
-#include "cluiframes.h"
 
 #define _EFFECTENUM_FULL_H
 #include "modern_effectenum.h"
 #undef _EFFECTENUM_FULL_H
 
-#include "modern_skinengine.h"
-#include "modern_commonprototypes.h"
 #include "modern_sync.h"
 
 //Implementation
diff --git a/plugins/Clist_modern/src/modern_skinengine.h b/plugins/Clist_modern/src/modern_skinengine.h
index 710b8d2789..7a165081fc 100644
--- a/plugins/Clist_modern/src/modern_skinengine.h
+++ b/plugins/Clist_modern/src/modern_skinengine.h
@@ -3,9 +3,6 @@
 #ifndef ske_H_INC
 #define ske_H_INC
 
-#include "modern_skinselector.h"
-#include "modern_commonprototypes.h"
-
 /* Definitions */
 #define GetAValue(argb)((BYTE)((argb)>>24))
 
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 9977a7e503..138b229cf3 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -23,8 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clist.h"
-#include "modern_commonprototypes.h"
 #include "modern_sync.h"
 
 /*******************************/
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index 26fd11ec91..09fbd5b350 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -26,11 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //#include "windows.h"
 #include "stdafx.h"
-#include "modern_skinselector.h"
-#include "modern_skinengine.h"
-#include "m_skin_eng.h"
-#include "m_skinbutton.h"
-#include "modern_commonprototypes.h"
 
 /// IMPLEMENTATIONS
 
diff --git a/plugins/Clist_modern/src/modern_skinselector.h b/plugins/Clist_modern/src/modern_skinselector.h
index 984d4b895a..76f39f6ba9 100644
--- a/plugins/Clist_modern/src/modern_skinselector.h
+++ b/plugins/Clist_modern/src/modern_skinselector.h
@@ -26,9 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef M_MOD_SKIN_SELECTOR_H_INC
 #define M_MOD_SKIN_SELECTOR_H_INC
 
-#include "newpluginapi.h"
-#include "stdafx.h"
-
 #define MAXVALUE 20
 
 #define MPF_EQUAL		1
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 20d96b08fc..95a4658dc2 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "modern_statusbar.h"
 #include "m_skin_eng.h"
-#include "modern_commonprototypes.h"
 #include "modern_clcpaint.h"
 #include "modern_sync.h"
 
diff --git a/plugins/Clist_modern/src/modern_statusbar.h b/plugins/Clist_modern/src/modern_statusbar.h
index 2ac385b6d4..5687c10c5b 100644
--- a/plugins/Clist_modern/src/modern_statusbar.h
+++ b/plugins/Clist_modern/src/modern_statusbar.h
@@ -3,7 +3,6 @@
 #ifndef modern_statusbar_h__
 #define modern_statusbar_h__
 
-#include "modern_commonprototypes.h"
 #include "m_xpTheme.h"
 
 int ModernDrawStatusBar(HWND hwnd, HDC hDC);
diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp
index 7f48339848..f9b4441bdc 100644
--- a/plugins/Clist_modern/src/modern_statusbar_options.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_clc.h"
-#include "modern_commonprototypes.h"
-#include "modern_defsettings.h"
 
 typedef struct _StatusBarProtocolOptions
 {
diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index decbcd621e..c36cfdf1a5 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "modern_commonprototypes.h"
 #include "m_skinbutton.h"
 #include "modern_clcpaint.h"
 
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 1b30ebbd09..25678f1b6c 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "stdafx.h"
-#include "modern_commonprototypes.h"
 #include "m_skinbutton.h"
 #include <m_toptoolbar.h>
 #include "modern_sync.h"
diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp
index a135642061..69c49e8a6b 100644
--- a/plugins/Clist_modern/src/modern_xptheme.cpp
+++ b/plugins/Clist_modern/src/modern_xptheme.cpp
@@ -1,5 +1,4 @@
 #include "stdafx.h"
-#include "modern_commonprototypes.h"
 #include "m_xpTheme.h"
 
 
diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h
index 196d825723..b8d2006b04 100644
--- a/plugins/Clist_modern/src/stdafx.h
+++ b/plugins/Clist_modern/src/stdafx.h
@@ -81,17 +81,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_protosvc.h>
 #include <m_clist.h>
 #include <m_skin.h>
+#include <m_skin_eng.h>
+#include <m_skinbutton.h>
 #include <m_contacts.h>
 #include <m_avatars.h>
 #include <m_icolib.h>
 #include <m_fontservice.h>
+#include <m_hotkeys.h>
+#include <m_metacontacts.h>
 #include <m_timezones.h>
 #include <m_extraicons.h>
 #include <m_xstatus.h>
 #include <m_cluiframes.h>
+#include <m_protoint.h>
 #include <m_modernopt.h>
 #include <m_netlib.h>
-
 #include <m_toptoolbar.h>
 #include <m_metacontacts.h>
 #include <m_variables.h>
@@ -99,12 +103,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_folders.h>
 
 #include "modern_global_structure.h"
-#include "modern_clc.h"
+#include "modern_defsettings.h"
 #include "modern_clist.h"
+#include "modern_clc.h"
+#include "modern_row.h"
+#include "modern_skinselector.h"
+#include "modern_skinengine.h"
+#include "modern_statusbar.h"
 #include "cluiframes.h"
+#include "modern_commonprototypes.h"
 #include "modern_rowheight_funcs.h"
 #include "modern_cache_funcs.h"
 #include "modern_log.h"
+
 #include "resource.h"
 
 #define DEFAULT_SKIN_FOLDER		"Skins\\Modern contact list"