unified project for ICQ protocol

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

63 files changed, 60 insertions, 64 deletions

diff --git a/protocols/IcqOscarJ/src/UI/icqoscar.h b/protocols/IcqOscarJ/src/UI/icqoscar.h
deleted file mode 100644
index 77283f6f7f..0000000000
--- a/protocols/IcqOscarJ/src/UI/icqoscar.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* For MinGW sake */

-#include "../icqoscar.h"

diff --git a/protocols/IcqOscarJ/src/UI/askauthentication.cpp b/protocols/IcqOscarJ/src/askauthentication.cpp
index 508478801f..1e8927ae12 100644
--- a/protocols/IcqOscarJ/src/UI/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/askauthentication.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 struct AskAuthParam

 {

diff --git a/protocols/IcqOscarJ/src/capabilities.cpp b/protocols/IcqOscarJ/src/capabilities.cpp
index 814b531582..06abb24da0 100644
--- a/protocols/IcqOscarJ/src/capabilities.cpp
+++ b/protocols/IcqOscarJ/src/capabilities.cpp
@@ -32,7 +32,7 @@
 //  adding process too much.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 struct icq_capability

 {

diff --git a/protocols/IcqOscarJ/src/chan_01login.cpp b/protocols/IcqOscarJ/src/chan_01login.cpp
index fe221e93a1..a4fc4cbced 100644
--- a/protocols/IcqOscarJ/src/chan_01login.cpp
+++ b/protocols/IcqOscarJ/src/chan_01login.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleLoginChannel(BYTE*, size_t, serverthread_info *info)

 {

diff --git a/protocols/IcqOscarJ/src/chan_02data.cpp b/protocols/IcqOscarJ/src/chan_02data.cpp
index 3a14ef1efd..47ebe5c819 100644
--- a/protocols/IcqOscarJ/src/chan_02data.cpp
+++ b/protocols/IcqOscarJ/src/chan_02data.cpp
@@ -27,7 +27,7 @@
 //  Handle channel 2 (Data) packets

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleDataChannel(BYTE *pBuffer, size_t wBufferLength, serverthread_info *info)

 {

diff --git a/protocols/IcqOscarJ/src/chan_03error.cpp b/protocols/IcqOscarJ/src/chan_03error.cpp
index 1c2d4d62eb..5b9aa26429 100644
--- a/protocols/IcqOscarJ/src/chan_03error.cpp
+++ b/protocols/IcqOscarJ/src/chan_03error.cpp
@@ -22,7 +22,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleErrorChannel(unsigned char*, size_t)

 {

diff --git a/protocols/IcqOscarJ/src/chan_04close.cpp b/protocols/IcqOscarJ/src/chan_04close.cpp
index 3c774e5ce0..c9d4157f8e 100644
--- a/protocols/IcqOscarJ/src/chan_04close.cpp
+++ b/protocols/IcqOscarJ/src/chan_04close.cpp
@@ -22,7 +22,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleCloseChannel(BYTE *buf, size_t datalen, serverthread_info *info)

 {

diff --git a/protocols/IcqOscarJ/src/chan_05ping.cpp b/protocols/IcqOscarJ/src/chan_05ping.cpp
index 61aaf61138..9fbd97414d 100644
--- a/protocols/IcqOscarJ/src/chan_05ping.cpp
+++ b/protocols/IcqOscarJ/src/chan_05ping.cpp
@@ -22,7 +22,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handlePingChannel(BYTE*, size_t)

 {

diff --git a/protocols/IcqOscarJ/src/changeinfo/changeinfo.h b/protocols/IcqOscarJ/src/changeinfo.h
index 0497f288fd..0497f288fd 100644
--- a/protocols/IcqOscarJ/src/changeinfo/changeinfo.h
+++ b/protocols/IcqOscarJ/src/changeinfo.h
diff --git a/protocols/IcqOscarJ/src/changeinfo/icqoscar.h b/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
deleted file mode 100644
index 77283f6f7f..0000000000
--- a/protocols/IcqOscarJ/src/changeinfo/icqoscar.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* For MinGW sake */

-#include "../icqoscar.h"

diff --git a/protocols/IcqOscarJ/src/changeinfo/constants.cpp b/protocols/IcqOscarJ/src/constants.cpp
index 1d908307ee..f97298b955 100644
--- a/protocols/IcqOscarJ/src/changeinfo/constants.cpp
+++ b/protocols/IcqOscarJ/src/constants.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static FieldNamesItem months[] = {

 	{ 1, LPGEN("January") },

diff --git a/protocols/IcqOscarJ/src/cookies.cpp b/protocols/IcqOscarJ/src/cookies.cpp
index 22bcf92a95..a18fdc7f87 100644
--- a/protocols/IcqOscarJ/src/cookies.cpp
+++ b/protocols/IcqOscarJ/src/cookies.cpp
@@ -27,7 +27,7 @@
 //  Handles packet & message cookies

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #define INVALID_COOKIE_INDEX -1

 

diff --git a/protocols/IcqOscarJ/src/changeinfo/db.cpp b/protocols/IcqOscarJ/src/db.cpp
index 963ed4eb4c..4080b800ff 100644
--- a/protocols/IcqOscarJ/src/changeinfo/db.cpp
+++ b/protocols/IcqOscarJ/src/db.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void ChangeInfoData::LoadSettingsFromDb(int keepChanged)

 {

diff --git a/protocols/IcqOscarJ/src/directpackets.cpp b/protocols/IcqOscarJ/src/directpackets.cpp
index 34253c5763..4ab3cd8415 100644
--- a/protocols/IcqOscarJ/src/directpackets.cpp
+++ b/protocols/IcqOscarJ/src/directpackets.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void EncryptDirectPacket(directconnect* dc, icq_packet* p);

 

diff --git a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/dlgproc.cpp
index ae11819142..f747a3d381 100644
--- a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/dlgproc.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #define DM_PROTOACK  (WM_USER+10)

 

diff --git a/protocols/IcqOscarJ/src/changeinfo/editlist.cpp b/protocols/IcqOscarJ/src/editlist.cpp
index 765c99cce6..03218b9836 100644
--- a/protocols/IcqOscarJ/src/changeinfo/editlist.cpp
+++ b/protocols/IcqOscarJ/src/editlist.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static ChangeInfoData *dataListEdit = NULL;

 static HWND hwndListEdit = NULL;

diff --git a/protocols/IcqOscarJ/src/changeinfo/editstring.cpp b/protocols/IcqOscarJ/src/editstring.cpp
index 22ffcd6f23..b73ae9e6a5 100644
--- a/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
+++ b/protocols/IcqOscarJ/src/editstring.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static ChangeInfoData *dataStringEdit = NULL;

 static HWND hwndEdit = NULL, hwndExpandButton = NULL, hwndUpDown = NULL;

diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp
index 6363ab8d4f..f425543897 100644
--- a/protocols/IcqOscarJ/src/fam_01service.cpp
+++ b/protocols/IcqOscarJ/src/fam_01service.cpp
@@ -27,7 +27,7 @@
 //  Handles packets from Service family

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern capstr capXStatus[];

 

diff --git a/protocols/IcqOscarJ/src/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp
index 1a3953c717..fcbaa23fda 100644
--- a/protocols/IcqOscarJ/src/fam_02location.cpp
+++ b/protocols/IcqOscarJ/src/fam_02location.cpp
@@ -27,7 +27,7 @@
 //  Handles packets from Location family

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern const char* cliSpamBot;

 

diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index 057d7403b1..0c862db64e 100644
--- a/protocols/IcqOscarJ/src/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
@@ -27,7 +27,7 @@
 //  Handles packets from Buddy family

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern const char* cliSpamBot;

 

diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index 288d129b6e..84339c2846 100644
--- a/protocols/IcqOscarJ/src/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
@@ -27,7 +27,7 @@
 //  Handles packets from Family 4 ICBM Messages

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleMsgFam(BYTE *pBuffer, size_t wBufferLength, snac_header *pSnacHeader)

 {

diff --git a/protocols/IcqOscarJ/src/fam_09bos.cpp b/protocols/IcqOscarJ/src/fam_09bos.cpp
index a8b84290be..cda848a02f 100644
--- a/protocols/IcqOscarJ/src/fam_09bos.cpp
+++ b/protocols/IcqOscarJ/src/fam_09bos.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleBosFam(unsigned char *pBuffer, size_t wBufferLength, snac_header* pSnacHeader)

 {

diff --git a/protocols/IcqOscarJ/src/fam_0alookup.cpp b/protocols/IcqOscarJ/src/fam_0alookup.cpp
index c05833eb92..44b529486b 100644
--- a/protocols/IcqOscarJ/src/fam_0alookup.cpp
+++ b/protocols/IcqOscarJ/src/fam_0alookup.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleLookupFam(BYTE *pBuffer, size_t wBufferLength, snac_header* pSnacHeader)

 {

diff --git a/protocols/IcqOscarJ/src/fam_0bstatus.cpp b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
index f56661315e..67158a2906 100644
--- a/protocols/IcqOscarJ/src/fam_0bstatus.cpp
+++ b/protocols/IcqOscarJ/src/fam_0bstatus.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleStatusFam(unsigned char *pBuffer, size_t wBufferLength, snac_header* pSnacHeader)

 {

diff --git a/protocols/IcqOscarJ/src/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index 948592dae4..77faf554f2 100644
--- a/protocols/IcqOscarJ/src/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // -----------------------------------------------------------------------------
 
-#include "icqoscar.h"
+#include "stdafx.h"
 
 static int unpackServerListItem(BYTE **pbuf, size_t *pwLen, char *pszRecordName, WORD *pwGroupId, WORD *pwItemId, WORD *pwItemType, size_t *pwTlvLength);
 
diff --git a/protocols/IcqOscarJ/src/fam_15icqserver.cpp b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
index 8db067a21e..09d6de130c 100644
--- a/protocols/IcqOscarJ/src/fam_15icqserver.cpp
+++ b/protocols/IcqOscarJ/src/fam_15icqserver.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleIcqExtensionsFam(BYTE *pBuffer, size_t wBufferLength, snac_header* pSnacHeader)

 {

diff --git a/protocols/IcqOscarJ/src/fam_17signon.cpp b/protocols/IcqOscarJ/src/fam_17signon.cpp
index a6689e6295..94c331e3b7 100644
--- a/protocols/IcqOscarJ/src/fam_17signon.cpp
+++ b/protocols/IcqOscarJ/src/fam_17signon.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleAuthorizationFam(BYTE *pBuffer, size_t wBufferLength, snac_header *pSnacHeader, serverthread_info *info)

 {

diff --git a/protocols/IcqOscarJ/src/i18n.cpp b/protocols/IcqOscarJ/src/i18n.cpp
index 5b7ab1d2a2..2dfc79d17a 100644
--- a/protocols/IcqOscarJ/src/i18n.cpp
+++ b/protocols/IcqOscarJ/src/i18n.cpp
@@ -28,7 +28,7 @@
 //  character sets.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static BOOL bHasCP_UTF8 = FALSE;

 

diff --git a/protocols/IcqOscarJ/src/icq_advsearch.cpp b/protocols/IcqOscarJ/src/icq_advsearch.cpp
index dfbe51a6d4..647faf6392 100644
--- a/protocols/IcqOscarJ/src/icq_advsearch.cpp
+++ b/protocols/IcqOscarJ/src/icq_advsearch.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static void InitComboBox(HWND hwndCombo, const FieldNamesItem *names)

 {

diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 18c802872a..645d5ec2c2 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -27,7 +27,7 @@
 //  Manages Avatar connection, provides internal service for handling avatars

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 #include "m_folders.h"

 

 BYTE hashEmptyAvatar[9] = {0x00, 0x01, 0x00, 0x05, 0x02, 0x01, 0xD2, 0x04, 0x72};

diff --git a/protocols/IcqOscarJ/src/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp
index 7b4f495295..a517288901 100644
--- a/protocols/IcqOscarJ/src/icq_clients.cpp
+++ b/protocols/IcqOscarJ/src/icq_clients.cpp
@@ -27,7 +27,7 @@
 //  Provides capability & signature based client detection

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 const capstr capShortCaps = {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}; // CAP_AIM_BUDDYICON

 

diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp
index 53e41ef407..a9aa778cb1 100644
--- a/protocols/IcqOscarJ/src/icq_db.cpp
+++ b/protocols/IcqOscarJ/src/icq_db.cpp
@@ -27,7 +27,7 @@
 //  Internal Database API

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 int CIcqProto::getSetting(MCONTACT hContact, const char *szSetting, DBVARIANT *dbv)

 {

diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp
index 40d1a2961d..5c837b352a 100644
--- a/protocols/IcqOscarJ/src/icq_direct.cpp
+++ b/protocols/IcqOscarJ/src/icq_direct.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 struct directthreadstartinfo

 {

diff --git a/protocols/IcqOscarJ/src/icq_directmsg.cpp b/protocols/IcqOscarJ/src/icq_directmsg.cpp
index 52b68a7ca6..3b5c74b381 100644
--- a/protocols/IcqOscarJ/src/icq_directmsg.cpp
+++ b/protocols/IcqOscarJ/src/icq_directmsg.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleDirectMessage(directconnect* dc, PBYTE buf, size_t wLen)

 {

diff --git a/protocols/IcqOscarJ/src/icq_fieldnames.cpp b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
index d5f80a5732..6bc676e7e3 100644
--- a/protocols/IcqOscarJ/src/icq_fieldnames.cpp
+++ b/protocols/IcqOscarJ/src/icq_fieldnames.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 FieldNamesItem timezonesField[] =

 {

diff --git a/protocols/IcqOscarJ/src/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp
index 6a757ce248..0b93cf87a5 100644
--- a/protocols/IcqOscarJ/src/icq_filerequests.cpp
+++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleFileAck(PBYTE buf, size_t wLen, DWORD dwUin, DWORD dwCookie, WORD wStatus)

 {

diff --git a/protocols/IcqOscarJ/src/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
index 54b11af724..25bc45de50 100644
--- a/protocols/IcqOscarJ/src/icq_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static void file_buildProtoFileTransferStatus(filetransfer* ft, PROTOFILETRANSFERSTATUS* pfts)

 {

diff --git a/protocols/IcqOscarJ/src/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp
index 34e1ff3b01..e5761b6052 100644
--- a/protocols/IcqOscarJ/src/icq_firstrun.cpp
+++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static void accountLoadDetails(CIcqProto *ppro, HWND hwndDlg)

 {

diff --git a/protocols/IcqOscarJ/src/icq_http.cpp b/protocols/IcqOscarJ/src/icq_http.cpp
index 9deb69ceb0..3620340f28 100644
--- a/protocols/IcqOscarJ/src/icq_http.cpp
+++ b/protocols/IcqOscarJ/src/icq_http.cpp
@@ -27,7 +27,7 @@
 //  HTTP Gateway Handling routines

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 int icq_httpGatewayInit(HANDLE hConn, NETLIBOPENCONNECTION*, NETLIBHTTPREQUEST *nlhr)

 {

diff --git a/protocols/IcqOscarJ/src/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
index 565dff43ee..64cbaeb4cd 100644
--- a/protocols/IcqOscarJ/src/icq_infoupdate.cpp
+++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp
@@ -27,7 +27,7 @@
 //  Background thread for automatic update of user details

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 // Retrieve users' info

 void CIcqProto::icq_InitInfoUpdate(void)

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index b1930d519f..4b93e445fc 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #include <m_skin.h>

 

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index c4a38e135c..6a319e06b5 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #include <win2k.h>

 

diff --git a/protocols/IcqOscarJ/src/icq_packet.cpp b/protocols/IcqOscarJ/src/icq_packet.cpp
index 3bb6d024ed..395a155718 100644
--- a/protocols/IcqOscarJ/src/icq_packet.cpp
+++ b/protocols/IcqOscarJ/src/icq_packet.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 WORD generate_flap_sequence()

 {

diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp
index 0edbd79b40..ef73f29049 100644
--- a/protocols/IcqOscarJ/src/icq_popups.cpp
+++ b/protocols/IcqOscarJ/src/icq_popups.cpp
@@ -27,7 +27,7 @@
 //  Popup Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern BOOL bPopupService;

 

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 1e4289a9f4..8fb7f68e67 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -27,7 +27,7 @@
 //  Protocol Interface Implementation

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #include "m_icolib.h"

 

diff --git a/protocols/IcqOscarJ/src/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp
index 138c8900a2..a00db8f212 100644
--- a/protocols/IcqOscarJ/src/icq_rates.cpp
+++ b/protocols/IcqOscarJ/src/icq_rates.cpp
@@ -27,7 +27,7 @@
 //  Rate Management stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 //

 // Rate Level 1 Management

diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp
index 3bc7e459a3..585de4ba3c 100644
--- a/protocols/IcqOscarJ/src/icq_server.cpp
+++ b/protocols/IcqOscarJ/src/icq_server.cpp
@@ -27,7 +27,7 @@
 //  Manages main server connection, low-level communication

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void icq_newConnectionReceived(HANDLE hNewConnection, DWORD dwRemoteIP, void *pExtra);

 

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index 72061b91ca..fed066f96a 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -27,7 +27,7 @@
 //  Functions that handles list of used server IDs, sends low-level packets for SSI information

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 // SERVER-LIST UPDATE BOARD

 //

diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index 20775e1d84..793eaa4b4e 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -27,7 +27,7 @@
 //  Implements Manage Server List dialog

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 static int bListInit = 0;

 static HANDLE hItemAll;

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 7c25aca840..530e900089 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -27,7 +27,7 @@
 //  Support for Custom Statuses

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 #include "m_extraicons.h"

 #include "..\icons_pack\src\resource.h"

 

diff --git a/protocols/IcqOscarJ/src/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp
index 21d9b9592c..334ed7455b 100644
--- a/protocols/IcqOscarJ/src/icq_xtraz.cpp
+++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp
@@ -27,7 +27,7 @@
 //  Internal Xtraz API

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 void CIcqProto::handleXtrazNotify(DWORD dwUin, DWORD dwMID, DWORD dwMID2, WORD wCookie, char* szMsg, size_t nMsgLen, BOOL bThruDC)

 {

diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index 0e966c5a4a..a8c69b296f 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -27,7 +27,7 @@
 //  High-level code for exported API services

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 INT_PTR CIcqProto::AddServerContact(WPARAM hContact, LPARAM)

 {

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index c980609206..67d5626749 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #include "m_extraicons.h"

 #include "m_icolib.h"

diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp
index ccc3a1f2e8..c8439eeb6c 100644
--- a/protocols/IcqOscarJ/src/log.cpp
+++ b/protocols/IcqOscarJ/src/log.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern BOOL bPopupService;

 

diff --git a/protocols/IcqOscarJ/src/UI/loginpassword.cpp b/protocols/IcqOscarJ/src/loginpassword.cpp
index 0d21873878..6268f76665 100644
--- a/protocols/IcqOscarJ/src/UI/loginpassword.cpp
+++ b/protocols/IcqOscarJ/src/loginpassword.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

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

 {

diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index adde56ad16..917977dad5 100644
--- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
@@ -27,7 +27,7 @@
 //  OSCAR File-Transfers implementation

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 struct oscarthreadstartinfo 

 {

diff --git a/protocols/IcqOscarJ/src/stdafx.cpp b/protocols/IcqOscarJ/src/stdafx.cxx
index 60ae4f72b7..0c766ea07f 100644
--- a/protocols/IcqOscarJ/src/stdafx.cpp
+++ b/protocols/IcqOscarJ/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "icqoscar.h"
\ No newline at end of file
+#include "stdafx.h"

diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/stdafx.h
index c20297fd10..bfda6d4931 100644
--- a/protocols/IcqOscarJ/src/icqoscar.h
+++ b/protocols/IcqOscarJ/src/stdafx.h
@@ -115,7 +115,7 @@
 

 #include "icq_avatar.h"

 

-#include "changeinfo/changeinfo.h"

+#include "changeinfo.h"

 #include "icq_popups.h"

 #include "icq_proto.h"

 

diff --git a/protocols/IcqOscarJ/src/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp
index 7ce4d6ca90..59c0b51efc 100644
--- a/protocols/IcqOscarJ/src/stdpackets.cpp
+++ b/protocols/IcqOscarJ/src/stdpackets.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 extern const int moodXStatus[];

 

diff --git a/protocols/IcqOscarJ/src/tlv.cpp b/protocols/IcqOscarJ/src/tlv.cpp
index 1f395c6e63..81488e8c78 100644
--- a/protocols/IcqOscarJ/src/tlv.cpp
+++ b/protocols/IcqOscarJ/src/tlv.cpp
@@ -27,7 +27,7 @@
 //  Helper functions for Oscar TLV chains

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 /* set maxTlvs<=0 to get all TLVs in length, or a positive integer to get at most the first n */

 oscar_tlv_chain* readIntoTLVChain(BYTE **buf, size_t wLen, int maxTlvs)

diff --git a/protocols/IcqOscarJ/src/changeinfo/upload.cpp b/protocols/IcqOscarJ/src/upload.cpp
index c8c515c950..2f65194773 100644
--- a/protocols/IcqOscarJ/src/changeinfo/upload.cpp
+++ b/protocols/IcqOscarJ/src/upload.cpp
@@ -25,7 +25,7 @@
 //  ChangeInfo Plugin stuff

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 int CIcqProto::StringToListItemId(const char *szSetting,int def)

 {

diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp
index 322019553f..a3c5d56c2a 100644
--- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/userinfotab.cpp
@@ -27,7 +27,7 @@
 //  Code for User details ICQ specific pages

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 #define SVS_NORMAL        0

 #define SVS_ZEROISUNSPEC  2

diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index ef8b905a52..8799ea7c79 100644
--- a/protocols/IcqOscarJ/src/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 // -----------------------------------------------------------------------------

 

-#include "icqoscar.h"

+#include "stdafx.h"

 

 struct gateway_index

 {