clang-format: Enable regrouping and sorting of includes

43 files changed, 94 insertions, 65 deletions

diff --git a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
index 615a3096..8c60c879 100644
--- a/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
+++ b/tests/qxmpparchiveiq/tst_qxmpparchiveiq.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "QXmppArchiveIq.h"
+
 #include "util.h"
 
 class tst_QXmppArchiveIq : public QObject
diff --git a/tests/qxmppbindiq/tst_qxmppbindiq.cpp b/tests/qxmppbindiq/tst_qxmppbindiq.cpp
index 60e93c7c..65a4f12f 100644
--- a/tests/qxmppbindiq/tst_qxmppbindiq.cpp
+++ b/tests/qxmppbindiq/tst_qxmppbindiq.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppBindIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppBindIq : public QObject
 {
diff --git a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
index 551c79d6..2c23d145 100644
--- a/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
+++ b/tests/qxmppbitsofbinarycontentid/tst_qxmppbitsofbinarycontentid.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppBitsOfBinaryContentId.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppBitsOfBinaryContentId : public QObject
 {
diff --git a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
index 258c3044..4e9cb954 100644
--- a/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
+++ b/tests/qxmppbitsofbinaryiq/tst_qxmppbitsofbinaryiq.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <QMimeType>
-#include <QObject>
-
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppBitsOfBinaryIq.h"
+
 #include "util.h"
+#include <QMimeType>
+#include <QObject>
 
 class tst_QXmppBitsOfBinaryIq : public QObject
 {
diff --git a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
index 908c5450..319f9101 100644
--- a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
+++ b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
@@ -21,13 +21,13 @@
  *
  */
 
-#include <QBuffer>
-#include <QObject>
-
 #include "QXmppCallManager.h"
 #include "QXmppClient.h"
 #include "QXmppServer.h"
+
 #include "util.h"
+#include <QBuffer>
+#include <QObject>
 
 class tst_QXmppCallManager : public QObject
 {
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index 2f4f9357..bad351a4 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -22,12 +22,13 @@
  *
  */
 
-#include <QObject>
-#include "QXmppMessage.h"
 #include "QXmppCarbonManager.h"
+#include "QXmppMessage.h"
+
 #include "util.h"
+#include <QObject>
 
-class QXmppCarbonTestHelper  : public QObject
+class QXmppCarbonTestHelper : public QObject
 {
     Q_OBJECT
 
diff --git a/tests/qxmppclient/tst_qxmppclient.cpp b/tests/qxmppclient/tst_qxmppclient.cpp
index 122d6aca..bf14f97e 100644
--- a/tests/qxmppclient/tst_qxmppclient.cpp
+++ b/tests/qxmppclient/tst_qxmppclient.cpp
@@ -22,8 +22,6 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppClient.h"
 #include "QXmppLogger.h"
 #include "QXmppMessage.h"
@@ -32,6 +30,7 @@
 #include "QXmppVersionManager.h"
 
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppClient : public QObject
 {
diff --git a/tests/qxmppcodec/tst_qxmppcodec.cpp b/tests/qxmppcodec/tst_qxmppcodec.cpp
index 506c0489..21122102 100644
--- a/tests/qxmppcodec/tst_qxmppcodec.cpp
+++ b/tests/qxmppcodec/tst_qxmppcodec.cpp
@@ -21,12 +21,12 @@
  *
  */
 
-#include <QObject>
-#include <QtTest>
-
 #include "QXmppCodec_p.h"
 #include "QXmppRtpChannel.h"
 
+#include <QObject>
+#include <QtTest>
+
 class tst_QXmppCodec : public QObject
 {
     Q_OBJECT
diff --git a/tests/qxmppdataform/tst_qxmppdataform.cpp b/tests/qxmppdataform/tst_qxmppdataform.cpp
index 08be2e2c..1efabaf5 100644
--- a/tests/qxmppdataform/tst_qxmppdataform.cpp
+++ b/tests/qxmppdataform/tst_qxmppdataform.cpp
@@ -23,14 +23,15 @@
  *
  */
 
-#include <QtGlobal>
 #include <QObject>
+#include <QtGlobal>
 
 // deprecated methods are also tested: this is used to avoid unnecessary warnings
 #undef QT_DEPRECATED_X
 #define QT_DEPRECATED_X(text)
 
 #include "QXmppDataForm.h"
+
 #include "util.h"
 
 class tst_QXmppDataForm : public QObject
diff --git a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp
index 0b866695..9dc95238 100644
--- a/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp
+++ b/tests/qxmppdiscoveryiq/tst_qxmppdiscoveryiq.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppDiscoveryIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppDiscoveryIq : public QObject
 {
diff --git a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
index ccb6643c..755ba085 100644
--- a/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
+++ b/tests/qxmppentitytimeiq/tst_qxmppentitytimeiq.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppEntityTimeIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppEntityTimeIq : public QObject
 {
diff --git a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
index c877825a..4f22dcc3 100644
--- a/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
+++ b/tests/qxmpphttpuploadiq/tst_qxmpphttpuploadiq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppHttpUploadIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppHttpUploadIq : public QObject
 {
diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
index 57cde0e2..c71b02a1 100644
--- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
+++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QHostInfo>
 #include "QXmppStun.h"
+
 #include "util.h"
+#include <QHostInfo>
 
 class tst_QXmppIceConnection : public QObject
 {
diff --git a/tests/qxmppiq/tst_qxmppiq.cpp b/tests/qxmppiq/tst_qxmppiq.cpp
index 66fcbd54..cad73ffc 100644
--- a/tests/qxmppiq/tst_qxmppiq.cpp
+++ b/tests/qxmppiq/tst_qxmppiq.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppIq : public QObject
 {
diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
index 254cbd44..114e095b 100644
--- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
+++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppJingleIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppJingleIq : public QObject
 {
diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
index 3d32a3e1..38d86909 100644
--- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp
+++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
@@ -21,12 +21,13 @@
  *
  */
 
-#include <QObject>
-#include "QXmppMessage.h"
 #include "QXmppMamManager.h"
+#include "QXmppMessage.h"
+
 #include "util.h"
+#include <QObject>
 
-class QXmppMamTestHelper  : public QObject
+class QXmppMamTestHelper : public QObject
 {
     Q_OBJECT
 
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index f9d81582..a7c0a3b3 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -22,11 +22,12 @@
  *
  */
 
-#include <QObject>
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppBitsOfBinaryDataList.h"
 #include "QXmppMessage.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppMessage : public QObject
 {
diff --git a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
index c205dfeb..6bf53cf2 100644
--- a/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
+++ b/tests/qxmppmessagereceiptmanager/tst_qxmppmessagereceiptmanager.cpp
@@ -21,10 +21,11 @@
  *
  */
 
-#include <QObject>
 #include "QXmppClient.h"
 #include "QXmppMessageReceiptManager.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppMessageReceiptManager : public QObject
 {
diff --git a/tests/qxmppmixiq/tst_qxmppmixiq.cpp b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
index 7348c03b..7387c667 100644
--- a/tests/qxmppmixiq/tst_qxmppmixiq.cpp
+++ b/tests/qxmppmixiq/tst_qxmppmixiq.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppMixIq.h"
+
 #include "util.h"
+#include <QObject>
 
 Q_DECLARE_METATYPE(QXmppIq::Type);
 Q_DECLARE_METATYPE(QXmppMixIq::Type);
diff --git a/tests/qxmppmixitem/tst_qxmppmixitem.cpp b/tests/qxmppmixitem/tst_qxmppmixitem.cpp
index 65e1e190..2120aa74 100644
--- a/tests/qxmppmixitem/tst_qxmppmixitem.cpp
+++ b/tests/qxmppmixitem/tst_qxmppmixitem.cpp
@@ -21,11 +21,12 @@
  *
  */
 
-#include <QObject>
-#include <QDomDocument>
 #include "QXmppMixItem.h"
 #include "QXmppPubSubIq.h"
+
 #include "util.h"
+#include <QDomDocument>
+#include <QObject>
 
 class tst_QXmppMixItem : public QObject
 {
diff --git a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp
index eb6460b0..ed5b3e46 100644
--- a/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp
+++ b/tests/qxmppnonsaslauthiq/tst_qxmppnonsaslauthiq.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "QXmppNonSASLAuth.h"
+
 #include "util.h"
 
 class tst_QXmppNonSASLAuthIq : public QObject
diff --git a/tests/qxmpppresence/tst_qxmpppresence.cpp b/tests/qxmpppresence/tst_qxmpppresence.cpp
index 9bdf4953..701b9192 100644
--- a/tests/qxmpppresence/tst_qxmpppresence.cpp
+++ b/tests/qxmpppresence/tst_qxmpppresence.cpp
@@ -22,12 +22,11 @@
  *
  */
 
-#include <QDateTime>
-#include <QObject>
-
 #include "QXmppPresence.h"
 
 #include "util.h"
+#include <QDateTime>
+#include <QObject>
 
 class tst_QXmppPresence : public QObject
 {
diff --git a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
index 8257a72a..1f85a8c7 100644
--- a/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
+++ b/tests/qxmpppubsubiq/tst_qxmpppubsubiq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppPubSubIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppPubSubIq : public QObject
 {
diff --git a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp
index b6062af6..0ea2914e 100644
--- a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp
+++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp
@@ -22,13 +22,13 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppBitsOfBinaryContentId.h"
 #include "QXmppBitsOfBinaryData.h"
 #include "QXmppBitsOfBinaryDataList.h"
 #include "QXmppRegisterIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppRegisterIq : public QObject
 {
diff --git a/tests/qxmppresultset/tst_qxmppresultset.cpp b/tests/qxmppresultset/tst_qxmppresultset.cpp
index 7704d2fe..b27d81af 100644
--- a/tests/qxmppresultset/tst_qxmppresultset.cpp
+++ b/tests/qxmppresultset/tst_qxmppresultset.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppResultSet.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppResultSet : public QObject
 {
diff --git a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
index 4d4e43a4..ae8e7f51 100644
--- a/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
+++ b/tests/qxmpprosteriq/tst_qxmpprosteriq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppRosterIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppRosterIq : public QObject
 {
diff --git a/tests/qxmpprpciq/tst_qxmpprpciq.cpp b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
index 8dbecec3..28034dd2 100644
--- a/tests/qxmpprpciq/tst_qxmpprpciq.cpp
+++ b/tests/qxmpprpciq/tst_qxmpprpciq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppRpcIq.h"
+
 #include "util.h"
+#include <QObject>
 
 static void checkVariant(const QVariant &value, const QByteArray &xml)
 {
diff --git a/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp b/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp
index 70f7d2bc..d3e8b954 100644
--- a/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp
+++ b/tests/qxmpprtcppacket/tst_qxmpprtcppacket.cpp
@@ -21,9 +21,10 @@
  *
  */
 
+#include "QXmppRtcpPacket.h"
+
 #include <QObject>
 #include <QtTest>
-#include "QXmppRtcpPacket.h"
 
 class tst_QXmppRtcpPacket : public QObject
 {
diff --git a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp
index 457f0afb..28d82204 100644
--- a/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp
+++ b/tests/qxmpprtppacket/tst_qxmpprtppacket.cpp
@@ -21,9 +21,10 @@
  *
  */
 
+#include "QXmppRtpPacket.h"
+
 #include <QObject>
 #include <QtTest>
-#include "QXmppRtpPacket.h"
 
 class tst_QXmppRtpPacket : public QObject
 {
diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp
index 6edc4eff..cefa8ee0 100644
--- a/tests/qxmppserver/tst_qxmppserver.cpp
+++ b/tests/qxmppserver/tst_qxmppserver.cpp
@@ -23,6 +23,7 @@
 
 #include "QXmppClient.h"
 #include "QXmppServer.h"
+
 #include "util.h"
 
 class tst_QXmppServer : public QObject
diff --git a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp
index 7a1d57bc..ba766af2 100644
--- a/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp
+++ b/tests/qxmppsessioniq/tst_qxmppsessioniq.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "QXmppSessionIq.h"
+
 #include "util.h"
 
 class TestPackets : public QObject
diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp
index 9861891c..694fc277 100644
--- a/tests/qxmppsocks/tst_qxmppsocks.cpp
+++ b/tests/qxmppsocks/tst_qxmppsocks.cpp
@@ -21,10 +21,11 @@
  *
  */
 
-#include <QTcpServer>
-#include <QTcpSocket>
 #include "QXmppSocks.h"
+
 #include "util.h"
+#include <QTcpServer>
+#include <QTcpSocket>
 
 class tst_QXmppSocks : public QObject
 {
diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp
index 6dd704c5..38ffd932 100644
--- a/tests/qxmppstanza/tst_qxmppstanza.cpp
+++ b/tests/qxmppstanza/tst_qxmppstanza.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppStanza.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppStanza : public QObject
 {
diff --git a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
index 1b6119d8..7f1e0d3e 100644
--- a/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
+++ b/tests/qxmppstarttlspacket/tst_qxmppstarttlspacket.cpp
@@ -21,10 +21,10 @@
  *
  */
 
-#include <QObject>
-
 #include "QXmppStartTlsPacket.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppStartTlsPacket : public QObject
 {
diff --git a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
index 223fd965..eb5a174b 100644
--- a/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
+++ b/tests/qxmppstreamfeatures/tst_qxmppstreamfeatures.cpp
@@ -22,6 +22,7 @@
  */
 
 #include "QXmppStreamFeatures.h"
+
 #include "util.h"
 
 class tst_QXmppStreamFeatures : public QObject
diff --git a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
index 22572cc4..1bf55b77 100644
--- a/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
+++ b/tests/qxmppstreaminitiationiq/tst_qxmppstreaminitiationiq.cpp
@@ -24,6 +24,7 @@
 
 #include "QXmppStreamInitiationIq_p.h"
 #include "QXmppTransferManager.h"
+
 #include "util.h"
 
 class tst_QXmppStreamInitiationIq : public QObject
diff --git a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp
index 8385d083..f1cfdbbb 100644
--- a/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp
+++ b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppStun.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppStunMessage : public QObject
 {
diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
index 537b52de..87f04eb6 100644
--- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
+++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
@@ -21,13 +21,13 @@
  *
  */
 
-#include <QBuffer>
-#include <QObject>
-
 #include "QXmppClient.h"
 #include "QXmppServer.h"
 #include "QXmppTransferManager.h"
+
 #include "util.h"
+#include <QBuffer>
+#include <QObject>
 
 class tst_QXmppTransferManager : public QObject
 {
diff --git a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
index 0332b410..0486f519 100644
--- a/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
+++ b/tests/qxmppuploadrequestmanager/tst_qxmppuploadrequestmanager.cpp
@@ -22,18 +22,18 @@
  *
  */
 
-#include <QObject>
-#include <QByteArray>
-#include <QMimeDatabase>
-
-#include "QXmppUploadRequestManager.h"
 #include "QXmppClient.h"
 #include "QXmppDiscoveryManager.h"
-#include "QXmppLogger.h"
 #include "QXmppHttpUploadIq.h"
+#include "QXmppLogger.h"
+#include "QXmppUploadRequestManager.h"
+
 #include "util.h"
+#include <QByteArray>
+#include <QMimeDatabase>
+#include <QObject>
 
-class TestHelper : public QObject 
+class TestHelper : public QObject
 {
     Q_OBJECT
 
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index 69b02b39..27424e1a 100644
--- a/tests/qxmpputils/tst_qxmpputils.cpp
+++ b/tests/qxmpputils/tst_qxmpputils.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppUtils.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppUtils : public QObject
 {
diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
index 81d12066..932ee9b9 100644
--- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
+++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
@@ -21,9 +21,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppVCardIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppVCardIq : public QObject
 {
diff --git a/tests/qxmppversioniq/tst_qxmppversioniq.cpp b/tests/qxmppversioniq/tst_qxmppversioniq.cpp
index 2d9ec632..00c17da0 100644
--- a/tests/qxmppversioniq/tst_qxmppversioniq.cpp
+++ b/tests/qxmppversioniq/tst_qxmppversioniq.cpp
@@ -22,9 +22,10 @@
  *
  */
 
-#include <QObject>
 #include "QXmppVersionIq.h"
+
 #include "util.h"
+#include <QObject>
 
 class tst_QXmppVersionIq : public QObject
 {
diff --git a/tests/util.h b/tests/util.h
index 5d5bf9f9..9d1cee90 100644
--- a/tests/util.h
+++ b/tests/util.h
@@ -22,9 +22,10 @@
  *
  */
 
+#include "QXmppPasswordChecker.h"
+
 #include <QDomDocument>
 #include <QtTest>
-#include "QXmppPasswordChecker.h"
 
 template<class T>
 static void parsePacket(T &packet, const QByteArray &xml)