clang-format: Enable regrouping and sorting of includes

123 files changed, 384 insertions, 345 deletions

diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp
index de3fbed8..9f919c1d 100644
--- a/src/base/QXmppArchiveIq.cpp
+++ b/src/base/QXmppArchiveIq.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppArchiveIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QXmppArchiveMessage::QXmppArchiveMessage()
     : m_received(false)
 {
diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp
index b0351980..3eb6d908 100644
--- a/src/base/QXmppBindIq.cpp
+++ b/src/base/QXmppBindIq.cpp
@@ -22,14 +22,15 @@
  *
  */
 
+#include "QXmppBindIq.h"
+
+#include "QXmppConstants_p.h"
+#include "QXmppUtils.h"
+
 #include <QDomElement>
 #include <QTextStream>
 #include <QXmlStreamWriter>
 
-#include "QXmppBindIq.h"
-#include "QXmppUtils.h"
-#include "QXmppConstants_p.h"
-
 /// Returns the bound JID.
 ///
 
diff --git a/src/base/QXmppBitsOfBinaryContentId.h b/src/base/QXmppBitsOfBinaryContentId.h
index aff3fc7b..049bc54a 100644
--- a/src/base/QXmppBitsOfBinaryContentId.h
+++ b/src/base/QXmppBitsOfBinaryContentId.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPBITSOFBINARYCONTENTID_H
 #define QXMPPBITSOFBINARYCONTENTID_H
 
-#include <QSharedDataPointer>
-#include <QCryptographicHash>
-
 #include "QXmppGlobal.h"
 
+#include <QCryptographicHash>
+#include <QSharedDataPointer>
+
 class QXmppBitsOfBinaryContentIdPrivate;
 
 /// \class QXmppBitsOfBinaryContentId represents a link to or an identifier of
diff --git a/src/base/QXmppBitsOfBinaryData.cpp b/src/base/QXmppBitsOfBinaryData.cpp
index f3eba9cb..89c83cf6 100644
--- a/src/base/QXmppBitsOfBinaryData.cpp
+++ b/src/base/QXmppBitsOfBinaryData.cpp
@@ -23,16 +23,16 @@
 
 #include "QXmppBitsOfBinaryData.h"
 
-#include <QDomElement>
-#include <QSharedData>
-#include <QMimeType>
-#include <QMimeDatabase>
-#include <QXmlStreamWriter>
-
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QMimeDatabase>
+#include <QMimeType>
+#include <QSharedData>
+#include <QXmlStreamWriter>
+
 class QXmppBitsOfBinaryDataPrivate : public QSharedData
 {
 public:
diff --git a/src/base/QXmppBitsOfBinaryData.h b/src/base/QXmppBitsOfBinaryData.h
index b8e3780a..28fe9dfd 100644
--- a/src/base/QXmppBitsOfBinaryData.h
+++ b/src/base/QXmppBitsOfBinaryData.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPBITSOFBINARYDATA_H
 #define QXMPPBITSOFBINARYDATA_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+
 class QDomElement;
 class QMimeType;
 class QXmlStreamWriter;
diff --git a/src/base/QXmppBitsOfBinaryDataList.cpp b/src/base/QXmppBitsOfBinaryDataList.cpp
index 1f13fa82..1a879e72 100644
--- a/src/base/QXmppBitsOfBinaryDataList.cpp
+++ b/src/base/QXmppBitsOfBinaryDataList.cpp
@@ -23,11 +23,11 @@
 
 #include "QXmppBitsOfBinaryDataList.h"
 
-#include <QDomElement>
-
 #include "QXmppBitsOfBinaryData.h"
 #include "QXmppConstants_p.h"
 
+#include <QDomElement>
+
 QXmppBitsOfBinaryDataList::QXmppBitsOfBinaryDataList() = default;
 
 QXmppBitsOfBinaryDataList::~QXmppBitsOfBinaryDataList() = default;
diff --git a/src/base/QXmppBitsOfBinaryDataList.h b/src/base/QXmppBitsOfBinaryDataList.h
index bf94df83..e4c05794 100644
--- a/src/base/QXmppBitsOfBinaryDataList.h
+++ b/src/base/QXmppBitsOfBinaryDataList.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPBITSOFBINARYDATACONTAINER_H
 #define QXMPPBITSOFBINARYDATACONTAINER_H
 
-#include <QVector>
-
 #include "QXmppBitsOfBinaryData.h"
 
+#include <QVector>
+
 class QDomElement;
 class QXmlStreamWriter;
 
diff --git a/src/base/QXmppBitsOfBinaryIq.h b/src/base/QXmppBitsOfBinaryIq.h
index 09325c01..524deaf0 100644
--- a/src/base/QXmppBitsOfBinaryIq.h
+++ b/src/base/QXmppBitsOfBinaryIq.h
@@ -24,8 +24,8 @@
 #ifndef QXMPPBITSOFBINARYIQ_H
 #define QXMPPBITSOFBINARYIQ_H
 
-#include "QXmppIq.h"
 #include "QXmppBitsOfBinaryData.h"
+#include "QXmppIq.h"
 
 /// \class QXmppBitsOfBinaryIq represents a XEP-0231: Bits of Binary IQ to
 /// request and transmit Bits of Binary data elements.
diff --git a/src/base/QXmppBookmarkSet.cpp b/src/base/QXmppBookmarkSet.cpp
index e70adcc6..d4fd4daf 100644
--- a/src/base/QXmppBookmarkSet.cpp
+++ b/src/base/QXmppBookmarkSet.cpp
@@ -21,11 +21,12 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppBookmarkSet.h"
+
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 static const char *ns_bookmarks = "storage:bookmarks";
 
 /// Constructs a new conference room bookmark.
diff --git a/src/base/QXmppBookmarkSet.h b/src/base/QXmppBookmarkSet.h
index 72826db3..9b9b0d4c 100644
--- a/src/base/QXmppBookmarkSet.h
+++ b/src/base/QXmppBookmarkSet.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPBOOKMARKSET_H
 #define QXMPPBOOKMARKSET_H
 
+#include "QXmppStanza.h"
+
 #include <QList>
 #include <QUrl>
 
-#include "QXmppStanza.h"
-
 /// \brief The QXmppBookmarkConference class represents a bookmark for a conference room,
 /// as defined by XEP-0048: Bookmarks.
 ///
diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp
index 92709b4d..2a8d3d8c 100644
--- a/src/base/QXmppByteStreamIq.cpp
+++ b/src/base/QXmppByteStreamIq.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppByteStreamIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QString QXmppByteStreamIq::StreamHost::host() const
 {
     return m_host;
diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp
index 91478e0a..0a4cfb73 100644
--- a/src/base/QXmppCodec.cpp
+++ b/src/base/QXmppCodec.cpp
@@ -25,17 +25,17 @@
  *  G.711 based on reference implementation by Sun Microsystems, Inc.
  */
 
-#include <QDataStream>
-#include <QDebug>
-#include <QSize>
-#include <QThread>
-
 #include "QXmppCodec_p.h"
 #include "QXmppRtpChannel.h"
 #include "QXmppRtpPacket.h"
 
 #include <cstring>
 
+#include <QDataStream>
+#include <QDebug>
+#include <QSize>
+#include <QThread>
+
 #ifdef QXMPP_USE_SPEEX
 #include <speex/speex.h>
 #endif
diff --git a/src/base/QXmppCodec_p.h b/src/base/QXmppCodec_p.h
index 6ca0dfd7..d9a8e3c2 100644
--- a/src/base/QXmppCodec_p.h
+++ b/src/base/QXmppCodec_p.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPCODEC_H
 #define QXMPPCODEC_H
 
-#include <QMap>
-
 #include "QXmppGlobal.h"
 
+#include <QMap>
+
 class QXmppRtpPacket;
 class QXmppVideoFormat;
 class QXmppVideoFrame;
diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp
index 07347580..0ff845f8 100644
--- a/src/base/QXmppConstants.cpp
+++ b/src/base/QXmppConstants.cpp
@@ -21,7 +21,6 @@
  *
  */
 
-
 #include "QXmppConstants_p.h"
 
 const char* ns_stream = "http://etherx.jabber.org/streams";
diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp
index 7face338..f162268e 100644
--- a/src/base/QXmppDataForm.cpp
+++ b/src/base/QXmppDataForm.cpp
@@ -22,6 +22,11 @@
  *
  */
 
+#include "QXmppDataForm.h"
+
+#include "QXmppConstants_p.h"
+#include "QXmppUtils.h"
+
 #include <QDebug>
 #include <QDomElement>
 #include <QMimeDatabase>
diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp
index 6524e81f..b38eec52 100644
--- a/src/base/QXmppDiscoveryIq.cpp
+++ b/src/base/QXmppDiscoveryIq.cpp
@@ -21,13 +21,14 @@
  *
  */
 
-#include <QCryptographicHash>
-#include <QDomElement>
+#include "QXmppDiscoveryIq.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppDiscoveryIq.h"
 #include "QXmppUtils.h"
 
+#include <QCryptographicHash>
+#include <QDomElement>
+
 static bool identityLessThan(const QXmppDiscoveryIq::Identity &i1, const QXmppDiscoveryIq::Identity &i2)
 {
     if (i1.category() < i2.category())
diff --git a/src/base/QXmppElement.cpp b/src/base/QXmppElement.cpp
index fbf8762c..1e3ec7fb 100644
--- a/src/base/QXmppElement.cpp
+++ b/src/base/QXmppElement.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "QXmppElement.h"
+
 #include "QXmppUtils.h"
 
 #include <QDomElement>
diff --git a/src/base/QXmppElement.h b/src/base/QXmppElement.h
index 7a02f221..99f58989 100644
--- a/src/base/QXmppElement.h
+++ b/src/base/QXmppElement.h
@@ -24,12 +24,12 @@
 #ifndef QXMPPELEMENT_H
 #define QXMPPELEMENT_H
 
+#include "QXmppGlobal.h"
+
 #include <QMap>
 #include <QStringList>
 #include <QXmlStreamWriter>
 
-#include "QXmppGlobal.h"
-
 class QDomElement;
 class QXmppElement;
 class QXmppElementPrivate;
diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp
index 9dad7ce0..938517bc 100644
--- a/src/base/QXmppEntityTimeIq.cpp
+++ b/src/base/QXmppEntityTimeIq.cpp
@@ -21,14 +21,13 @@
  *
  */
 
-
 #include "QXmppEntityTimeIq.h"
 
-#include <QDomElement>
-
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 /// Returns the timezone offset in seconds.
 ///
 
diff --git a/src/base/QXmppEntityTimeIq.h b/src/base/QXmppEntityTimeIq.h
index cac3e19d..ba9b5629 100644
--- a/src/base/QXmppEntityTimeIq.h
+++ b/src/base/QXmppEntityTimeIq.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPENTITYTIMEIQ_H
 #define QXMPPENTITYTIMEIQ_H
 
-#include <QDateTime>
-
 #include "QXmppIq.h"
 
+#include <QDateTime>
+
 /// \ingroup Stanzas
 
 class QXMPP_EXPORT QXmppEntityTimeIq : public QXmppIq
diff --git a/src/base/QXmppHttpUploadIq.cpp b/src/base/QXmppHttpUploadIq.cpp
index 932f5504..81c70776 100644
--- a/src/base/QXmppHttpUploadIq.cpp
+++ b/src/base/QXmppHttpUploadIq.cpp
@@ -21,14 +21,15 @@
  *
  */
 
+#include "QXmppHttpUploadIq.h"
+
+#include "QXmppConstants_p.h"
+
 #include <QDomElement>
 #include <QMimeDatabase>
 #include <QSharedData>
 #include <QUrl>
 
-#include "QXmppHttpUploadIq.h"
-#include "QXmppConstants_p.h"
-
 class QXmppHttpUploadRequestIqPrivate : public QSharedData
 {
 public:
diff --git a/src/base/QXmppHttpUploadIq.h b/src/base/QXmppHttpUploadIq.h
index 964842ee..4b39e5b9 100644
--- a/src/base/QXmppHttpUploadIq.h
+++ b/src/base/QXmppHttpUploadIq.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPHTTPUPLOADIQ_H
 #define QXMPPHTTPUPLOADIQ_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppIq.h"
 
+#include <QSharedDataPointer>
+
 class QUrl;
 class QMimeType;
 
diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp
index 7f79140b..13928d88 100644
--- a/src/base/QXmppIbbIq.cpp
+++ b/src/base/QXmppIbbIq.cpp
@@ -22,15 +22,15 @@
  *
  */
 
-#include <QDomElement>
-#include <QXmlStreamWriter>
+#include "QXmppIbbIq.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppIbbIq.h"
+
+#include <QDomElement>
+#include <QXmlStreamWriter>
 
 QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024)
 {
-
 }
 
 long QXmppIbbOpenIq::blockSize() const
diff --git a/src/base/QXmppIq.cpp b/src/base/QXmppIq.cpp
index 21084c43..4d862378 100644
--- a/src/base/QXmppIq.cpp
+++ b/src/base/QXmppIq.cpp
@@ -21,9 +21,9 @@
  *
  */
 
+#include "QXmppIq.h"
 
 #include "QXmppUtils.h"
-#include "QXmppIq.h"
 
 #include <QDomElement>
 #include <QXmlStreamWriter>
diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp
index 4c0be456..00b1c0c1 100644
--- a/src/base/QXmppJingleIq.cpp
+++ b/src/base/QXmppJingleIq.cpp
@@ -21,15 +21,16 @@
  *
  */
 
+#include "QXmppJingleIq.h"
+
+#include "QXmppConstants_p.h"
+#include "QXmppUtils.h"
+
 #include <QDate>
 #include <QDateTime>
 #include <QDomElement>
 #include <QRegExp>
 
-#include "QXmppConstants_p.h"
-#include "QXmppJingleIq.h"
-#include "QXmppUtils.h"
-
 static const int RTP_COMPONENT = 1;
 
 static const char* ns_jingle_rtp_info = "urn:xmpp:jingle:apps:rtp:info:1";
diff --git a/src/base/QXmppJingleIq.h b/src/base/QXmppJingleIq.h
index 5a1eb337..5fcd1bb9 100644
--- a/src/base/QXmppJingleIq.h
+++ b/src/base/QXmppJingleIq.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPJINGLEIQ_H
 #define QXMPPJINGLEIQ_H
 
-#include <QHostAddress>
-
 #include "QXmppIq.h"
 
+#include <QHostAddress>
+
 class QXmppJingleCandidatePrivate;
 class QXmppJingleIqContentPrivate;
 class QXmppJingleIqPrivate;
diff --git a/src/base/QXmppLogger.cpp b/src/base/QXmppLogger.cpp
index 10ee3471..d1f2e57b 100644
--- a/src/base/QXmppLogger.cpp
+++ b/src/base/QXmppLogger.cpp
@@ -22,6 +22,8 @@
  *
  */
 
+#include "QXmppLogger.h"
+
 #include <iostream>
 
 #include <QChildEvent>
diff --git a/src/base/QXmppLogger.h b/src/base/QXmppLogger.h
index 7deec338..4513b59a 100644
--- a/src/base/QXmppLogger.h
+++ b/src/base/QXmppLogger.h
@@ -25,10 +25,10 @@
 #ifndef QXMPPLOGGER_H
 #define QXMPPLOGGER_H
 
-#include <QObject>
-
 #include "QXmppGlobal.h"
 
+#include <QObject>
+
 #ifdef QXMPP_LOGGABLE_TRACE
 #define qxmpp_loggable_trace(x) QString("%1(0x%2) %3").arg(metaObject()->className(), QString::number(reinterpret_cast<qint64>(this), 16), x)
 #else
diff --git a/src/base/QXmppMamIq.cpp b/src/base/QXmppMamIq.cpp
index c2a719e4..75493c9d 100644
--- a/src/base/QXmppMamIq.cpp
+++ b/src/base/QXmppMamIq.cpp
@@ -21,11 +21,12 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppMamIq.h"
+
 #include "QXmppConstants_p.h"
 
+#include <QDomElement>
+
 QXmppMamQueryIq::QXmppMamQueryIq() : QXmppIq(QXmppIq::Set)
 {
 }
@@ -129,7 +130,6 @@ void QXmppMamQueryIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 }
 /// \endcond
 
-
 QXmppMamResultIq::QXmppMamResultIq() : m_complete(false)
 {
 }
diff --git a/src/base/QXmppMamIq.h b/src/base/QXmppMamIq.h
index a60e4ecd..115fc289 100644
--- a/src/base/QXmppMamIq.h
+++ b/src/base/QXmppMamIq.h
@@ -24,8 +24,8 @@
 #ifndef QXMPPMAMIQ_H
 #define QXMPPMAMIQ_H
 
-#include "QXmppIq.h"
 #include "QXmppDataForm.h"
+#include "QXmppIq.h"
 #include "QXmppResultSet.h"
 
 /// \brief The QXmppMamQueryIq class represents the query IQ for
diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp
index 4f50b836..2d4ee40a 100644
--- a/src/base/QXmppMessage.cpp
+++ b/src/base/QXmppMessage.cpp
@@ -23,16 +23,17 @@
  *
  */
 
-#include <QDateTime>
-#include <QDomElement>
-#include <QTextStream>
-#include <QXmlStreamWriter>
+#include "QXmppMessage.h"
 
 #include "QXmppBitsOfBinaryDataList.h"
 #include "QXmppConstants_p.h"
-#include "QXmppMessage.h"
 #include "QXmppUtils.h"
 
+#include <QDateTime>
+#include <QDomElement>
+#include <QTextStream>
+#include <QXmlStreamWriter>
+
 static const QStringList CHAT_STATES = {
     QString(),
     QStringLiteral("active"),
diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h
index 9a1ef401..970395aa 100644
--- a/src/base/QXmppMessage.h
+++ b/src/base/QXmppMessage.h
@@ -27,10 +27,10 @@
 #define QXMPPMESSAGE_H
 
 // Required for source compatibility
-#include <QDateTime>
-
 #include "QXmppStanza.h"
 
+#include <QDateTime>
+
 class QXmppMessagePrivate;
 class QXmppBitsOfBinaryDataList;
 
diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp
index 854b86b8..1ed02176 100644
--- a/src/base/QXmppMixIq.cpp
+++ b/src/base/QXmppMixIq.cpp
@@ -22,8 +22,9 @@
  */
 
 #include "QXmppMixIq.h"
-#include "QXmppDataForm.h"
+
 #include "QXmppConstants_p.h"
+#include "QXmppDataForm.h"
 #include "QXmppUtils.h"
 
 #include <QDomElement>
diff --git a/src/base/QXmppMixIq.h b/src/base/QXmppMixIq.h
index 06af53a1..7866e4ee 100644
--- a/src/base/QXmppMixIq.h
+++ b/src/base/QXmppMixIq.h
@@ -25,6 +25,7 @@
 #define QXMPPMIXIQ_H
 
 #include "QXmppIq.h"
+
 #include <QSharedDataPointer>
 
 class QXmppMixIqPrivate;
diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp
index f06dac4f..882a3b99 100644
--- a/src/base/QXmppMixItem.cpp
+++ b/src/base/QXmppMixItem.cpp
@@ -22,8 +22,9 @@
  */
 
 #include "QXmppMixItem.h"
-#include "QXmppDataForm.h"
+
 #include "QXmppConstants_p.h"
+#include "QXmppDataForm.h"
 #include "QXmppUtils.h"
 
 #include <QBuffer>
diff --git a/src/base/QXmppMixItem.h b/src/base/QXmppMixItem.h
index d1b42b48..c7107c27 100644
--- a/src/base/QXmppMixItem.h
+++ b/src/base/QXmppMixItem.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPMIXITEM_H
 #define QXMPPMIXITEM_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppElement.h"
 
+#include <QSharedDataPointer>
+
 class QXmppMixInfoItemPrivate;
 class QXmppMixParticipantItemPrivate;
 
diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp
index 7120536c..d0c50fc2 100644
--- a/src/base/QXmppMucIq.cpp
+++ b/src/base/QXmppMucIq.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppMucIq.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppMucIq.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QXmppMucItem::QXmppMucItem()
     : m_affiliation(QXmppMucItem::UnspecifiedAffiliation),
     m_role(QXmppMucItem::UnspecifiedRole)
diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp
index aa6f8791..4acee23b 100644
--- a/src/base/QXmppNonSASLAuth.cpp
+++ b/src/base/QXmppNonSASLAuth.cpp
@@ -21,14 +21,15 @@
  *
  */
 
-#include <QCryptographicHash>
-#include <QDomElement>
-#include <QXmlStreamWriter>
+#include "QXmppNonSASLAuth.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppNonSASLAuth.h"
 #include "QXmppUtils.h"
 
+#include <QCryptographicHash>
+#include <QDomElement>
+#include <QXmlStreamWriter>
+
 QXmppNonSASLAuthIq::QXmppNonSASLAuthIq()
     : QXmppIq(QXmppIq::Set)
 {
diff --git a/src/base/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp
index bbec9dca..3a8d49fe 100644
--- a/src/base/QXmppPingIq.cpp
+++ b/src/base/QXmppPingIq.cpp
@@ -21,8 +21,9 @@
  *
  */
 
-#include "QXmppConstants_p.h"
 #include "QXmppPingIq.h"
+
+#include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
 #include <QDomElement>
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index f0353b8d..f7959aa6 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -21,15 +21,14 @@
  *
  */
 
-
 #include "QXmppPresence.h"
 
-#include <QDateTime>
-#include <QDomElement>
-
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDateTime>
+#include <QDomElement>
+
 static const QStringList PRESENCE_TYPES = {
     QStringLiteral("error"),
     QString(),
diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h
index c22418bc..b1502da3 100644
--- a/src/base/QXmppPresence.h
+++ b/src/base/QXmppPresence.h
@@ -24,8 +24,8 @@
 #ifndef QXMPPPRESENCE_H
 #define QXMPPPRESENCE_H
 
-#include "QXmppStanza.h"
 #include "QXmppMucIq.h"
+#include "QXmppStanza.h"
 
 class QXmppPresencePrivate;
 
diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp
index ea96903b..9ef3c952 100644
--- a/src/base/QXmppPubSubIq.cpp
+++ b/src/base/QXmppPubSubIq.cpp
@@ -23,12 +23,12 @@
 
 #include "QXmppPubSubIq.h"
 
-#include <QDomElement>
-#include <QSharedData>
-
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QSharedData>
+
 static const QStringList PUBSUB_QUERIES = {
     QStringLiteral("affiliations"),
     QStringLiteral("default"),
diff --git a/src/base/QXmppPubSubIq.h b/src/base/QXmppPubSubIq.h
index 9f9174f8..1272a2f5 100644
--- a/src/base/QXmppPubSubIq.h
+++ b/src/base/QXmppPubSubIq.h
@@ -24,9 +24,9 @@
 #ifndef QXMPPPUBSUBIQ_H
 #define QXMPPPUBSUBIQ_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppIq.h"
+
+#include <QSharedDataPointer>
 // required for compatibility:
 #include "QXmppPubSubItem.h"
 
diff --git a/src/base/QXmppPubSubItem.cpp b/src/base/QXmppPubSubItem.cpp
index 6751325f..835aeccb 100644
--- a/src/base/QXmppPubSubItem.cpp
+++ b/src/base/QXmppPubSubItem.cpp
@@ -23,11 +23,11 @@
 
 #include "QXmppPubSubItem.h"
 
-#include <QDomElement>
-
 #include "QXmppElement.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 class QXmppPubSubItemPrivate : public QSharedData
 {
 public:
diff --git a/src/base/QXmppPubSubItem.h b/src/base/QXmppPubSubItem.h
index 384d3baf..e8e59df4 100644
--- a/src/base/QXmppPubSubItem.h
+++ b/src/base/QXmppPubSubItem.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPPUBSUBITEM_H
 #define QXMPPPUBSUBITEM_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+
 class QDomElement;
 class QXmlStreamWriter;
 
diff --git a/src/base/QXmppRegisterIq.cpp b/src/base/QXmppRegisterIq.cpp
index de96aee9..ecc2c9a0 100644
--- a/src/base/QXmppRegisterIq.cpp
+++ b/src/base/QXmppRegisterIq.cpp
@@ -22,12 +22,13 @@
  *
  */
 
-#include <QDomElement>
-#include <QSharedData>
-
-#include "QXmppConstants_p.h"
 #include "QXmppRegisterIq.h"
+
 #include "QXmppBitsOfBinaryDataList.h"
+#include "QXmppConstants_p.h"
+
+#include <QDomElement>
+#include <QSharedData>
 
 static const QStringList REGISTER_TYPES = {
     QString(),
diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp
index fc4fd88c..5e52cba8 100644
--- a/src/base/QXmppResultSet.cpp
+++ b/src/base/QXmppResultSet.cpp
@@ -21,13 +21,13 @@
  *
  */
 
+#include "QXmppResultSet.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppResultSet.h"
 #include "QXmppUtils.h"
 
-#include <QDomElement>
 #include <QDebug>
+#include <QDomElement>
 
 QXmppResultSetQuery::QXmppResultSetQuery()
     : m_index(-1)
diff --git a/src/base/QXmppResultSet.h b/src/base/QXmppResultSet.h
index 6716d23b..b75d7f1a 100644
--- a/src/base/QXmppResultSet.h
+++ b/src/base/QXmppResultSet.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPRESULTSET_H
 #define QXMPPRESULTSET_H
 
-#include <QDateTime>
-
 #include "QXmppStanza.h"
 
+#include <QDateTime>
+
 /// \brief The QXmppResultSetQuery class represents a set element in a query
 /// as defined by XEP-0059: Result Set Management.
 
diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp
index 01e0956d..f37f4a68 100644
--- a/src/base/QXmppRosterIq.cpp
+++ b/src/base/QXmppRosterIq.cpp
@@ -22,14 +22,15 @@
  *
  */
 
-#include <QDomElement>
-#include <QSharedData>
-#include <QXmlStreamWriter>
-
 #include "QXmppRosterIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QSharedData>
+#include <QXmlStreamWriter>
+
 class QXmppRosterIqPrivate : public QSharedData
 {
 public:
diff --git a/src/base/QXmppRosterIq.h b/src/base/QXmppRosterIq.h
index f5dac4f1..5baf4b63 100644
--- a/src/base/QXmppRosterIq.h
+++ b/src/base/QXmppRosterIq.h
@@ -26,6 +26,7 @@
 #define QXMPPROSTERIQ_H
 
 #include "QXmppIq.h"
+
 #include <QList>
 #include <QSet>
 #include <QSharedDataPointer>
diff --git a/src/base/QXmppRpcIq.h b/src/base/QXmppRpcIq.h
index 7355781c..959491a5 100644
--- a/src/base/QXmppRpcIq.h
+++ b/src/base/QXmppRpcIq.h
@@ -26,6 +26,7 @@
 #define QXMPPRPCIQ_H
 
 #include "QXmppIq.h"
+
 #include <QVariant>
 
 class QXMPP_EXPORT QXmppRpcMarshaller
diff --git a/src/base/QXmppRtcpPacket.cpp b/src/base/QXmppRtcpPacket.cpp
index e3cb7417..3b3be8b3 100644
--- a/src/base/QXmppRtcpPacket.cpp
+++ b/src/base/QXmppRtcpPacket.cpp
@@ -21,11 +21,11 @@
  *
  */
 
+#include "QXmppRtcpPacket.h"
+
 #include <QDataStream>
 #include <QDebug>
 
-#include "QXmppRtcpPacket.h"
-
 #define RTP_VERSION 2
 
 enum DescriptionType {
diff --git a/src/base/QXmppRtcpPacket.h b/src/base/QXmppRtcpPacket.h
index 0a709e46..a2041672 100644
--- a/src/base/QXmppRtcpPacket.h
+++ b/src/base/QXmppRtcpPacket.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPRTCPPACKET_H
 #define QXMPPRTCPPACKET_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+
 class QXmppRtcpPacketPrivate;
 class QXmppRtcpReceiverReport;
 class QXmppRtcpReceiverReportPrivate;
diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp
index d4c20fad..7fc69eb9 100644
--- a/src/base/QXmppRtpChannel.cpp
+++ b/src/base/QXmppRtpChannel.cpp
@@ -21,17 +21,18 @@
  *
  */
 
+#include "QXmppRtpChannel.h"
+
+#include "QXmppCodec_p.h"
+#include "QXmppJingleIq.h"
+#include "QXmppRtpPacket.h"
+
 #include <cmath>
 
 #include <QDataStream>
 #include <QMetaType>
 #include <QTimer>
 
-#include "QXmppCodec_p.h"
-#include "QXmppJingleIq.h"
-#include "QXmppRtpChannel.h"
-#include "QXmppRtpPacket.h"
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288
 #endif
@@ -108,7 +109,6 @@ void QXmppRtpChannel::setLocalSsrc(quint32 ssrc)
     m_outgoingSsrc = ssrc;
 }
 
-
 enum CodecId {
     G711u = 0,
     GSM = 3,
diff --git a/src/base/QXmppRtpChannel.h b/src/base/QXmppRtpChannel.h
index 56b68925..0882bd57 100644
--- a/src/base/QXmppRtpChannel.h
+++ b/src/base/QXmppRtpChannel.h
@@ -24,12 +24,12 @@
 #ifndef QXMPPRTPCHANNEL_H
 #define QXMPPRTPCHANNEL_H
 
-#include <QIODevice>
-#include <QSize>
-
 #include "QXmppJingleIq.h"
 #include "QXmppLogger.h"
 
+#include <QIODevice>
+#include <QSize>
+
 class QXmppCodec;
 class QXmppJinglePayloadType;
 class QXmppRtpAudioChannelPrivate;
diff --git a/src/base/QXmppRtpPacket.cpp b/src/base/QXmppRtpPacket.cpp
index bb5d1d4b..d8bb668b 100644
--- a/src/base/QXmppRtpPacket.cpp
+++ b/src/base/QXmppRtpPacket.cpp
@@ -21,11 +21,11 @@
  *
  */
 
+#include "QXmppRtpPacket.h"
+
 #include <QDataStream>
 #include <QSharedData>
 
-#include "QXmppRtpPacket.h"
-
 #define RTP_VERSION 2
 
 class QXmppRtpPacketPrivate : public QSharedData
diff --git a/src/base/QXmppRtpPacket.h b/src/base/QXmppRtpPacket.h
index a7f21043..dd479eeb 100644
--- a/src/base/QXmppRtpPacket.h
+++ b/src/base/QXmppRtpPacket.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPRTPPACKET_H
 #define QXMPPRTPPACKET_H
 
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+
 class QXmppRtpPacketPrivate;
 
 /// \internal
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 3f70b093..93edaf0a 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -22,16 +22,16 @@
  *
  */
 
+#include "QXmppSasl_p.h"
+#include "QXmppUtils.h"
+
 #include <cstdlib>
 
 #include <QDomElement>
 #include <QMessageAuthenticationCode>
 #include <QStringList>
-#include <QtEndian>
 #include <QUrlQuery>
-
-#include "QXmppSasl_p.h"
-#include "QXmppUtils.h"
+#include <QtEndian>
 
 const char *ns_xmpp_sasl = "urn:ietf:params:xml:ns:xmpp-sasl";
 
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
index 57eb344f..f1d2692a 100644
--- a/src/base/QXmppSasl_p.h
+++ b/src/base/QXmppSasl_p.h
@@ -25,14 +25,14 @@
 #ifndef QXMPPSASL_P_H
 #define QXMPPSASL_P_H
 
-#include <QByteArray>
-#include <QCryptographicHash>
-#include <QMap>
-
 #include "QXmppGlobal.h"
 #include "QXmppLogger.h"
 #include "QXmppStanza.h"
 
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QMap>
+
 class QXmppSaslClientPrivate;
 class QXmppSaslServerPrivate;
 
diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp
index 4916fef5..f4ce9cf2 100644
--- a/src/base/QXmppSessionIq.cpp
+++ b/src/base/QXmppSessionIq.cpp
@@ -22,13 +22,14 @@
  *
  */
 
-#include <QDomElement>
-#include <QXmlStreamWriter>
-
 #include "QXmppSessionIq.h"
+
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QXmlStreamWriter>
+
 /// \cond
 bool QXmppSessionIq::isSessionIq(const QDomElement &element)
 {
diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp
index ce8cdcc3..43a36bf1 100644
--- a/src/base/QXmppSocks.cpp
+++ b/src/base/QXmppSocks.cpp
@@ -21,13 +21,13 @@
  *
  */
 
+#include "QXmppSocks.h"
+
 #include <QDataStream>
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QTimer>
 
-#include "QXmppSocks.h"
-
 const static char SocksVersion = 5;
 
 enum AuthenticationMethod {
diff --git a/src/base/QXmppSocks.h b/src/base/QXmppSocks.h
index ceda5b59..355ba144 100644
--- a/src/base/QXmppSocks.h
+++ b/src/base/QXmppSocks.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPSOCKS_H
 #define QXMPPSOCKS_H
 
+#include "QXmppGlobal.h"
+
 #include <QHostAddress>
 #include <QTcpSocket>
 
-#include "QXmppGlobal.h"
-
 class QTcpServer;
 
 class QXMPP_EXPORT QXmppSocksClient : public QTcpSocket
diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index 002ef65a..ffd6687d 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -23,15 +23,15 @@
  *
  */
 
-
 #include "QXmppStanza.h"
+
+#include "QXmppConstants_p.h"
 #include "QXmppStanza_p.h"
 #include "QXmppUtils.h"
-#include "QXmppConstants_p.h"
 
+#include <QDateTime>
 #include <QDomElement>
 #include <QXmlStreamWriter>
-#include <QDateTime>
 
 uint QXmppStanza::s_uniqeIdNo = 0;
 
diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h
index 5ad3dcad..1fbd69e0 100644
--- a/src/base/QXmppStanza.h
+++ b/src/base/QXmppStanza.h
@@ -27,17 +27,17 @@
 #define QXMPPSTANZA_H
 
 #include <QByteArray>
-#include <QString>
 #include <QSharedData>
+#include <QString>
 
 // forward declarations of QXmlStream* classes will not work on Mac, we need to
 // include the whole header.
 // See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
 // for an explanation.
-#include <QXmlStreamWriter>
-
 #include "QXmppElement.h"
 
+#include <QXmlStreamWriter>
+
 class QXmppExtendedAddressPrivate;
 
 /// \brief Represents an extended address as defined by XEP-0033: Extended Stanza Addressing.
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index 0a2b0c4b..676465af 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -22,11 +22,11 @@
  *
  */
 
+#include "QXmppStream.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppLogger.h"
 #include "QXmppStanza.h"
-#include "QXmppStream.h"
 #include "QXmppStreamManagement_p.h"
 #include "QXmppUtils.h"
 
diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h
index 50927ed8..19c3cbea 100644
--- a/src/base/QXmppStream.h
+++ b/src/base/QXmppStream.h
@@ -25,9 +25,10 @@
 #ifndef QXMPPSTREAM_H
 #define QXMPPSTREAM_H
 
+#include "QXmppLogger.h"
+
 #include <QAbstractSocket>
 #include <QObject>
-#include "QXmppLogger.h"
 
 class QDomElement;
 class QSslSocket;
diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp
index 992cf309..a921937e 100644
--- a/src/base/QXmppStreamFeatures.cpp
+++ b/src/base/QXmppStreamFeatures.cpp
@@ -21,10 +21,11 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppStreamFeatures.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppStreamFeatures.h"
+
+#include <QDomElement>
 
 QXmppStreamFeatures::QXmppStreamFeatures()
     : m_bindMode(Disabled),
diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp
index 87067b65..acc52c66 100644
--- a/src/base/QXmppStreamInitiationIq.cpp
+++ b/src/base/QXmppStreamInitiationIq.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppConstants_p.h"
 #include "QXmppStreamInitiationIq_p.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 QXmppDataForm QXmppStreamInitiationIq::featureForm() const
 {
     return m_featureForm;
diff --git a/src/base/QXmppStreamInitiationIq_p.h b/src/base/QXmppStreamInitiationIq_p.h
index 86306278..4c8bd786 100644
--- a/src/base/QXmppStreamInitiationIq_p.h
+++ b/src/base/QXmppStreamInitiationIq_p.h
@@ -24,12 +24,12 @@
 #ifndef QXMPPSTREAMINITIATIONIQ_P_H
 #define QXMPPSTREAMINITIATIONIQ_P_H
 
-#include <QDateTime>
-
 #include "QXmppDataForm.h"
 #include "QXmppIq.h"
 #include "QXmppTransferManager.h"
 
+#include <QDateTime>
+
 //
 //  W A R N I N G
 //  -------------
diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp
index 1e9a96fc..ed91a30a 100644
--- a/src/base/QXmppStreamManagement.cpp
+++ b/src/base/QXmppStreamManagement.cpp
@@ -21,10 +21,9 @@
  *
  */
 
-#include "QXmppStreamManagement_p.h"
-#include "QXmppStanza_p.h"
-
 #include "QXmppConstants_p.h"
+#include "QXmppStanza_p.h"
+#include "QXmppStreamManagement_p.h"
 
 QXmppStreamManagementEnable::QXmppStreamManagementEnable(const bool resume, const unsigned max)
     : m_resume(resume), m_max(max)
diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp
index 5ac859d4..2d4bbdc5 100644
--- a/src/base/QXmppStun.cpp
+++ b/src/base/QXmppStun.cpp
@@ -23,19 +23,19 @@
 
 #define QXMPP_DEBUG_STUN
 
+#include "QXmppStun_p.h"
+#include "QXmppUtils.h"
+
 #include <QCryptographicHash>
 #include <QDataStream>
 #include <QHostInfo>
 #include <QNetworkInterface>
-#include <QUdpSocket>
 #include <QTimer>
-
-#include "QXmppStun_p.h"
-#include "QXmppUtils.h"
+#include <QUdpSocket>
 
 #define STUN_ID_SIZE 12
 #define STUN_RTO_INTERVAL 500
-#define STUN_RTO_MAX      7
+#define STUN_RTO_MAX 7
 
 static const quint32 STUN_MAGIC = 0x2112A442;
 static const quint16 STUN_HEADER = 20;
diff --git a/src/base/QXmppStun.h b/src/base/QXmppStun.h
index 7aa04725..6b66aad4 100644
--- a/src/base/QXmppStun.h
+++ b/src/base/QXmppStun.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPSTUN_H
 #define QXMPPSTUN_H
 
-#include <QObject>
-
-#include "QXmppLogger.h"
 #include "QXmppJingleIq.h"
+#include "QXmppLogger.h"
+
+#include <QObject>
 
 class CandidatePair;
 class QDataStream;
diff --git a/src/base/QXmppUtils.cpp b/src/base/QXmppUtils.cpp
index b84d59e8..658e9d8d 100644
--- a/src/base/QXmppUtils.cpp
+++ b/src/base/QXmppUtils.cpp
@@ -22,6 +22,9 @@
  *
  */
 
+#include "QXmppUtils.h"
+
+#include "QXmppLogger.h"
 
 #include <QBuffer>
 #include <QByteArray>
@@ -34,9 +37,6 @@
 #include <QStringList>
 #include <QXmlStreamWriter>
 
-#include "QXmppUtils.h"
-#include "QXmppLogger.h"
-
 // adapted from public domain source by Ross Williams and Eric Durbin
 // FIXME : is this valid for big-endian machines?
 static quint32 crctable[256] =
diff --git a/src/base/QXmppUtils.h b/src/base/QXmppUtils.h
index 89829dc3..b9d5c0a0 100644
--- a/src/base/QXmppUtils.h
+++ b/src/base/QXmppUtils.h
@@ -29,10 +29,10 @@
 // include the whole header.
 // See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
 // for an explanation.
-#include <QXmlStreamWriter>
-
 #include "QXmppGlobal.h"
 
+#include <QXmlStreamWriter>
+
 class QByteArray;
 class QDateTime;
 class QDomElement;
diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp
index 839229bc..da41db9d 100644
--- a/src/base/QXmppVCardIq.cpp
+++ b/src/base/QXmppVCardIq.cpp
@@ -21,14 +21,14 @@
  *
  */
 
+#include "QXmppVCardIq.h"
+
+#include "QXmppConstants_p.h"
+#include "QXmppUtils.h"
 
 #include <QBuffer>
 #include <QXmlStreamWriter>
 
-#include "QXmppVCardIq.h"
-#include "QXmppUtils.h"
-#include "QXmppConstants_p.h"
-
 static QString getImageType(const QByteArray &contents)
 {
     if (contents.startsWith("\x89PNG\x0d\x0a\x1a\x0a"))
diff --git a/src/base/QXmppVCardIq.h b/src/base/QXmppVCardIq.h
index ec5a50af..eb3ade50 100644
--- a/src/base/QXmppVCardIq.h
+++ b/src/base/QXmppVCardIq.h
@@ -25,9 +25,10 @@
 #define QXMPPVCARDIQ_H
 
 #include "QXmppIq.h"
+
 #include <QDate>
-#include <QMap>
 #include <QDomElement>
+#include <QMap>
 
 class QXmppVCardAddressPrivate;
 class QXmppVCardEmailPrivate;
diff --git a/src/base/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp
index 7d41aebd..1e7cd33a 100644
--- a/src/base/QXmppVersionIq.cpp
+++ b/src/base/QXmppVersionIq.cpp
@@ -21,11 +21,12 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppVersionIq.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
-#include "QXmppVersionIq.h"
+
+#include <QDomElement>
 
 /// Returns the name of the software.
 ///
diff --git a/src/client/QXmppArchiveManager.cpp b/src/client/QXmppArchiveManager.cpp
index 75f9bea7..e9bb5ef8 100644
--- a/src/client/QXmppArchiveManager.cpp
+++ b/src/client/QXmppArchiveManager.cpp
@@ -21,13 +21,14 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppArchiveManager.h"
 
 #include "QXmppArchiveIq.h"
-#include "QXmppArchiveManager.h"
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 
+#include <QDomElement>
+
 /// \cond
 QStringList QXmppArchiveManager::discoveryFeatures() const
 {
diff --git a/src/client/QXmppArchiveManager.h b/src/client/QXmppArchiveManager.h
index e17fd65a..5f0cb88e 100644
--- a/src/client/QXmppArchiveManager.h
+++ b/src/client/QXmppArchiveManager.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPARCHIVEMANAGER_H
 #define QXMPPARCHIVEMANAGER_H
 
-#include <QDateTime>
-
 #include "QXmppClientExtension.h"
 #include "QXmppResultSet.h"
 
+#include <QDateTime>
+
 class QXmppArchiveChat;
 class QXmppArchiveChatIq;
 class QXmppArchiveListIq;
diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp
index 246d2437..8afb0bd0 100644
--- a/src/client/QXmppBookmarkManager.cpp
+++ b/src/client/QXmppBookmarkManager.cpp
@@ -21,15 +21,16 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppBookmarkManager.h"
+
 #include "QXmppBookmarkSet.h"
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppIq.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 // The QXmppPrivateStorageIq class represents an XML private storage IQ
 // as defined by XEP-0049: Private XML Storage.
 //
diff --git a/src/client/QXmppBookmarkManager.h b/src/client/QXmppBookmarkManager.h
index cebdf90d..8f14e1f7 100644
--- a/src/client/QXmppBookmarkManager.h
+++ b/src/client/QXmppBookmarkManager.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPBOOKMARKMANAGER_H
 #define QXMPPBOOKMARKMANAGER_H
 
-#include <QUrl>
-
 #include "QXmppClientExtension.h"
 
+#include <QUrl>
+
 class QXmppBookmarkManagerPrivate;
 class QXmppBookmarkSet;
 
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index f670aa02..067efb82 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -21,10 +21,8 @@
  *
  */
 
-#include <QDomElement>
-#include <QTimer>
-
 #include "QXmppCallManager.h"
+
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppJingleIq.h"
@@ -32,6 +30,9 @@
 #include "QXmppStun.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QTimer>
+
 static const int RTP_COMPONENT = 1;
 static const int RTCP_COMPONENT = 2;
 
diff --git a/src/client/QXmppCallManager.h b/src/client/QXmppCallManager.h
index ae3f9822..78cafe5b 100644
--- a/src/client/QXmppCallManager.h
+++ b/src/client/QXmppCallManager.h
@@ -24,13 +24,13 @@
 #ifndef QXMPPCALLMANAGER_H
 #define QXMPPCALLMANAGER_H
 
-#include <QObject>
-#include <QIODevice>
-#include <QMetaType>
-
 #include "QXmppClientExtension.h"
 #include "QXmppLogger.h"
 
+#include <QIODevice>
+#include <QMetaType>
+#include <QObject>
+
 class QHostAddress;
 class QXmppCallPrivate;
 class QXmppCallManager;
diff --git a/src/client/QXmppCarbonManager.cpp b/src/client/QXmppCarbonManager.cpp
index ff480660..68277f90 100644
--- a/src/client/QXmppCarbonManager.cpp
+++ b/src/client/QXmppCarbonManager.cpp
@@ -21,25 +21,23 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppCarbonManager.h"
-#include "QXmppConstants_p.h"
+
 #include "QXmppClient.h"
+#include "QXmppConstants_p.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppMessage.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
 
 QXmppCarbonManager::QXmppCarbonManager()
     : m_carbonsEnabled(false)
 {
-
 }
 
 QXmppCarbonManager::~QXmppCarbonManager()
 {
-
 }
 
 /// Returns whether message carbons are currently enabled
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index f6622e94..6c958dd6 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -21,25 +21,25 @@
  *
  */
 
-#include <QSslSocket>
-#include <QTimer>
-
 #include "QXmppClient.h"
-#include "QXmppClient_p.h"
+
 #include "QXmppClientExtension.h"
+#include "QXmppClient_p.h"
 #include "QXmppConstants_p.h"
+#include "QXmppDiscoveryIq.h"
+#include "QXmppDiscoveryManager.h"
+#include "QXmppEntityTimeManager.h"
 #include "QXmppLogger.h"
-#include "QXmppOutgoingClient.h"
 #include "QXmppMessage.h"
-#include "QXmppUtils.h"
-
-#include "QXmppTlsManager_p.h"
+#include "QXmppOutgoingClient.h"
 #include "QXmppRosterManager.h"
+#include "QXmppTlsManager_p.h"
+#include "QXmppUtils.h"
 #include "QXmppVCardManager.h"
 #include "QXmppVersionManager.h"
-#include "QXmppEntityTimeManager.h"
-#include "QXmppDiscoveryManager.h"
-#include "QXmppDiscoveryIq.h"
+
+#include <QSslSocket>
+#include <QTimer>
 
 /// \cond
 QXmppClientPrivate::QXmppClientPrivate(QXmppClient *qq)
diff --git a/src/client/QXmppClient.h b/src/client/QXmppClient.h
index 7df6839b..be411993 100644
--- a/src/client/QXmppClient.h
+++ b/src/client/QXmppClient.h
@@ -24,13 +24,13 @@
 #ifndef QXMPPCLIENT_H
 #define QXMPPCLIENT_H
 
-#include <QObject>
-#include <QAbstractSocket>
-
 #include "QXmppConfiguration.h"
 #include "QXmppLogger.h"
 #include "QXmppPresence.h"
 
+#include <QAbstractSocket>
+#include <QObject>
+
 class QSslError;
 
 class QXmppClientExtension;
diff --git a/src/client/QXmppClientExtension.cpp b/src/client/QXmppClientExtension.cpp
index 85555162..01f0ab8c 100644
--- a/src/client/QXmppClientExtension.cpp
+++ b/src/client/QXmppClientExtension.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <QStringList>
-
 #include "QXmppClientExtension.h"
 
+#include <QStringList>
+
 class QXmppClientExtensionPrivate
 {
 public:
diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index 6f2470ec..200dc47c 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QNetworkProxy>
-#include <QSslSocket>
-
 #include "QXmppConfiguration.h"
+
 #include "QXmppUtils.h"
 
+#include <QNetworkProxy>
+#include <QSslSocket>
+
 class QXmppConfigurationPrivate : public QSharedData
 {
 public:
diff --git a/src/client/QXmppConfiguration.h b/src/client/QXmppConfiguration.h
index 72ff97bd..975acfdc 100644
--- a/src/client/QXmppConfiguration.h
+++ b/src/client/QXmppConfiguration.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPCONFIGURATION_H
 #define QXMPPCONFIGURATION_H
 
-#include <QString>
-#include <QSharedDataPointer>
-
 #include "QXmppGlobal.h"
 
+#include <QSharedDataPointer>
+#include <QString>
+
 class QNetworkProxy;
 class QSslCertificate;
 class QXmppConfigurationPrivate;
diff --git a/src/client/QXmppDiscoveryManager.cpp b/src/client/QXmppDiscoveryManager.cpp
index d98fb3f9..21c3c397 100644
--- a/src/client/QXmppDiscoveryManager.cpp
+++ b/src/client/QXmppDiscoveryManager.cpp
@@ -23,15 +23,15 @@
 
 #include "QXmppDiscoveryManager.h"
 
-#include <QDomElement>
-#include <QCoreApplication>
-
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppDataForm.h"
 #include "QXmppDiscoveryIq.h"
-#include "QXmppStream.h"
 #include "QXmppGlobal.h"
+#include "QXmppStream.h"
+
+#include <QCoreApplication>
+#include <QDomElement>
 
 class QXmppDiscoveryManagerPrivate
 {
diff --git a/src/client/QXmppEntityTimeManager.cpp b/src/client/QXmppEntityTimeManager.cpp
index e66126f1..fdb9e24a 100644
--- a/src/client/QXmppEntityTimeManager.cpp
+++ b/src/client/QXmppEntityTimeManager.cpp
@@ -21,17 +21,16 @@
  *
  */
 
-
 #include "QXmppEntityTimeManager.h"
 
-#include <QDomElement>
-#include <QDateTime>
-
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppEntityTimeIq.h"
 #include "QXmppUtils.h"
 
+#include <QDateTime>
+#include <QDomElement>
+
 /// Request the time from an XMPP entity.
 ///
 /// \param jid
diff --git a/src/client/QXmppInternalClientExtension.cpp b/src/client/QXmppInternalClientExtension.cpp
index c36666fb..17e0349f 100644
--- a/src/client/QXmppInternalClientExtension.cpp
+++ b/src/client/QXmppInternalClientExtension.cpp
@@ -21,10 +21,9 @@
  *
  */
 
-#include "QXmppInternalClientExtension_p.h"
-
 #include "QXmppClient.h"
 #include "QXmppClient_p.h"
+#include "QXmppInternalClientExtension_p.h"
 
 /// \cond
 QXmppInternalClientExtension::QXmppInternalClientExtension()
diff --git a/src/client/QXmppInternalClientExtension_p.h b/src/client/QXmppInternalClientExtension_p.h
index 5692a21a..ff8940de 100644
--- a/src/client/QXmppInternalClientExtension_p.h
+++ b/src/client/QXmppInternalClientExtension_p.h
@@ -58,4 +58,4 @@ protected:
     QXmppOutgoingClient *clientStream();
 };
 
-#endif // QXMPPINTERNALCLIENTEXTENSION_H
+#endif  // QXMPPINTERNALCLIENTEXTENSION_H
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp
index 7a840d0f..6b511e30 100644
--- a/src/client/QXmppInvokable.cpp
+++ b/src/client/QXmppInvokable.cpp
@@ -23,10 +23,9 @@
 
 #include "QXmppInvokable.h"
 
-#include <QVariant>
 #include <QMetaMethod>
 #include <QStringList>
-
+#include <QVariant>
 #include <qdebug.h>
 
 /// Constructs a QXmppInvokable with the specified \a parent.
diff --git a/src/client/QXmppInvokable.h b/src/client/QXmppInvokable.h
index 62b46b36..54c8ad02 100644
--- a/src/client/QXmppInvokable.h
+++ b/src/client/QXmppInvokable.h
@@ -24,13 +24,13 @@
 #ifndef QXMPPINVOKABLE_H
 #define QXMPPINVOKABLE_H
 
-#include <QObject>
+#include "QXmppGlobal.h"
+
 #include <QHash>
+#include <QObject>
+#include <QStringList>
 #include <QVariant>
 #include <QWriteLocker>
-#include <QStringList>
-
-#include "QXmppGlobal.h"
 
 /**
 This is the base class for all objects that will be invokable via RPC.  All public slots of objects derived from this class will be exposed to the RPC interface.  As a note for all methods, they can only understand types that QVariant knows about.
diff --git a/src/client/QXmppMamManager.cpp b/src/client/QXmppMamManager.cpp
index 2be546d0..268ec6f2 100644
--- a/src/client/QXmppMamManager.cpp
+++ b/src/client/QXmppMamManager.cpp
@@ -21,16 +21,17 @@
  *
  */
 
-#include <QDomElement>
-
 #include "QXmppMamManager.h"
-#include "QXmppMamIq.h"
+
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppDataForm.h"
+#include "QXmppMamIq.h"
 #include "QXmppMessage.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 /// \cond
 QStringList QXmppMamManager::discoveryFeatures() const
 {
diff --git a/src/client/QXmppMamManager.h b/src/client/QXmppMamManager.h
index c2c8f299..f66db3b1 100644
--- a/src/client/QXmppMamManager.h
+++ b/src/client/QXmppMamManager.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPMAMMANAGER_H
 #define QXMPPMAMMANAGER_H
 
-#include <QDateTime>
-
 #include "QXmppClientExtension.h"
 #include "QXmppResultSet.h"
 
+#include <QDateTime>
+
 class QXmppMessage;
 
 /// \brief The QXmppMamManager class makes it possible to access message
diff --git a/src/client/QXmppMessageReceiptManager.cpp b/src/client/QXmppMessageReceiptManager.cpp
index 3f08f1ac..e3b8aae5 100644
--- a/src/client/QXmppMessageReceiptManager.cpp
+++ b/src/client/QXmppMessageReceiptManager.cpp
@@ -24,13 +24,13 @@
 
 #include "QXmppMessageReceiptManager.h"
 
-#include <QDomElement>
-
+#include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppMessage.h"
-#include "QXmppClient.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 /// Constructs a QXmppMessageReceiptManager to handle incoming and outgoing
 /// message delivery receipts.
 
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 4c2214ba..b65df6b0 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -21,17 +21,18 @@
  *
  */
 
-#include <QDomElement>
-#include <QMap>
+#include "QXmppMucManager.h"
 
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppDiscoveryManager.h"
 #include "QXmppMessage.h"
 #include "QXmppMucIq.h"
-#include "QXmppMucManager.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QMap>
+
 class QXmppMucManagerPrivate
 {
 public:
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 8cbde9e2..ba4f9349 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -22,26 +22,27 @@
  *
  */
 
-#include <QCryptographicHash>
-#include <QNetworkProxy>
-#include <QSslSocket>
-#include <QSslConfiguration>
-#include <QUrl>
-#include <QDnsLookup>
+#include "QXmppOutgoingClient.h"
 
 #include "QXmppConfiguration.h"
 #include "QXmppConstants_p.h"
 #include "QXmppIq.h"
 #include "QXmppLogger.h"
 #include "QXmppMessage.h"
+#include "QXmppNonSASLAuth.h"
 #include "QXmppPresence.h"
-#include "QXmppOutgoingClient.h"
+#include "QXmppSasl_p.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppStreamManagement_p.h"
-#include "QXmppNonSASLAuth.h"
-#include "QXmppSasl_p.h"
 #include "QXmppUtils.h"
 
+#include <QCryptographicHash>
+#include <QDnsLookup>
+#include <QNetworkProxy>
+#include <QSslConfiguration>
+#include <QSslSocket>
+#include <QUrl>
+
 // IQ types
 #include "QXmppBindIq.h"
 #include "QXmppPingIq.h"
@@ -50,11 +51,11 @@
 #include <QBuffer>
 #include <QCoreApplication>
 #include <QDomDocument>
-#include <QStringList>
-#include <QRegExp>
 #include <QHostAddress>
-#include <QXmlStreamWriter>
+#include <QRegExp>
+#include <QStringList>
 #include <QTimer>
+#include <QXmlStreamWriter>
 
 class QXmppOutgoingClientPrivate
 {
diff --git a/src/client/QXmppRemoteMethod.cpp b/src/client/QXmppRemoteMethod.cpp
index da3b97f6..9493f54e 100644
--- a/src/client/QXmppRemoteMethod.cpp
+++ b/src/client/QXmppRemoteMethod.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "QXmppRemoteMethod.h"
+
 #include "QXmppClient.h"
 #include "QXmppUtils.h"
 
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 041d1851..1b93870d 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -22,14 +22,15 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppRosterManager.h"
 
 #include "QXmppClient.h"
 #include "QXmppPresence.h"
 #include "QXmppRosterIq.h"
-#include "QXmppRosterManager.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 class QXmppRosterManagerPrivate
 {
 public:
diff --git a/src/client/QXmppRosterManager.h b/src/client/QXmppRosterManager.h
index a212b884..5caf0011 100644
--- a/src/client/QXmppRosterManager.h
+++ b/src/client/QXmppRosterManager.h
@@ -25,14 +25,14 @@
 #ifndef QXMPPROSTERMANAGER_H
 #define QXMPPROSTERMANAGER_H
 
-#include <QObject>
-#include <QMap>
-#include <QStringList>
-
 #include "QXmppClientExtension.h"
 #include "QXmppPresence.h"
 #include "QXmppRosterIq.h"
 
+#include <QMap>
+#include <QObject>
+#include <QStringList>
+
 class QXmppRosterManagerPrivate;
 
 /// \brief The QXmppRosterManager class provides access to a connected client's
diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp
index 0707834a..f76546e1 100644
--- a/src/client/QXmppRpcManager.cpp
+++ b/src/client/QXmppRpcManager.cpp
@@ -21,12 +21,13 @@
  *
  */
 
+#include "QXmppRpcManager.h"
+
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppInvokable.h"
 #include "QXmppRemoteMethod.h"
 #include "QXmppRpcIq.h"
-#include "QXmppRpcManager.h"
 
 /// Constructs a QXmppRpcManager.
 
diff --git a/src/client/QXmppRpcManager.h b/src/client/QXmppRpcManager.h
index b8834109..13ad0aac 100644
--- a/src/client/QXmppRpcManager.h
+++ b/src/client/QXmppRpcManager.h
@@ -24,13 +24,13 @@
 #ifndef QXMPPRPCMANAGER_H
 #define QXMPPRPCMANAGER_H
 
-#include <QMap>
-#include <QVariant>
-
 #include "QXmppClientExtension.h"
 #include "QXmppInvokable.h"
 #include "QXmppRemoteMethod.h"
 
+#include <QMap>
+#include <QVariant>
+
 class QXmppRpcErrorIq;
 class QXmppRpcInvokeIq;
 class QXmppRpcResponseIq;
diff --git a/src/client/QXmppTlsManager.cpp b/src/client/QXmppTlsManager.cpp
index 683d6ec2..20001473 100644
--- a/src/client/QXmppTlsManager.cpp
+++ b/src/client/QXmppTlsManager.cpp
@@ -21,14 +21,13 @@
  *
  */
 
-#include "QXmppTlsManager_p.h"
-
-#include "QXmppConstants_p.h"
 #include "QXmppClient.h"
 #include "QXmppClient_p.h"
+#include "QXmppConstants_p.h"
 #include "QXmppOutgoingClient.h"
-#include "QXmppStreamFeatures.h"
 #include "QXmppStartTlsPacket.h"
+#include "QXmppStreamFeatures.h"
+#include "QXmppTlsManager_p.h"
 
 #include <QDomElement>
 #include <QSslSocket>
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 3621ba6f..ecbdbd1e 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -21,6 +21,18 @@
  *
  */
 
+#include "QXmppTransferManager.h"
+
+#include "QXmppByteStreamIq.h"
+#include "QXmppClient.h"
+#include "QXmppConstants_p.h"
+#include "QXmppIbbIq.h"
+#include "QXmppSocks.h"
+#include "QXmppStreamInitiationIq_p.h"
+#include "QXmppStun.h"
+#include "QXmppTransferManager_p.h"
+#include "QXmppUtils.h"
+
 #include <QCryptographicHash>
 #include <QDomElement>
 #include <QElapsedTimer>
@@ -34,17 +46,6 @@
 #include <QTimer>
 #include <QUrl>
 
-#include "QXmppByteStreamIq.h"
-#include "QXmppClient.h"
-#include "QXmppConstants_p.h"
-#include "QXmppIbbIq.h"
-#include "QXmppSocks.h"
-#include "QXmppStreamInitiationIq_p.h"
-#include "QXmppStun.h"
-#include "QXmppTransferManager.h"
-#include "QXmppTransferManager_p.h"
-#include "QXmppUtils.h"
-
 // time to try to connect to a SOCKS host (7 seconds)
 const int socksTimeout = 7000;
 
diff --git a/src/client/QXmppUploadRequestManager.cpp b/src/client/QXmppUploadRequestManager.cpp
index 1127d3b4..b0321150 100644
--- a/src/client/QXmppUploadRequestManager.cpp
+++ b/src/client/QXmppUploadRequestManager.cpp
@@ -21,17 +21,17 @@
  *
  */
 
-#include <QFileInfo>
-#include <QMimeDatabase>
+#include "QXmppUploadRequestManager.h"
 
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
-#include "QXmppDiscoveryManager.h"
-#include "QXmppDiscoveryIq.h"
 #include "QXmppDataForm.h"
+#include "QXmppDiscoveryIq.h"
+#include "QXmppDiscoveryManager.h"
 #include "QXmppHttpUploadIq.h"
 
-#include "QXmppUploadRequestManager.h"
+#include <QFileInfo>
+#include <QMimeDatabase>
 
 class QXmppUploadServicePrivate : public QSharedData
 {
diff --git a/src/client/QXmppUploadRequestManager.h b/src/client/QXmppUploadRequestManager.h
index 742b465d..f04b4563 100644
--- a/src/client/QXmppUploadRequestManager.h
+++ b/src/client/QXmppUploadRequestManager.h
@@ -25,6 +25,7 @@
 #define QXMPPUPLOADREQUESTMANAGER_H
 
 #include <QXmppClientExtension.h>
+
 #include <QSharedDataPointer>
 
 class QFileInfo;
diff --git a/src/client/QXmppVCardManager.cpp b/src/client/QXmppVCardManager.cpp
index 5f26ba4d..9d8b782a 100644
--- a/src/client/QXmppVCardManager.cpp
+++ b/src/client/QXmppVCardManager.cpp
@@ -21,12 +21,12 @@
  *
  */
 
+#include "QXmppVCardManager.h"
 
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppUtils.h"
 #include "QXmppVCardIq.h"
-#include "QXmppVCardManager.h"
 
 class QXmppVCardManagerPrivate
 {
diff --git a/src/client/QXmppVersionManager.cpp b/src/client/QXmppVersionManager.cpp
index 3e212786..7c5fbafd 100644
--- a/src/client/QXmppVersionManager.cpp
+++ b/src/client/QXmppVersionManager.cpp
@@ -21,16 +21,17 @@
  *
  */
 
-#include <QCoreApplication>
-#include <QDomElement>
-#include <QSysInfo>
+#include "QXmppVersionManager.h"
 
 #include "QXmppClient.h"
 #include "QXmppConstants_p.h"
 #include "QXmppGlobal.h"
-#include "QXmppVersionManager.h"
 #include "QXmppVersionIq.h"
 
+#include <QCoreApplication>
+#include <QDomElement>
+#include <QSysInfo>
+
 class QXmppVersionManagerPrivate
 {
 public:
diff --git a/src/server/QXmppDialback.cpp b/src/server/QXmppDialback.cpp
index ee3e41bb..852edc5b 100644
--- a/src/server/QXmppDialback.cpp
+++ b/src/server/QXmppDialback.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QDomElement>
+#include "QXmppDialback.h"
 
 #include "QXmppConstants_p.h"
-#include "QXmppDialback.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+
 /// Constructs a QXmppDialback.
 
 QXmppDialback::QXmppDialback()
diff --git a/src/server/QXmppIncomingClient.cpp b/src/server/QXmppIncomingClient.cpp
index 009d4427..6142faab 100644
--- a/src/server/QXmppIncomingClient.cpp
+++ b/src/server/QXmppIncomingClient.cpp
@@ -21,11 +21,7 @@
  *
  */
 
-#include <QDomElement>
-#include <QHostAddress>
-#include <QSslKey>
-#include <QSslSocket>
-#include <QTimer>
+#include "QXmppIncomingClient.h"
 
 #include "QXmppBindIq.h"
 #include "QXmppConstants_p.h"
@@ -37,7 +33,11 @@
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
-#include "QXmppIncomingClient.h"
+#include <QDomElement>
+#include <QHostAddress>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QTimer>
 
 class QXmppIncomingClientPrivate
 {
diff --git a/src/server/QXmppIncomingServer.cpp b/src/server/QXmppIncomingServer.cpp
index bc76738d..7e2e8a0b 100644
--- a/src/server/QXmppIncomingServer.cpp
+++ b/src/server/QXmppIncomingServer.cpp
@@ -21,19 +21,20 @@
  *
  */
 
-#include <QDomElement>
-#include <QHostAddress>
-#include <QSslKey>
-#include <QSslSocket>
+#include "QXmppIncomingServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppIncomingServer.h"
 #include "QXmppOutgoingServer.h"
 #include "QXmppStartTlsPacket.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
+#include <QDomElement>
+#include <QHostAddress>
+#include <QSslKey>
+#include <QSslSocket>
+
 class QXmppIncomingServerPrivate
 {
 public:
diff --git a/src/server/QXmppOutgoingServer.cpp b/src/server/QXmppOutgoingServer.cpp
index 99e9fd9a..b0085867 100644
--- a/src/server/QXmppOutgoingServer.cpp
+++ b/src/server/QXmppOutgoingServer.cpp
@@ -21,21 +21,22 @@
  *
  */
 
-#include <QDomElement>
-#include <QSslError>
-#include <QSslKey>
-#include <QSslSocket>
-#include <QList>
-#include <QTimer>
-#include <QDnsLookup>
+#include "QXmppOutgoingServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppOutgoingServer.h"
 #include "QXmppStartTlsPacket.h"
 #include "QXmppStreamFeatures.h"
 #include "QXmppUtils.h"
 
+#include <QDnsLookup>
+#include <QDomElement>
+#include <QList>
+#include <QSslError>
+#include <QSslKey>
+#include <QSslSocket>
+#include <QTimer>
+
 class QXmppOutgoingServerPrivate
 {
 public:
diff --git a/src/server/QXmppOutgoingServer.h b/src/server/QXmppOutgoingServer.h
index 618b69a1..c0a6a589 100644
--- a/src/server/QXmppOutgoingServer.h
+++ b/src/server/QXmppOutgoingServer.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPOUTGOINGSERVER_H
 #define QXMPPOUTGOINGSERVER_H
 
-#include <QAbstractSocket>
-
 #include "QXmppStream.h"
 
+#include <QAbstractSocket>
+
 class QSslError;
 class QXmppDialback;
 class QXmppOutgoingServer;
diff --git a/src/server/QXmppPasswordChecker.cpp b/src/server/QXmppPasswordChecker.cpp
index 70bfad83..af03ecb5 100644
--- a/src/server/QXmppPasswordChecker.cpp
+++ b/src/server/QXmppPasswordChecker.cpp
@@ -21,12 +21,12 @@
  *
  */
 
+#include "QXmppPasswordChecker.h"
+
 #include <QCryptographicHash>
 #include <QString>
 #include <QTimer>
 
-#include "QXmppPasswordChecker.h"
-
 /// Returns the requested domain.
 
 QString QXmppPasswordRequest::domain() const
diff --git a/src/server/QXmppPasswordChecker.h b/src/server/QXmppPasswordChecker.h
index 7d79676f..160b879e 100644
--- a/src/server/QXmppPasswordChecker.h
+++ b/src/server/QXmppPasswordChecker.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPPASSWORDCHECKER_H
 #define QXMPPPASSWORDCHECKER_H
 
-#include <QObject>
-
 #include "QXmppGlobal.h"
 
+#include <QObject>
+
 /// \brief The QXmppPasswordRequest class represents a password request.
 ///
 class QXMPP_EXPORT QXmppPasswordRequest
diff --git a/src/server/QXmppServer.cpp b/src/server/QXmppServer.cpp
index 49a5d6fe..ea86e124 100644
--- a/src/server/QXmppServer.cpp
+++ b/src/server/QXmppServer.cpp
@@ -21,27 +21,28 @@
  *
  */
 
-#include <QCoreApplication>
-#include <QDomElement>
-#include <QFileInfo>
-#include <QPluginLoader>
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QSslSocket>
+#include "QXmppServer.h"
 
 #include "QXmppConstants_p.h"
 #include "QXmppDialback.h"
-#include "QXmppIq.h"
 #include "QXmppIncomingClient.h"
 #include "QXmppIncomingServer.h"
+#include "QXmppIq.h"
 #include "QXmppOutgoingServer.h"
 #include "QXmppPresence.h"
-#include "QXmppServer.h"
 #include "QXmppServerExtension.h"
 #include "QXmppServerPlugin.h"
 #include "QXmppUtils.h"
 
-static void helperToXmlAddDomElement(QXmlStreamWriter* stream, const QDomElement& element, const QStringList &omitNamespaces)
+#include <QCoreApplication>
+#include <QDomElement>
+#include <QFileInfo>
+#include <QPluginLoader>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QSslSocket>
+
+static void helperToXmlAddDomElement(QXmlStreamWriter *stream, const QDomElement &element, const QStringList &omitNamespaces)
 {
     stream->writeStartElement(element.tagName());
 
diff --git a/src/server/QXmppServer.h b/src/server/QXmppServer.h
index f7a15905..609886f8 100644
--- a/src/server/QXmppServer.h
+++ b/src/server/QXmppServer.h
@@ -24,11 +24,11 @@
 #ifndef QXMPPSERVER_H
 #define QXMPPSERVER_H
 
+#include "QXmppLogger.h"
+
 #include <QTcpServer>
 #include <QVariantMap>
 
-#include "QXmppLogger.h"
-
 class QDomElement;
 class QSslCertificate;
 class QSslKey;
diff --git a/src/server/QXmppServerExtension.cpp b/src/server/QXmppServerExtension.cpp
index 7a6a19b3..0db387aa 100644
--- a/src/server/QXmppServerExtension.cpp
+++ b/src/server/QXmppServerExtension.cpp
@@ -21,13 +21,14 @@
  *
  */
 
-#include <QDomElement>
-#include <QMetaClassInfo>
-#include <QStringList>
+#include "QXmppServerExtension.h"
 
 #include "QXmppLogger.h"
 #include "QXmppServer.h"
-#include "QXmppServerExtension.h"
+
+#include <QDomElement>
+#include <QMetaClassInfo>
+#include <QStringList>
 
 class QXmppServerExtensionPrivate
 {
diff --git a/src/server/QXmppServerExtension.h b/src/server/QXmppServerExtension.h
index 52c61d3c..af736225 100644
--- a/src/server/QXmppServerExtension.h
+++ b/src/server/QXmppServerExtension.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPSERVEREXTENSION_H
 #define QXMPPSERVEREXTENSION_H
 
-#include <QVariant>
-
 #include "QXmppLogger.h"
 
+#include <QVariant>
+
 class QDomElement;
 class QStringList;
 
diff --git a/src/server/QXmppServerPlugin.h b/src/server/QXmppServerPlugin.h
index e7ea6a51..c0dc61d3 100644
--- a/src/server/QXmppServerPlugin.h
+++ b/src/server/QXmppServerPlugin.h
@@ -24,10 +24,10 @@
 #ifndef QXMPPSERVERPLUGIN_H
 #define QXMPPSERVERPLUGIN_H
 
-#include <QtPlugin>
-
 #include "QXmppGlobal.h"
 
+#include <QtPlugin>
+
 class QXmppServer;
 class QXmppServerExtension;