clang-format: Enable regrouping and sorting of includes

77 files changed, 208 insertions, 181 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.
 ///