26 files changed, 2 insertions, 44 deletions
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
index e9b2565466..296f0d3c34 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
+++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.h
@@ -20,7 +20,6 @@
 #define __ADVANCED_AUTOAWAY_HEADER
 
 #include <m_options.h>
-#include <m_idle.h>
 #include "version.h"
 
 #define SETTING_IGNLOCK					"IgnoreLockKeys"
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 06404c4301..d8637304fc 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "dlg_anniversarylist.h"
 
 #include "m_message.h"
-#include "m_email.h"
 
 #define IsLeap(wYear)	(!(((wYear) % 4 != 0) || (((wYear) % 100 == 0) && ((wYear) % 400 != 0))))
 
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 9e7f16e454..5a0a65d9d7 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -74,7 +74,6 @@
 #include <m_icolib.h>
 #include <m_imgsrvc.h>
 #include <m_genmenu.h>
-#include <m_file.h>
 #include <m_avatars.h>
 #include <m_xml.h>
 #include <m_chat.h>
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h
index c0074cda96..50db0d5638 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/jabber.h
@@ -79,6 +79,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_button.h>
 #include <m_avatars.h>
 #include <m_idle.h>
+#include <m_file.h>
 #include <m_timezones.h>
 #include <m_jabber.h>
 #include <m_fingerprint.h>
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 442b979b09..ab100f2ac4 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_list.h"
 #include "jabber_iq.h"
 #include "jabber_caps.h"
-#include "m_file.h"
 #include "jabber_disco.h"
 #include "m_proto_listeningto.h"
 
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index f229f2c69f..535af67828 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <m_file.h>
 #include <m_genmenu.h>
 #include <m_icolib.h>
 
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 67d16c0463..46753f4a74 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_list.h"
 #include "jabber_iq.h"
 #include "jabber_caps.h"
-#include "m_file.h"
 #include "m_addcontact.h"
 #include "jabber_disco.h"
 #include "m_proto_listeningto.h"
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 19267b90c2..570b2d87e7 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"
 #include "resource.h"
 #include "tlen_picture.h"
-#include <m_file.h>
 #include <richedit.h>
 #include <ctype.h>
 #include <m_icolib.h>
diff --git a/protocols/Twitter/src/common.h b/protocols/Twitter/src/common.h
index 20719673d0..dd2b7973f1 100644
--- a/protocols/Twitter/src/common.h
+++ b/protocols/Twitter/src/common.h
@@ -49,7 +49,6 @@ using std::min;
 //#include "m_cluiframes.h"
 #include <m_database.h>
 #include <m_history.h>
-#include <m_idle.h>
 #include <m_langpack.h>
 #include <m_message.h>
 #include <m_netlib.h>
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 41f84eb7e7..da3c4751d0 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -15,7 +15,6 @@
 
 #include <win2k.h>
 
-#include <m_idle.h>
 #include <m_options.h>
 #include <m_skin.h>
 #include <m_userinfo.h>
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 2e91c9fdb6..7fd2849380 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -20,7 +20,6 @@
 #include <m_utils.h>
 #include <m_options.h>
 #include <m_popup.h>
-#include <m_idle.h>
 
 #include "avatar.h"
 #include "resource.h"
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index cab4ba5aa4..6c2c6b81f2 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -46,6 +46,7 @@ extern "C"
 #include <m_database.h>
 #include <m_protomod.h>
 #include <m_netlib.h>
+#include <m_idle.h>
 #include <m_clist.h>
 #include <m_clistint.h>
 #include <m_protosvc.h>
diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h
index 401e7beab7..4288b26fba 100644
--- a/src/core/commonheaders.h
+++ b/src/core/commonheaders.h
@@ -84,9 +84,7 @@ using namespace std;
 #include <m_addcontact.h>
 #include <m_findadd.h>
 #include <m_file.h>
-#include <m_email.h>
 #include <m_awaymsg.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h
index 9dcba494c6..21f8ad8dbd 100644
--- a/src/core/stdauth/commonheaders.h
+++ b/src/core/stdauth/commonheaders.h
@@ -71,9 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_history.h>
 #include <m_addcontact.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h
index 30cddbfe57..c761ea8691 100644
--- a/src/core/stdautoaway/commonheaders.h
+++ b/src/core/stdautoaway/commonheaders.h
@@ -70,8 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
 #include <m_awaymsg.h>
 #include <m_idle.h>
 #include <m_ignore.h>
diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h
index 30cddbfe57..c761ea8691 100644
--- a/src/core/stdaway/commonheaders.h
+++ b/src/core/stdaway/commonheaders.h
@@ -70,8 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
 #include <m_awaymsg.h>
 #include <m_idle.h>
 #include <m_ignore.h>
diff --git a/src/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h
index 5bc04d3066..e480281b9e 100644
--- a/src/core/stdclist/src/commonheaders.h
+++ b/src/core/stdclist/src/commonheaders.h
@@ -52,7 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_utils.h>
 #include <m_skin.h>
 #include <m_contacts.h>
-#include <m_file.h>
 #include <m_icolib.h>
 #include <m_extraicons.h>
 
diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h
index 6ed0c1cc54..11d96bbd71 100644
--- a/src/core/stdcrypt/commonheaders.h
+++ b/src/core/stdcrypt/commonheaders.h
@@ -70,9 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h
index 6ed0c1cc54..559d48e396 100644
--- a/src/core/stdemail/commonheaders.h
+++ b/src/core/stdemail/commonheaders.h
@@ -70,9 +70,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
 #include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h
index 7da238e151..6db965dd21 100644
--- a/src/core/stdfile/commonheaders.h
+++ b/src/core/stdfile/commonheaders.h
@@ -74,8 +74,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_addcontact.h>
 #include <m_findadd.h>
 #include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h
index 779db1f96c..8c1456041c 100644
--- a/src/core/stdhelp/commonheaders.h
+++ b/src/core/stdhelp/commonheaders.h
@@ -70,9 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h
index d0a817e55c..7dec232868 100644
--- a/src/core/stdidle/commonheaders.h
+++ b/src/core/stdidle/commonheaders.h
@@ -70,8 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
 #include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h
index 779db1f96c..8c1456041c 100644
--- a/src/core/stduihist/commonheaders.h
+++ b/src/core/stduihist/commonheaders.h
@@ -70,9 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h
index 9dcba494c6..21f8ad8dbd 100644
--- a/src/core/stdurl/commonheaders.h
+++ b/src/core/stdurl/commonheaders.h
@@ -71,9 +71,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_history.h>
 #include <m_addcontact.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h
index 6c37a49c36..35b77e8d60 100644
--- a/src/core/stduserinfo/commonheaders.h
+++ b/src/core/stduserinfo/commonheaders.h
@@ -70,9 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>
diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h
index 6ed0c1cc54..11d96bbd71 100644
--- a/src/core/stduseronline/commonheaders.h
+++ b/src/core/stduseronline/commonheaders.h
@@ -70,9 +70,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_findadd.h>
-#include <m_file.h>
-#include <m_email.h>
-#include <m_idle.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_modernopt.h>