22 files changed, 52 insertions, 124 deletions
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 45ab1ce110..6a6441349b 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -27,15 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_caps.h"
 #include "jabber_rc.h"
 
-#include <locale.h>
-
-#include <m_fontservice.h>
-#include <m_icolib.h>
-
 #include "m_assocmgr.h"
 #include "m_folders.h"
 #include "m_toptoolbar.h"
-#include "m_extraicons.h"
 
 HINSTANCE hInst;
 
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h
index b5fac3160b..5085fa9807 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/jabber.h
@@ -45,49 +45,65 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <commctrl.h>
 #include <uxtheme.h>
+#include <richedit.h>
 
+#include <ctype.h>
+#include <fcntl.h>
+#include <io.h>
+#include <limits.h>
+#include <locale.h>
 #include <malloc.h>
 #include <process.h>
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <time.h>
-#include <limits.h>
-#include <ctype.h>
-#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_system_cpp.h>
-#include <m_netlib.h>
-#include <m_protomod.h>
-#include <m_protosvc.h>
-#include <m_protoint.h>
+
+#include <m_avatars.h>
+#include <m_awaymsg.h>
+#include <m_button.h>
+#include <m_chat.h>
 #include <m_clist.h>
-#include <m_clui.h>
-#include <m_options.h>
-#include <m_userinfo.h>
+#include <m_clistint.h>
+#include <m_cluiframes.h>
+#include <m_contacts.h>
 #include <m_database.h>
+#include <m_extraicons.h>
+#include <m_file.h>
+#include <m_fontservice.h>
+#include <m_genmenu.h>
+#include <m_hotkeys.h>
+#include <m_icolib.h>
+#include <m_idle.h>
 #include <m_langpack.h>
-#include <m_utils.h>
 #include <m_message.h>
+#include <m_netlib.h>
+#include <m_options.h>
+#include <m_protomod.h>
+#include <m_protosvc.h>
+#include <m_protoint.h>
 #include <m_skin.h>
-#include <m_chat.h>
-#include <m_icolib.h>
-#include <m_cluiframes.h>
-#include <m_clistint.h>
-#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>
-#include <m_popup.h>
-#include <m_folders.h>
+#include <m_toptoolbar.h>
+#include <m_userinfo.h>
+#include <m_utils.h>
 #include <m_xstatus.h>
-#include <m_extraicons.h>
 #include <win2k.h>
 
+#include <m_addcontact.h>
+#include <m_folders.h>
+#include <m_fingerprint.h>
+#include <m_jabber.h>
+#include <m_modernopt.h>
+#include <m_popup.h>
+#include <m_proto_listeningto.h>
+#include <m_skin_eng.h>
+
 #include "../../plugins/zlib/src/zlib.h"
 
 #include "resource.h"
@@ -400,10 +416,10 @@ struct JABBER_REG_ACCOUNT
 {
 	TCHAR username[512];
 	TCHAR password[512];
-	char server[128];
-	char manualHost[128];
-	WORD port;
-	BOOL useSSL;
+	char  server[128];
+	char  manualHost[128];
+	WORD  port;
+	BOOL  useSSL;
 };
 
 typedef enum { FT_SI, FT_OOB, FT_BYTESTREAM, FT_IBB } JABBER_FT_TYPE;
@@ -420,7 +436,6 @@ struct filetransfer
 
 	PROTOFILETRANSFERSTATUS std;
 
-//	HANDLE hContact;
 	JABBER_FT_TYPE type;
 	JABBER_SOCKET s;
 	JABBER_FILE_STATE state;
@@ -646,9 +661,9 @@ HANDLE g_GetIconHandle(int iconId);
 HICON  g_LoadIconEx(const char* name, bool big = false);
 void   g_ReleaseIcon(HICON hIcon);
 
