clang-format: Enable regrouping and sorting of includes

34 files changed, 124 insertions, 117 deletions

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: