From ff26edf4064a15a77f6eb16bf45700a7f5eaacfb Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sun, 25 Nov 2012 19:20:22 -0600
Subject: [PATCH] Cleanup header includes to improve readability.

---
 .../groupwise/libgroupwise/bytestream.cpp     |  2 +-
 .../groupwise/libgroupwise/bytestream.h       |  4 +-
 .../groupwise/libgroupwise/gwclientstream.cpp | 20 +++----
 .../groupwise/libgroupwise/qca/src/qca.cpp    | 26 +++++-----
 .../groupwise/libgroupwise/qca/src/qca.h      | 12 ++---
 .../libgroupwise/qca/src/qcaprovider.h        | 12 ++---
 .../groupwise/libgroupwise/safedelete.h       |  4 +-
 .../groupwise/libgroupwise/securestream.cpp   |  8 +--
 .../groupwise/libgroupwise/securestream.h     |  4 +-
 .../groupwise/libgroupwise/tlshandler.h       | 12 ++---
 .../libiris/cutestuff/network/bsocket.cpp     | 18 +++----
 .../libiris/cutestuff/network/bsocket.h       |  6 +--
 .../libiris/cutestuff/network/httpconnect.cpp | 10 ++--
 .../libiris/cutestuff/network/httpconnect.h   |  2 +-
 .../libiris/cutestuff/network/httppoll.cpp    | 20 +++----
 .../libiris/cutestuff/network/httppoll.h      |  2 +-
 .../jabber/libiris/cutestuff/network/ndns.cpp | 20 +++----
 .../jabber/libiris/cutestuff/network/ndns.h   | 10 ++--
 .../libiris/cutestuff/network/servsock.cpp    |  2 +-
 .../libiris/cutestuff/network/servsock.h      |  2 +-
 .../libiris/cutestuff/network/socks.cpp       | 28 +++++-----
 .../jabber/libiris/cutestuff/network/socks.h  |  2 +-
 .../libiris/cutestuff/network/srvresolver.cpp | 12 ++---
 .../libiris/cutestuff/network/srvresolver.h   |  4 +-
 .../jabber/libiris/cutestuff/util/base64.cpp  |  2 +-
 .../jabber/libiris/cutestuff/util/base64.h    |  2 +-
 .../libiris/cutestuff/util/bytestream.cpp     |  2 +-
 .../libiris/cutestuff/util/bytestream.h       |  4 +-
 .../jabber/libiris/cutestuff/util/cipher.cpp  | 10 ++--
 .../jabber/libiris/cutestuff/util/cipher.h    |  4 +-
 .../jabber/libiris/cutestuff/util/qrandom.cpp |  4 +-
 .../jabber/libiris/cutestuff/util/qrandom.h   |  2 +-
 .../libiris/cutestuff/util/safedelete.cpp     |  4 +-
 .../libiris/cutestuff/util/safedelete.h       |  4 +-
 .../jabber/libiris/cutestuff/util/sha1.cpp    |  2 +-
 .../jabber/libiris/cutestuff/util/sha1.h      |  2 +-
 .../libiris/cutestuff/util/showtextdlg.cpp    | 12 ++---
 .../libiris/cutestuff/util/showtextdlg.h      |  2 +-
 .../jabber/libiris/iris/include/im.h          |  6 +--
 .../jabber/libiris/iris/include/xmpp.h        | 14 ++---
 .../libiris/iris/jabber/filetransfer.cpp      | 16 +++---
 .../jabber/libiris/iris/jabber/s5b.cpp        | 18 +++----
 .../jabber/libiris/iris/jabber/s5b.h          | 12 ++---
 .../jabber/libiris/iris/jabber/xmpp_ibb.cpp   | 10 ++--
 .../jabber/libiris/iris/jabber/xmpp_ibb.h     | 12 ++---
 .../libiris/iris/jabber/xmpp_jidlink.cpp      | 12 ++---
 .../jabber/libiris/iris/jabber/xmpp_jidlink.h |  6 +--
 .../libiris/iris/xmpp-core/connector.cpp      | 24 ++++-----
 .../jabber/libiris/iris/xmpp-core/hash.cpp    |  2 +-
 .../jabber/libiris/iris/xmpp-core/jid.cpp     |  6 +--
 .../jabber/libiris/iris/xmpp-core/parser.cpp  |  8 +--
 .../jabber/libiris/iris/xmpp-core/parser.h    |  4 +-
 .../libiris/iris/xmpp-core/protocol.cpp       | 10 ++--
 .../jabber/libiris/iris/xmpp-core/protocol.h  |  6 +--
 .../libiris/iris/xmpp-core/securestream.cpp   | 12 ++---
 .../libiris/iris/xmpp-core/securestream.h     |  4 +-
 .../libiris/iris/xmpp-core/simplesasl.cpp     | 18 +++----
 .../jabber/libiris/iris/xmpp-core/stream.cpp  | 28 +++++-----
 .../jabber/libiris/iris/xmpp-core/td.h        |  2 +-
 .../libiris/iris/xmpp-core/tlshandler.cpp     |  4 +-
 .../libiris/iris/xmpp-core/xmlprotocol.cpp    |  4 +-
 .../libiris/iris/xmpp-core/xmlprotocol.h      |  6 +--
 .../jabber/libiris/iris/xmpp-im/client.cpp    | 52 +++++++++----------
 .../jabber/libiris/iris/xmpp-im/types.cpp     |  8 +--
 .../libiris/iris/xmpp-im/xmpp_tasks.cpp       | 18 +++----
 .../jabber/libiris/iris/xmpp-im/xmpp_tasks.h  |  8 +--
 .../libiris/iris/xmpp-im/xmpp_xmlcommon.cpp   |  4 +-
 .../libiris/iris/xmpp-im/xmpp_xmlcommon.h     |  2 +-
 .../protocols/jabber/libiris/qca/src/qca.cpp  | 26 +++++-----
 kopete/protocols/jabber/libiris/qca/src/qca.h | 12 ++---
 .../jabber/libiris/qca/src/qcaprovider.h      | 12 ++---
 kopete/protocols/msn/sha1.cpp                 |  2 +-
 kopete/protocols/msn/sha1.h                   |  2 +-
 .../protocols/oscar/liboscar/bytestream.cpp   |  2 +-
 kopete/protocols/oscar/liboscar/safedelete.h  |  4 +-
 .../protocols/yahoo/libkyahoo/bytestream.cpp  |  2 +-
 kopete/protocols/yahoo/libkyahoo/safedelete.h |  4 +-
 77 files changed, 350 insertions(+), 350 deletions(-)

diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
index 0b20c050..fcb82ef4 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/groupwise/libgroupwise/bytestream.h b/kopete/protocols/groupwise/libgroupwise/bytestream.h
index 0ffab15b..e64ce68d 100644
--- a/kopete/protocols/groupwise/libgroupwise/bytestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/bytestream.h
@@ -21,8 +21,8 @@
 #ifndef CS_BYTESTREAM_H
 #define CS_BYTESTREAM_H
 
-#include<tqobject.h>
-#include<tqcstring.h>
+#include <tqobject.h>
+#include <tqcstring.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index f58efea6..67d22462 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -19,16 +19,16 @@
     *************************************************************************
 */
 
-//#include<tqtextstream.h>
-//#include<tqguardedptr.h>
-// #include<qca.h>
-// #include<stdlib.h>
-// #include"bytestream.h"
-// #include"base64.h"
-// #include"hash.h"
-// #include"simplesasl.h"
-// #include"securestream.h"
-// #include"protocol.h"
+//#include <tqtextstream.h>
+//#include <tqguardedptr.h>
+// #include <qca.h>
+// #include <stdlib.h>
+// #include "bytestream.h"
+// #include "base64.h"
+// #include "hash.h"
+// #include "simplesasl.h"
+// #include "securestream.h"
+// #include "protocol.h"
 
 #include <tqapplication.h>  // for qdebug
 #include <tqguardedptr.h> 
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
index c7a12e9f..3981964a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
@@ -18,19 +18,19 @@
  *
  */
 
-#include"qca.h"
-
-#include<tqptrlist.h>
-#include<tqdir.h>
-#include<tqfileinfo.h>
-#include<tqstringlist.h>
-#include<tqlibrary.h>
-#include<tqtimer.h>
-#include<tqhostaddress.h>
-#include<tqapplication.h>
-#include<tqguardedptr.h>
-#include<stdlib.h>
-#include"qcaprovider.h"
+#include "qca.h"
+
+#include <tqptrlist.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqstringlist.h>
+#include <tqlibrary.h>
+#include <tqtimer.h>
+#include <tqhostaddress.h>
+#include <tqapplication.h>
+#include <tqguardedptr.h>
+#include <stdlib.h>
+#include "qcaprovider.h"
 
 #if defined(Q_OS_WIN32)
 #define PLUGIN_EXT "dll"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
index 73edb40d..7a8a3af4 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
@@ -21,12 +21,12 @@
 #ifndef TQCA_H
 #define TQCA_H
 
-#include<tqstring.h>
-#include<tqcstring.h>
-#include<tqdatetime.h>
-#include<tqmap.h>
-#include<tqptrlist.h>
-#include<tqobject.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
+#include <tqmap.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
 
 #ifdef Q_OS_WIN32
 #  ifndef TQCA_STATIC
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
index a88b12aa..b0e5385a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
@@ -21,12 +21,12 @@
 #ifndef TQCAPROVIDER_H
 #define TQCAPROVIDER_H
 
-#include<tqglobal.h>
-#include<tqstring.h>
-#include<tqdatetime.h>
-#include<tqobject.h>
-#include<tqhostaddress.h>
-#include"qca.h"
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqobject.h>
+#include <tqhostaddress.h>
+#include "qca.h"
 
 #define TQCA_PLUGIN_VERSION 1
 
diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.h b/kopete/protocols/groupwise/libgroupwise/safedelete.h
index 33748953..a740d66f 100644
--- a/kopete/protocols/groupwise/libgroupwise/safedelete.h
+++ b/kopete/protocols/groupwise/libgroupwise/safedelete.h
@@ -20,8 +20,8 @@
 #ifndef SAFEDELETE_H
 #define SAFEDELETE_H
 
-#include<tqobject.h>
-#include<tqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 
 class SafeDelete;
 class SafeDeleteLock
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.cpp b/kopete/protocols/groupwise/libgroupwise/securestream.cpp
index 2879d77e..656f7e43 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.cpp
@@ -26,11 +26,11 @@
     but future layers might not.
 */
 
-#include<tqguardedptr.h>
-#include<tqvaluelist.h>
-#include<tqtimer.h>
+#include <tqguardedptr.h>
+#include <tqvaluelist.h>
+#include <tqtimer.h>
 
-#include"securestream.h"
+#include "securestream.h"
 
 //----------------------------------------------------------------------------
 // LayerTracker
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index 52d69d21..d5b877fd 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -21,9 +21,9 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include<qca.h>
+#include <qca.h>
 #include "tlshandler.h"