-void ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon);
-void WindowSetIcon(HWND hWnd, CJabberProto *proto, const char* name);
-void WindowFreeIcon(HWND hWnd);
+void   ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon);
+void   WindowSetIcon(HWND hWnd, CJabberProto *proto, const char* name);
+void   WindowFreeIcon(HWND hWnd);
 
 int    ReloadIconsEventHook(WPARAM wParam, LPARAM lParam);
 
@@ -676,7 +691,7 @@ struct CJabberAdhocStartupParams
 {
 	TCHAR *m_szJid;
 	TCHAR *m_szNode;
-	CJabberProto* m_pProto;
+	CJabberProto *m_pProto;
 
 	CJabberAdhocStartupParams(CJabberProto* proto, TCHAR* szJid, TCHAR* szNode = NULL)
 	{
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 6ccf1e1e3e..b28221f607 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -27,12 +27,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include <CommCtrl.h>
 #include "jabber_iq.h"
-#include "m_clui.h"
 #include "jabber_caps.h"
 
-
 #define ShowDlgItem(a, b, c)	 ShowWindow(GetDlgItem(a, b), c)
 #define EnableDlgItem(a, b, c) EnableWindow(GetDlgItem(a, b), c)
 
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 6057ed2dfd..d3315aff28 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -25,8 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"
 #include "jabber_caps.h"
 
-#include <m_addcontact.h>
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // Global definitions
 
diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index aa29ad9535..10a448a8b1 100644
--- a/protocols/JabberG/src/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include <richedit.h>
 
 #define JCPF_IN    0x01UL
 #define JCPF_OUT   0x02UL
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index b93d983ff9..c84b4fdfd3 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -23,17 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-
-#include <fcntl.h>
-#include <io.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "jabber_list.h"
 #include "jabber_iq.h"
 #include "jabber_caps.h"
 #include "jabber_disco.h"
-#include "m_proto_listeningto.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // OnContactDeleted - processes a contact deletion
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index 7136a23e1d..7b8282754c 100644
--- a/protocols/JabberG/src/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
@@ -22,10 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include <io.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "jabber_caps.h"
 
 #define JABBER_NETWORK_BUFFER_SIZE 2048
diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 2ef1a2e487..76c3c9b4c0 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -25,16 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber.h"
 #include "jabber_caps.h"
 
-#include <m_genmenu.h>
-#include <m_icolib.h>
-#include <m_fontservice.h>
-
-#include <m_cluiframes.h>
-
-#include "m_proto_listeningto.h"
-#include "m_skin_eng.h"
-#include "m_extraicons.h"
-
 /////////////////////////////////////////////////////////////////////////////////////////
 // CJabberInfoFrame
 
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index b3ae7a1beb..23778a4a88 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include <io.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "jabber_iq.h"
 #include "jabber_byte.h"
 #include "jabber_ibb.h"
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 43559692f2..cc445c421d 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include "jabber_list.h"
 
 #define IDI_ONLINE                      104
 #define IDI_OFFLINE                     105
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index cd16f466a9..6c88eb0e4b 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -23,11 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-
-#include <io.h>
-#include "version.h"
 #include "jabber_iq.h"
 #include "jabber_rc.h"
+#include "version.h"
 
 #ifndef VER_SUITE_WH_SERVER
 	#define VER_SUITE_WH_SERVER                     0x00008000
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index d3e565c7f9..6bd2a40761 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -28,9 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_caps.h"
 #include "jabber_privacy.h"
 
-#include "m_genmenu.h"
-#include "m_clistint.h"
-
 void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode)
 {
 	if ( !iqNode)
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 06d1baf3b5..11ba7259ea 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -28,13 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_privacy.h"
 #include "jabber_disco.h"
 
-#include <m_genmenu.h>
-#include <m_contacts.h>
-#include <m_hotkeys.h>
-#include <m_icolib.h>
-
-#include "m_toptoolbar.h"
-
 #define MENUITEM_LASTSEEN	1
 #define MENUITEM_SERVER		2
 #define MENUITEM_RESOURCES	10
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 74a5551725..0ccb2f8207 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -24,10 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "jabber.h"
 #include "jabber_list.h"
-
 #include "jabber_caps.h"
 #include "jabber_opttree.h"
-#include "m_modernopt.h"
 
 static BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0;
 
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 966e101eb4..6e749cca79 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_iq.h"
 #include "jabber_privacy.h"
 
-#include <m_icolib.h>
-#include <m_genmenu.h>
-#include <m_clistint.h>
-
 #define JABBER_PL_BUSY_MSG	 LPGEN("Sending request, please wait...")
 
 BOOL CJabberProto::OnIqRequestPrivacyLists(HXML, CJabberIqInfo* pInfo)
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index b5cd44a0b3..9df6932cf8 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -23,23 +23,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-
-#include <fcntl.h>
-#include <io.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <m_genmenu.h>
-#include <m_icolib.h>
-
-#include "jabber_list.h"
 #include "jabber_iq.h"
 #include "jabber_caps.h"
 #include "jabber_disco.h"
 
-#include "m_proto_listeningto.h"
-#include "m_modernopt.h"
-
 #pragma warning(disable:4355)
 
 static int compareTransports(const TCHAR *p1, const TCHAR *p2)
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 0a27984db2..0dd007b05c 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber.h"
 #include "jabber_iq.h"
 #include "jabber_rc.h"
-#include "m_awaymsg.h"
 
 CJabberAdhocSession::CJabberAdhocSession(CJabberProto* global)
 {
diff --git a/protocols/JabberG/src/jabber_rc.h b/protocols/JabberG/src/jabber_rc.h
index c2b3167eed..9660b36834 100644
--- a/protocols/JabberG/src/jabber_rc.h
+++ b/protocols/JabberG/src/jabber_rc.h
@@ -106,7 +106,7 @@ protected:
 	TCHAR *m_szName;
 	CJabberAdhocNode* m_pNext;
 	JABBER_ADHOC_HANDLER m_pHandler;
-	CJabberProto* m_pProto;
+	CJabberProto *m_pProto;
 public:
 	CJabberAdhocNode(CJabberProto* pProto, TCHAR* szJid, TCHAR* szNode, TCHAR* szName, JABBER_ADHOC_HANDLER pHandler)
 	{
@@ -161,7 +161,7 @@ public:
 class CJabberAdhocManager
 {
 protected:
-	CJabberProto* m_pProto;
+	CJabberProto *m_pProto;
 	CJabberAdhocNode* m_pNodes;
 	CJabberAdhocSession* m_pSessions;
 	CRITICAL_SECTION m_cs;
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 56387a2b22..a162a5349c 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber_caps.h"
 #include "m_addcontact.h"
 #include "jabber_disco.h"
-#include "m_proto_listeningto.h"
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // GetMyAwayMsg - obtain the current away message
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 810c04f3d2..33b2e82dbd 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include "m_icolib.h"
 
 #include <fcntl.h>
 #include <io.h>
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index b79a5b509c..69b2327e51 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -22,13 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "jabber.h"
-#include <richedit.h>
 
-#include "jabber_list.h"
 #include "jabber_caps.h"
 
-#include "m_clistint.h"
-
 extern CRITICAL_SECTION mutex;
 
 extern int bSecureIM, bMirOTR, bNewGPG, bPlatform;
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 273919ce89..f95a3d9d8e 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -25,16 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "jabber.h"
 #include "jabber_caps.h"
 
-#include <m_genmenu.h>
-#include <m_icolib.h>
-#include <m_fontservice.h>
-
-#include <m_cluiframes.h>
-
-#include "m_proto_listeningto.h"
-#include "m_skin_eng.h"
-#include "m_extraicons.h"
-
 static CIconPool g_MoodIcons, g_ActivityIcons;
 
 ///////////////////////////////////////////////////////////////////////////////