-#include"bytestream.h"
+#include "bytestream.h"
 
 #define USE_TLSHANDLER
 
diff --git a/kopete/protocols/groupwise/libgroupwise/tlshandler.h b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
index 44772293..c2f713d4 100644
--- a/kopete/protocols/groupwise/libgroupwise/tlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/tlshandler.h
@@ -21,12 +21,12 @@
 #define GWTLSHANDLER_H
 
 #include <tqobject.h>
-//#include<tqstring.h>
-//#include<tqhostaddress.h>
-//#include<tqstring.h>
-//#include<tqcstring.h>
-//#include<tqxml.h>
-//#include<tqdom.h>
+//#include <tqstring.h>
+//#include <tqhostaddress.h>
+//#include <tqstring.h>
+//#include <tqcstring.h>
+//#include <tqxml.h>
+//#include <tqdom.h>
  
 class TLSHandler : public TQObject
 {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
index 27184748..1309ec01 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp
@@ -18,20 +18,20 @@
  *
  */
 
-#include"bsocket.h"
+#include "bsocket.h"
 
-#include<tqcstring.h>
-#include<tqsocket.h>
-#include<tqdns.h>
-#include<tqguardedptr.h>
-#include"safedelete.h"
+#include <tqcstring.h>
+#include <tqsocket.h>
+#include <tqdns.h>
+#include <tqguardedptr.h>
+#include "safedelete.h"
 #ifndef NO_NDNS
-#include"ndns.h"
+#include "ndns.h"
 #endif
-#include"srvresolver.h"
+#include "srvresolver.h"
 
 #ifdef BS_DEBUG
-#include<stdio.h>
+#include <stdio.h>
 #endif
 
 #define READBUFSIZE 65536
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
index 38aa4912..c7cb1e23 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.h
@@ -21,9 +21,9 @@
 #ifndef CS_BSOCKET_H
 #define CS_BSOCKET_H
 
-#include<tqobject.h>
-#include<tqhostaddress.h>
-#include"bytestream.h"
+#include <tqobject.h>
+#include <tqhostaddress.h>
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
index 6abeb556..e9cc5781 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp
@@ -18,14 +18,14 @@
  *
  */
 
-#include"httpconnect.h"
+#include "httpconnect.h"
 
-#include<tqstringlist.h>
-#include"bsocket.h"
-#include"base64.h"
+#include <tqstringlist.h>
+#include "bsocket.h"
+#include "base64.h"
 
 #ifdef PROX_DEBUG
-#include<stdio.h>
+#include <stdio.h>
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
index 148356e8..07c08b2e 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.h
@@ -21,7 +21,7 @@
 #ifndef CS_HTTPCONNECT_H
 #define CS_HTTPCONNECT_H
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index a07ed503..5e900119 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -18,19 +18,19 @@
  *
  */
 
-#include"httppoll.h"
+#include "httppoll.h"
 
-#include<tqstringlist.h>
-#include<tqurl.h>
-#include<tqtimer.h>
-#include<tqguardedptr.h>
-#include<qca.h>
-#include<stdlib.h>
-#include"bsocket.h"
-#include"base64.h"
+#include <tqstringlist.h>
+#include <tqurl.h>
+#include <tqtimer.h>
+#include <tqguardedptr.h>
+#include <qca.h>
+#include <stdlib.h>
+#include "bsocket.h"
+#include "base64.h"
 
 #ifdef PROX_DEBUG
-#include<stdio.h>
+#include <stdio.h>
 #endif
 
 #define POLL_KEYS 64
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
index 088d5c33..4342d763 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.h
@@ -21,7 +21,7 @@
 #ifndef CS_HTTPPOLL_H
 #define CS_HTTPPOLL_H
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
index 7db5defb..d36b1fd0 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp
@@ -48,22 +48,22 @@
 //! TQString ip_address = dns.resultString();
 //! \endcode
 
-#include"ndns.h"
+#include "ndns.h"
 
-#include<tqapplication.h>
-#include<tqsocketdevice.h>
-#include<tqptrlist.h>
-#include<tqeventloop.h>
+#include <tqapplication.h>
+#include <tqsocketdevice.h>
+#include <tqptrlist.h>
+#include <tqeventloop.h>
 
 #ifdef Q_OS_UNIX
-#include<netdb.h>
-#include<sys/types.h>
-#include<netinet/in.h>
-#include<arpa/inet.h>
+#include <netdb.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #endif
 
 #ifdef Q_OS_WIN32
-#include<windows.h>
+#include <windows.h>
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
index 01907ccd..50a702f7 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.h
@@ -21,11 +21,11 @@
 #ifndef CS_NDNS_H
 #define CS_NDNS_H
 
-#include<tqobject.h>
-#include<tqcstring.h>
-#include<tqthread.h>
-#include<tqmutex.h>
-#include<tqhostaddress.h>
+#include <tqobject.h>
+#include <tqcstring.h>
+#include <tqthread.h>
+#include <tqmutex.h>
+#include <tqhostaddress.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
index 0e0b5337..9ee26ee5 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"servsock.h"
+#include "servsock.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
index c77b57c8..ac88719b 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.h
@@ -21,7 +21,7 @@
 #ifndef CS_SERVSOCK_H
 #define CS_SERVSOCK_H
 
-#include<tqserversocket.h>
+#include <tqserversocket.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
index e4e1b182..baa1eb84 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp
@@ -18,30 +18,30 @@
  *
  */
 
-#include"socks.h"
+#include "socks.h"
 
-#include<tqhostaddress.h>
-#include<tqstringlist.h>
-#include<tqptrlist.h>
-#include<tqtimer.h>
-#include<tqguardedptr.h>
-#include<tqsocketdevice.h>
-#include<tqsocketnotifier.h>
+#include <tqhostaddress.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
+#include <tqtimer.h>
+#include <tqguardedptr.h>
+#include <tqsocketdevice.h>
+#include <tqsocketnotifier.h>
 
 #ifdef Q_OS_UNIX
-#include<sys/types.h>
-#include<netinet/in.h>
+#include <sys/types.h>
+#include <netinet/in.h>
 #endif
 
 #ifdef Q_OS_WIN32
-#include<windows.h>
+#include <windows.h>
 #endif
 
-#include"servsock.h"
-#include"bsocket.h"
+#include "servsock.h"
+#include "bsocket.h"
 
 #ifdef PROX_DEBUG
-#include<stdio.h>
+#include <stdio.h>
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
index 3205ceb2..a09c14c7 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.h
@@ -21,7 +21,7 @@
 #ifndef CS_SOCKS_H
 #define CS_SOCKS_H
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
index 987de66c..873d6c11 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp
@@ -18,15 +18,15 @@
  *
  */
 
-#include"srvresolver.h"
+#include "srvresolver.h"
 
-#include<tqcstring.h>
-#include<tqtimer.h>
-#include<tqdns.h>
-#include"safedelete.h"
+#include <tqcstring.h>
+#include <tqtimer.h>
+#include <tqdns.h>
+#include "safedelete.h"
 
 #ifndef NO_NDNS
-#include"ndns.h"
+#include "ndns.h"
 #endif
 
 // CS_NAMESPACE_BEGIN
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
index 669bcf80..cfedae4e 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.h
@@ -21,8 +21,8 @@
 #ifndef CS_SRVRESOLVER_H
 #define CS_SRVRESOLVER_H
 
-#include<tqvaluelist.h>
-#include<tqdns.h>
+#include <tqvaluelist.h>
+#include <tqdns.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
index 06df3f73..39b2c57f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"base64.h"
+#include "base64.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.h b/kopete/protocols/jabber/libiris/cutestuff/util/base64.h
index eaa2ff5b..6a817133 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.h
@@ -21,7 +21,7 @@
 #ifndef CS_BASE64_H
 #define CS_BASE64_H
 
-#include<tqstring.h>
+#include <tqstring.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp
index e78c2f9a..72cbb614 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
index 0ffab15b..e64ce68d 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/bytestream.h
@@ -21,8 +21,8 @@
 #ifndef CS_BYTESTREAM_H
 #define CS_BYTESTREAM_H
 
-#include<tqobject.h>
-#include<tqcstring.h>
+#include <tqobject.h>
+#include <tqcstring.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp
index 814b6e9d..98f2944a 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.cpp
@@ -18,12 +18,12 @@
  *
  */
 
-#include"cipher.h"
+#include "cipher.h"
 
-#include<openssl/evp.h>
-#include<openssl/rsa.h>
-#include"bytestream.h"
-#include"tqrandom.h"
+#include <openssl/evp.h>
+#include <openssl/rsa.h>
+#include "bytestream.h"
+#include "tqrandom.h"
 
 static bool lib_encryptArray(const EVP_CIPHER *type, const TQByteArray &buf, const TQByteArray &key, const TQByteArray &iv, bool pad, TQByteArray *out)
 {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h
index 02c7606c..ad1c052f 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/cipher.h
@@ -21,8 +21,8 @@
 #ifndef CS_CIPHER_H
 #define CS_CIPHER_H
 
-#include<tqstring.h>
-#include<tqcstring.h>
+#include <tqstring.h>
+#include <tqcstring.h>
 
 namespace Cipher
 {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp
index 9805de2f..ed1d1a62 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.cpp
@@ -1,6 +1,6 @@
-#include"qrandom.h"
+#include "qrandom.h"
 
-#include<stdlib.h>
+#include <stdlib.h>
 
 uchar QRandom::randomChar()
 {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h
index b877c1f2..ed98c263 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/qrandom.h
@@ -1,7 +1,7 @@
 #ifndef CS_TQRANDOM_H
 #define CS_TQRANDOM_H
 
-#include<tqcstring.h>
+#include <tqcstring.h>
 
 class QRandom
 {
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
index 8ba6272d..7f5dc901 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp
@@ -1,6 +1,6 @@
-#include"safedelete.h"
+#include "safedelete.h"
 
-#include<tqtimer.h>
+#include <tqtimer.h>
 
 //----------------------------------------------------------------------------
 // SafeDelete
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
index ce7a789a..e1e06da1 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.h
@@ -1,8 +1,8 @@
 #ifndef SAFEDELETE_H
 #define SAFEDELETE_H
 
-#include<tqobject.h>
-#include<tqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 
 class SafeDelete;
 class SafeDeleteLock
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp
index 0fefd995..bab37dd4 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"sha1.h"
+#include "sha1.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h
index 093037d3..8d6320eb 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/sha1.h
@@ -21,7 +21,7 @@
 #ifndef CS_SHA1_H
 #define CS_SHA1_H
 
-#include<tqstring.h>
+#include <tqstring.h>
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
index 0c8b46df..7dbb0dd3 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp
@@ -18,13 +18,13 @@
  *
  */
 
-#include"showtextdlg.h"
+#include "showtextdlg.h"
 
-#include<tqlayout.h>
-#include<tqtextedit.h>
-#include<tqpushbutton.h>
-#include<tqfile.h>
-#include<tqtextstream.h>
+#include <tqlayout.h>
+#include <tqtextedit.h>
+#include <tqpushbutton.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 
 ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, const char *name)
diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
index f8eb7095..060dfa60 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
+++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.h
@@ -21,7 +21,7 @@
 #ifndef CS_SHOWTEXTDLG_H
 #define CS_SHOWTEXTDLG_H
 
-#include<tqdialog.h>
+#include <tqdialog.h>
 
 class ShowTextDlg : public TQDialog
 {
diff --git a/kopete/protocols/jabber/libiris/iris/include/im.h b/kopete/protocols/jabber/libiris/iris/include/im.h
index 46a599b7..b164ef99 100644
--- a/kopete/protocols/jabber/libiris/iris/include/im.h
+++ b/kopete/protocols/jabber/libiris/iris/include/im.h
@@ -21,9 +21,9 @@
 #ifndef XMPP_IM_H
 #define XMPP_IM_H
 
-#include<tqdatetime.h>
-#include<tqvaluelist.h>
-#include"xmpp.h"
+#include <tqdatetime.h>
+#include <tqvaluelist.h>
+#include "xmpp.h"
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/include/xmpp.h b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
index 20ae2564..d5a8821a 100644
--- a/kopete/protocols/jabber/libiris/iris/include/xmpp.h
+++ b/kopete/protocols/jabber/libiris/iris/include/xmpp.h
@@ -21,13 +21,13 @@
 #ifndef XMPP_H
 #define XMPP_H
 
-#include<tqobject.h>
-#include<tqstring.h>
-#include<tqhostaddress.h>
-#include<tqstring.h>
-#include<tqcstring.h>
-#include<tqxml.h>
-#include<tqdom.h>
+#include <tqobject.h>
+#include <tqstring.h>
+#include <tqhostaddress.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqxml.h>
+#include <tqdom.h>
 
 namespace TQCA
 {
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
index 86bc65b0..107d082b 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp
@@ -18,14 +18,14 @@
  *
  */
 
-#include"filetransfer.h"
-
-#include<tqtimer.h>
-#include<tqptrlist.h>
-#include<tqguardedptr.h>
-#include<tqfileinfo.h>
-#include"xmpp_xmlcommon.h"
-#include"s5b.h"
+#include "filetransfer.h"
+
+#include <tqtimer.h>
+#include <tqptrlist.h>
+#include <tqguardedptr.h>
+#include <tqfileinfo.h>
+#include "xmpp_xmlcommon.h"
+#include "s5b.h"
 
 #define SENDBUFSIZE 65536
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 9544fbb1..4170897c 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -20,16 +20,16 @@
 
 #include <config.h>
 
-#include"s5b.h"
+#include "s5b.h"
 
-#include<tqtimer.h>
-#include<tqguardedptr.h>
-#include<stdlib.h>
-#include<qca.h>
-#include"xmpp_xmlcommon.h"
+#include <tqtimer.h>
+#include <tqguardedptr.h>
+#include <stdlib.h>
+#include <qca.h>
+#include "xmpp_xmlcommon.h"
 #include "../xmpp-core/hash.h"
-#include"socks.h"
-#include"safedelete.h"
+#include "socks.h"
+#include "safedelete.h"
 
 #ifdef Q_OS_WIN
 # include <windows.h>
@@ -2538,4 +2538,4 @@ void StreamHost::setIsProxy(bool b)
 
 }
 
-#include"s5b.moc"
+#include "s5b.moc"
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
index 46bea1c8..47ca1a36 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.h
@@ -21,12 +21,12 @@
 #ifndef XMPP_S5B_H
 #define XMPP_S5B_H
 
-#include<tqobject.h>
-#include<tqcstring.h>
-#include<tqptrlist.h>
-#include<tqvaluelist.h>
-#include"im.h"
-#include"bytestream.h"
+#include <tqobject.h>
+#include <tqcstring.h>
+#include <tqptrlist.h>
+#include <tqvaluelist.h>
+#include "im.h"
+#include "bytestream.h"
 
 class SocksClient;
 class SocksUDP;
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
index 2ca012c1..aaf3e4cd 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp
@@ -18,13 +18,13 @@
  *
  */
 
-#include"xmpp_ibb.h"
+#include "xmpp_ibb.h"
 
-#include<tqtimer.h>
-#include"xmpp_xmlcommon.h"
-#include"base64.h"
+#include <tqtimer.h>
+#include "xmpp_xmlcommon.h"
+#include "base64.h"
 
-#include<stdlib.h>
+#include <stdlib.h>
 
 #define IBB_PACKET_SIZE   4096
 #define IBB_PACKET_DELAY  0
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
index f177e3a8..6f33d721 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.h
@@ -21,12 +21,12 @@
 #ifndef JABBER_IBB_H
 #define JABBER_IBB_H
 
-#include<tqobject.h>
-#include<tqdom.h>
-#include<tqstring.h>
-#include<tqptrlist.h>
-#include"bytestream.h"
-#include"im.h"
+#include <tqobject.h>
+#include <tqdom.h>
+#include <tqstring.h>
+#include <tqptrlist.h>
+#include "bytestream.h"
+#include "im.h"
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
index a39d92b9..5139dffd 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp
@@ -18,13 +18,13 @@
  *
  */
 
-#include"xmpp_jidlink.h"
+#include "xmpp_jidlink.h"
 
-#include<tqdom.h>
-#include<tqtimer.h>
-#include"im.h"
-#include"s5b.h"
-#include"xmpp_ibb.h"
+#include <tqdom.h>
+#include <tqtimer.h>
+#include "im.h"
+#include "s5b.h"
+#include "xmpp_ibb.h"
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
index 055299f3..394a7497 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
+++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.h
@@ -25,9 +25,9 @@
 #ifndef JABBER_JIDLINK_H
 #define JABBER_JIDLINK_H
 
-#include<tqobject.h>
-#include<tqstring.h>
-#include"xmpp.h"
+#include <tqobject.h>
+#include <tqstring.h>
+#include "xmpp.h"
 
 class ByteStream;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index 20333998..be32bda6 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -29,24 +29,24 @@
   greatly simplify this class.  - Sep 3rd, 2003.
 */
 
-#include"xmpp.h"
+#include "xmpp.h"
 
-#include<tqguardedptr.h>
-#include<qca.h>
-#include"safedelete.h"
+#include <tqguardedptr.h>
+#include <qca.h>
+#include "safedelete.h"
 
 #ifdef NO_NDNS
-#include<tqdns.h>
+#include <tqdns.h>
 #else
-#include"ndns.h"
+#include "ndns.h"
 #endif
 
-#include"srvresolver.h"
-#include"bsocket.h"
-#include"httpconnect.h"
-#include"httppoll.h"
-#include"socks.h"
-#include"hash.h"
+#include "srvresolver.h"
+#include "bsocket.h"
+#include "httpconnect.h"
+#include "httppoll.h"
+#include "socks.h"
+#include "hash.h"
 
 //#define XMPP_DEBUG
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp
index f531230c..11646e32 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"hash.h"
+#include "hash.h"
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
index 090cc9df..a639d349 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/jid.cpp
@@ -18,10 +18,10 @@
  *
  */
 
-#include"xmpp.h"
+#include "xmpp.h"
 
-#include<tqdict.h>
-#include<stringprep.h>
+#include <tqdict.h>
+#include <stringprep.h>
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
index 3fa7d6c3..d4706a80 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.cpp
@@ -47,11 +47,11 @@
     it would be nice if TQt had this already.
 */
 
-#include"parser.h"
+#include "parser.h"
 
-#include<tqtextcodec.h>
-#include<tqptrlist.h>
-#include<string.h>
+#include <tqtextcodec.h>
+#include <tqptrlist.h>
+#include <string.h>
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h
index 55dcdde9..3b57b106 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/parser.h
@@ -21,8 +21,8 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include<tqdom.h>
-#include<tqxml.h>
+#include <tqdom.h>
+#include <tqxml.h>
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index d0e7be99..f9328436 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -23,14 +23,14 @@
 //       report ErrProtocol if server uses wrong NS
 //       use send() instead of writeElement() in CoreProtocol
 
-#include"protocol.h"
+#include "protocol.h"
 
-#include<qca.h>
-#include"base64.h"
-#include"hash.h"
+#include <qca.h>
+#include "base64.h"
+#include "hash.h"
 
 #ifdef XMPP_TEST
-#include"td.h"
+#include "td.h"
 #endif
 
 using namespace XMPP;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.h
index 0c735192..a27e3646 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.h
@@ -21,9 +21,9 @@
 #ifndef PROTOCOL_H
 #define PROTOCOL_H
 
-#include<tqpair.h>
-#include"xmlprotocol.h"
-#include"xmpp.h"
+#include <tqpair.h>
+#include "xmlprotocol.h"
+#include "xmpp.h"
 
 #define NS_ETHERX   "http://etherx.jabber.org/streams"
 #define NS_CLIENT   "jabber:client"
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
index fdcd57c1..1dbc6e92 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp
@@ -26,14 +26,14 @@
     but future layers might not.
 */
 
-#include"securestream.h"
+#include "securestream.h"
 
-#include<tqguardedptr.h>
-#include<tqvaluelist.h>
-#include<tqtimer.h>
+#include <tqguardedptr.h>
+#include <tqvaluelist.h>
+#include <tqtimer.h>
 
 #ifdef USE_TLSHANDLER
-#include"xmpp.h"
+#include "xmpp.h"
 #endif
 
 //----------------------------------------------------------------------------
@@ -305,7 +305,7 @@ private slots:
 #endif
 };
 
-#include"securestream.moc"
+#include "securestream.moc"
 
 class SecureStream::Private
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
index 79f877ad..4d60e3d3 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
@@ -21,8 +21,8 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include<qca.h>
-#include"bytestream.h"
+#include <qca.h>
+#include "bytestream.h"
 
 #define USE_TLSHANDLER
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
index b33048d1..92091f63 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
@@ -18,15 +18,15 @@
  *
  */
 
-#include"simplesasl.h"
-
-#include<tqhostaddress.h>
-#include<tqstringlist.h>
-#include<tqptrlist.h>
-#include<tqvaluelist.h>
-#include<qca.h>
-#include<stdlib.h>
-#include"base64.h"
+#include "simplesasl.h"
+
+#include <tqhostaddress.h>
+#include <tqstringlist.h>
+#include <tqptrlist.h>
+#include <tqvaluelist.h>
+#include <qca.h>
+#include <stdlib.h>
+#include "base64.h"
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 69b91a86..f8652b35 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -42,22 +42,22 @@
     - sasl anonymous
 */
 
-#include"xmpp.h"
-
-#include<tqtextstream.h>
-#include<tqguardedptr.h>
-#include<tqtimer.h>
-#include<qca.h>
-#include<stdlib.h>
-#include"bytestream.h"
-#include"base64.h"
-#include"hash.h"
-#include"simplesasl.h"
-#include"securestream.h"
-#include"protocol.h"
+#include "xmpp.h"
+
+#include <tqtextstream.h>
+#include <tqguardedptr.h>
+#include <tqtimer.h>
+#include <qca.h>
+#include <stdlib.h>
+#include "bytestream.h"
+#include "base64.h"
+#include "hash.h"
+#include "simplesasl.h"
+#include "securestream.h"
+#include "protocol.h"
 
 #ifdef XMPP_TEST
-#include"td.h"
+#include "td.h"
 #endif
 
 //#define XMPP_DEBUG
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/td.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/td.h
index f4d560f4..07ee1511 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/td.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/td.h
@@ -1,7 +1,7 @@
 #ifndef TESTDEBUG_H
 #define TESTDEBUG_H
 
-#include<tqdom.h>
+#include <tqdom.h>
 
 class TD
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
index d00f50dc..ea613b75 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
@@ -18,9 +18,9 @@
  *
  */
 
-#include"xmpp.h"
+#include "xmpp.h"
 
-#include<tqtimer.h>
+#include <tqtimer.h>
 #include <qca.h>
 
 using namespace XMPP;
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
index 93748aa8..3521a628 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.cpp
@@ -18,9 +18,9 @@
  *
  */
 
-#include"xmlprotocol.h"
+#include "xmlprotocol.h"
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.h
index e3da8a09..fb4eba1d 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/xmlprotocol.h
@@ -21,9 +21,9 @@
 #ifndef XMLPROTOCOL_H
 #define XMLPROTOCOL_H
 
-#include<tqdom.h>
-#include<tqvaluelist.h>
-#include"parser.h"
+#include <tqdom.h>
+#include <tqvaluelist.h>
+#include "parser.h"
 
 #define NS_XML "http://www.w3.org/XML/1998/namespace"
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
index b7d5e00c..08c5c415 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp
@@ -18,8 +18,8 @@
  *
  */
 
-#include"im.h"
-#include"safedelete.h"
+#include "im.h"
+#include "safedelete.h"
 
 //! \class Client client.h
 //! \brief Communicates with the Jabber network.  Start here.
@@ -69,30 +69,30 @@
 //!  }
 //!  \endcode
 
-#include<stdarg.h>
-#include<tqmap.h>
-#include<tqobjectlist.h>
-#include<tqtimer.h>
-#include<tqguardedptr.h>
-#include"xmpp_tasks.h"
-#include"xmpp_xmlcommon.h"
-#include"s5b.h"
-#include"xmpp_ibb.h"
-#include"xmpp_jidlink.h"
-#include"filetransfer.h"
-
-/*#include<stdio.h>
-#include<stdarg.h>
-#include<tqstring.h>
-#include<tqdom.h>
-#include<tqobjectlist.h>
-#include<tqtimer.h>
-#include"xmpp_stream.h"
-#include"xmpp_tasks.h"
-#include"xmpp_xmlcommon.h"
-#include"xmpp_dtcp.h"
-#include"xmpp_ibb.h"
-#include"xmpp_jidlink.h"
+#include <stdarg.h>
+#include <tqmap.h>
+#include <tqobjectlist.h>
+#include <tqtimer.h>
+#include <tqguardedptr.h>
+#include "xmpp_tasks.h"
+#include "xmpp_xmlcommon.h"
+#include "s5b.h"
+#include "xmpp_ibb.h"
+#include "xmpp_jidlink.h"
+#include "filetransfer.h"
+
+/*#include <stdio.h>
+#include <stdarg.h>
+#include <tqstring.h>
+#include <tqdom.h>
+#include <tqobjectlist.h>
+#include <tqtimer.h>
+#include "xmpp_stream.h"
+#include "xmpp_tasks.h"
+#include "xmpp_xmlcommon.h"
+#include "xmpp_dtcp.h"
+#include "xmpp_ibb.h"
+#include "xmpp_jidlink.h"
 
 using namespace Jabber;*/
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
index f322802a..9e8632dd 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/types.cpp
@@ -18,10 +18,10 @@
  *
  */
 
-#include"im.h"
+#include "im.h"
 #include "protocol.h"
-#include<tqmap.h>
-#include<tqapplication.h>
+#include <tqmap.h>
+#include <tqapplication.h>
 
 #define NS_XML     "http://www.w3.org/XML/1998/namespace"
 
@@ -1874,4 +1874,4 @@ TQString DiscoItem::action2string(Action a)
 
 }
 
-#include"types.moc"
+#include "types.moc"
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
index edc8762e..c331e123 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp
@@ -18,17 +18,17 @@
  *
  */
 
-#include"xmpp_tasks.h"
+#include "xmpp_tasks.h"
 
-#include"base64.h"
-//#include"sha1.h"
-#include"xmpp_xmlcommon.h"
-//#include"xmpp_stream.h"
-//#include"xmpp_types.h"
-#include"xmpp_vcard.h"
+#include "base64.h"
+//#include "sha1.h"
+#include "xmpp_xmlcommon.h"
+//#include "xmpp_stream.h"
+//#include "xmpp_types.h"
+#include "xmpp_vcard.h"
 
-#include<tqregexp.h>
-#include<tqvaluelist.h>
+#include <tqregexp.h>
+#include <tqvaluelist.h>
 
 using namespace XMPP;
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
index 438d298c..35c9f6a7 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.h
@@ -21,11 +21,11 @@
 #ifndef JABBER_TASKS_H
 #define JABBER_TASKS_H
 
-#include<tqstring.h>
-#include<tqdom.h>
+#include <tqstring.h>
+#include <tqdom.h>
 
-#include"im.h"
-#include"xmpp_vcard.h"
+#include "im.h"
+#include "xmpp_vcard.h"
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp
index 65c3b8b3..b6297b61 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"xmpp_xmlcommon.h"
+#include "xmpp_xmlcommon.h"
 
 #include <tqstring.h>
 #include <tqdom.h>
@@ -28,7 +28,7 @@
 #include <tqstringlist.h>
 #include <tqcolor.h>
 
-#include"im.h"
+#include "im.h"
 
 bool stamp2TS(const TQString &ts, TQDateTime *d)
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
index f6a94e59..3d45b343 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_xmlcommon.h
@@ -21,7 +21,7 @@
 #ifndef JABBER_XMLCOMMON_H
 #define JABBER_XMLCOMMON_H
 
-#include<tqdom.h>
+#include <tqdom.h>
 
 class TQDateTime;
 class TQRect;
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
index 26891798..89df0bb0 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.cpp
@@ -18,19 +18,19 @@
  *
  */
 
-#include"qca.h"
-
-#include<tqptrlist.h>
-#include<tqdir.h>
-#include<tqfileinfo.h>
-#include<tqstringlist.h>
-#include<tqlibrary.h>
-#include<tqtimer.h>
-#include<tqhostaddress.h>
-#include<tqapplication.h>
-#include<tqguardedptr.h>
-#include<stdlib.h>
-#include"qcaprovider.h"
+#include "qca.h"
+
+#include <tqptrlist.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqstringlist.h>
+#include <tqlibrary.h>
+#include <tqtimer.h>
+#include <tqhostaddress.h>
+#include <tqapplication.h>
+#include <tqguardedptr.h>
+#include <stdlib.h>
+#include "qcaprovider.h"
 
 #if defined(Q_OS_WIN32)
 #define PLUGIN_EXT "dll"
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/qca.h
index 73edb40d..7a8a3af4 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.h
+++ b/kopete/protocols/jabber/libiris/qca/src/qca.h
@@ -21,12 +21,12 @@
 #ifndef TQCA_H
 #define TQCA_H
 
-#include<tqstring.h>
-#include<tqcstring.h>
-#include<tqdatetime.h>
-#include<tqmap.h>
-#include<tqptrlist.h>
-#include<tqobject.h>
+#include <tqstring.h>
+#include <tqcstring.h>
+#include <tqdatetime.h>
+#include <tqmap.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
 
 #ifdef Q_OS_WIN32
 #  ifndef TQCA_STATIC
diff --git a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h
index a88b12aa..b0e5385a 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h
+++ b/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h
@@ -21,12 +21,12 @@
 #ifndef TQCAPROVIDER_H
 #define TQCAPROVIDER_H
 
-#include<tqglobal.h>
-#include<tqstring.h>
-#include<tqdatetime.h>
-#include<tqobject.h>
-#include<tqhostaddress.h>
-#include"qca.h"
+#include <tqglobal.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqobject.h>
+#include <tqhostaddress.h>
+#include "qca.h"
 
 #define TQCA_PLUGIN_VERSION 1
 
diff --git a/kopete/protocols/msn/sha1.cpp b/kopete/protocols/msn/sha1.cpp
index c8609209..d0a13135 100644
--- a/kopete/protocols/msn/sha1.cpp
+++ b/kopete/protocols/msn/sha1.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"sha1.h"
+#include "sha1.h"
 
 /****************************************************************************
   SHA1 - from a public domain implementation by Steve Reid (steve@edmweb.com)
diff --git a/kopete/protocols/msn/sha1.h b/kopete/protocols/msn/sha1.h
index eee84abc..9138fd32 100644
--- a/kopete/protocols/msn/sha1.h
+++ b/kopete/protocols/msn/sha1.h
@@ -21,7 +21,7 @@
 #ifndef CS_SHA1_H
 #define CS_SHA1_H
 
-#include<tqstring.h>
+#include <tqstring.h>
 
 class SHA1
 {
diff --git a/kopete/protocols/oscar/liboscar/bytestream.cpp b/kopete/protocols/oscar/liboscar/bytestream.cpp
index 87603c76..4674c13d 100644
--- a/kopete/protocols/oscar/liboscar/bytestream.cpp
+++ b/kopete/protocols/oscar/liboscar/bytestream.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/oscar/liboscar/safedelete.h b/kopete/protocols/oscar/liboscar/safedelete.h
index 33748953..a740d66f 100644
--- a/kopete/protocols/oscar/liboscar/safedelete.h
+++ b/kopete/protocols/oscar/liboscar/safedelete.h
@@ -20,8 +20,8 @@
 #ifndef SAFEDELETE_H
 #define SAFEDELETE_H
 
-#include<tqobject.h>
-#include<tqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 
 class SafeDelete;
 class SafeDeleteLock
diff --git a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
index 8ca3a4cd..a0c16f6b 100644
--- a/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/bytestream.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <kdebug.h>
-#include"bytestream.h"
+#include "bytestream.h"
 
 // CS_NAMESPACE_BEGIN
 
diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.h b/kopete/protocols/yahoo/libkyahoo/safedelete.h
index b46e9b8f..506c897e 100644
--- a/kopete/protocols/yahoo/libkyahoo/safedelete.h
+++ b/kopete/protocols/yahoo/libkyahoo/safedelete.h
@@ -20,8 +20,8 @@
 #ifndef SAFEDELETE_H
 #define SAFEDELETE_H
 
-#include<tqobject.h>
-#include<tqobjectlist.h>
+#include <tqobject.h>
+#include <tqobjectlist.h>
 
 class SafeDelete;
 class SafeDeleteLock