diff --git a/src/libs/clangbackendipc/clangbackendipc-lib.pri b/src/libs/clangbackendipc/clangbackendipc-lib.pri
index ed1a01d6f3a..f49e3ab2197 100644
--- a/src/libs/clangbackendipc/clangbackendipc-lib.pri
+++ b/src/libs/clangbackendipc/clangbackendipc-lib.pri
@@ -12,7 +12,6 @@ INCLUDEPATH += $$PWD
 
 SOURCES += $$PWD/ipcserverinterface.cpp \
     $$PWD/ipcserverproxy.cpp \
-    $$PWD/ipcserver.cpp \
     $$PWD/ipcclientinterface.cpp \
     $$PWD/cmbendcommand.cpp \
     $$PWD/cmbalivecommand.cpp \
@@ -42,7 +41,6 @@ SOURCES += $$PWD/ipcserverinterface.cpp \
 HEADERS += \
     $$PWD/ipcserverinterface.h \
     $$PWD/ipcserverproxy.h \
-    $$PWD/ipcserver.h \
     $$PWD/ipcclientinterface.h \
     $$PWD/cmbendcommand.h \
     $$PWD/cmbalivecommand.h \
diff --git a/src/libs/clangbackendipc/cmbalivecommand.cpp b/src/libs/clangbackendipc/cmbalivecommand.cpp
index 9be8d30745a..57d23817872 100644
--- a/src/libs/clangbackendipc/cmbalivecommand.cpp
+++ b/src/libs/clangbackendipc/cmbalivecommand.cpp
@@ -30,9 +30,8 @@
 
 #include "cmbalivecommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp b/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
index 75473fd34d9..af4fe57e612 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
+++ b/src/libs/clangbackendipc/cmbcodecompletedcommand.cpp
@@ -30,9 +30,8 @@
 
 #include "cmbcodecompletedcommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/cmbcodecompletedcommand.h b/src/libs/clangbackendipc/cmbcodecompletedcommand.h
index c6e6b87685f..0550b14af01 100644
--- a/src/libs/clangbackendipc/cmbcodecompletedcommand.h
+++ b/src/libs/clangbackendipc/cmbcodecompletedcommand.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_CODECOMPLETEDCOMMAND_H
 #define CLANGBACKEND_CODECOMPLETEDCOMMAND_H
 
+#include "codecompletion.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "codecompletion.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CodeCompletedCommand
diff --git a/src/libs/clangbackendipc/cmbcompletecodecommand.cpp b/src/libs/clangbackendipc/cmbcompletecodecommand.cpp
index cbf242582b2..880885dd274 100644
--- a/src/libs/clangbackendipc/cmbcompletecodecommand.cpp
+++ b/src/libs/clangbackendipc/cmbcompletecodecommand.cpp
@@ -30,9 +30,8 @@
 
 #include "cmbcompletecodecommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/cmbcompletecodecommand.h b/src/libs/clangbackendipc/cmbcompletecodecommand.h
index 545c6ab926b..3e964e44732 100644
--- a/src/libs/clangbackendipc/cmbcompletecodecommand.h
+++ b/src/libs/clangbackendipc/cmbcompletecodecommand.h
@@ -33,9 +33,10 @@
 
 #include "clangbackendipc_global.h"
 
-#include <QMetaType>
 #include <utf8string.h>
 
+#include <QMetaType>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CompleteCodeCommand
diff --git a/src/libs/clangbackendipc/cmbechocommand.cpp b/src/libs/clangbackendipc/cmbechocommand.cpp
index 812c6f24e68..4bed4a78887 100644
--- a/src/libs/clangbackendipc/cmbechocommand.cpp
+++ b/src/libs/clangbackendipc/cmbechocommand.cpp
@@ -30,9 +30,8 @@
 
 #include "cmbechocommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/cmbendcommand.cpp b/src/libs/clangbackendipc/cmbendcommand.cpp
index e99a50137bb..08c5d7a66e7 100644
--- a/src/libs/clangbackendipc/cmbendcommand.cpp
+++ b/src/libs/clangbackendipc/cmbendcommand.cpp
@@ -30,9 +30,8 @@
 
 #include "cmbendcommand.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
index 83e582f7e28..3b8ea87b4f3 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp
@@ -30,15 +30,13 @@
 
 #include "cmbregisterprojectsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
-
-#include <ostream>
+#include <QDebug>
 
 #include <algorithm>
-
-#include "container_common.h"
+#include <ostream>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
index 8902181a1ce..b2b9915bff6 100644
--- a/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbregisterprojectsforcodecompletioncommand.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
 #define CLANGBACKEND_REGISTERPROJECTSFORCODECOMPLETIONCOMAND_H
 
+#include "projectpartcontainer.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "projectpartcontainer.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT RegisterProjectPartsForCodeCompletionCommand
diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
index 39b3d083dbf..d8ed6e0d3e5 100644
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp
@@ -30,14 +30,13 @@
 
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
-#include "container_common.h"
-
 namespace ClangBackEnd {
 
 RegisterTranslationUnitForCodeCompletionCommand::RegisterTranslationUnitForCodeCompletionCommand(const QVector<FileContainer> &fileContainers)
diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
index e598b0cdb59..961cb27a045 100644
--- a/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 #define CLANGBACKEND_REGISTERFILEFORCODECOMPLETION_H
 
-#include <qmetatype.h>
-
-#include <QVector>
 #include "filecontainer.h"
 
+#include <QMetaType>
+#include <QVector>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT RegisterTranslationUnitForCodeCompletionCommand
diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
index 6abb3b45ebc..7c6743616c7 100644
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
@@ -30,13 +30,13 @@
 
 #include "cmbunregisterprojectsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
-#include "container_common.h"
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
index cf19c18a7cc..22282be01de 100644
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp
@@ -30,15 +30,14 @@
 
 #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
 
-#include <QtDebug>
+#include "container_common.h"
 
 #ifdef CLANGBACKEND_TESTS
 #include <gtest/gtest-printers.h>
 #endif
 
 #include <QDataStream>
-
-#include "container_common.h"
+#include <QDebug>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
index 327dd99556f..f0f4a105a54 100644
--- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h
@@ -35,8 +35,8 @@
 
 #include "filecontainer.h"
 
-#include <QVector>
 #include <QMetaType>
+#include <QVector>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/codecompletion.cpp b/src/libs/clangbackendipc/codecompletion.cpp
index 542fcf4e139..5e4d010de48 100644
--- a/src/libs/clangbackendipc/codecompletion.cpp
+++ b/src/libs/clangbackendipc/codecompletion.cpp
@@ -30,9 +30,8 @@
 
 #include "codecompletion.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/codecompletion.h b/src/libs/clangbackendipc/codecompletion.h
index 328fa504021..44f34a8b090 100644
--- a/src/libs/clangbackendipc/codecompletion.h
+++ b/src/libs/clangbackendipc/codecompletion.h
@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETION_H
 #define CLANGBACKEND_CODECOMPLETION_H
 
-#include <QMetaType>
-#include <utf8string.h>
-
+#include "clangbackendipc_global.h"
 #include "codecompletionchunk.h"
 
-#include "clangbackendipc_global.h"
+#include <utf8string.h>
+
+#include <QMetaType>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/codecompletionchunk.cpp b/src/libs/clangbackendipc/codecompletionchunk.cpp
index 5b5dfbb587e..d6affedfa4a 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.cpp
+++ b/src/libs/clangbackendipc/codecompletionchunk.cpp
@@ -31,7 +31,6 @@
 #include "codecompletionchunk.h"
 
 #include <QDataStream>
-
 #include <QDebug>
 
 #include <ostream>
diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangbackendipc/codecompletionchunk.h
index d6b481ab72a..fd25880d92b 100644
--- a/src/libs/clangbackendipc/codecompletionchunk.h
+++ b/src/libs/clangbackendipc/codecompletionchunk.h
@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H
 #define CLANGBACKEND_CODECOMPLETIONCHUNK_H
 
+#include "clangbackendipc_global.h"
+
 #include <utf8string.h>
 
 #include <QVector>
 
-#include "clangbackendipc_global.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT CodeCompletionChunk
diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp
index c2f504e036f..4636ef22759 100644
--- a/src/libs/clangbackendipc/connectionclient.cpp
+++ b/src/libs/clangbackendipc/connectionclient.cpp
@@ -30,13 +30,13 @@
 
 #include "connectionclient.h"
 
-#include <QProcess>
-#include <QThread>
-#include <QCoreApplication>
-
+#include "cmbcompletecodecommand.h"
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
 #include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbcompletecodecommand.h"
+
+#include <QCoreApplication>
+#include <QProcess>
+#include <QThread>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/connectionclient.h b/src/libs/clangbackendipc/connectionclient.h
index 390995792bc..01f48d75b49 100644
--- a/src/libs/clangbackendipc/connectionclient.h
+++ b/src/libs/clangbackendipc/connectionclient.h
@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CONNECTIONCLIENT_H
 #define CLANGBACKEND_CONNECTIONCLIENT_H
 
+#include "ipcserverproxy.h"
+
 #include <QLocalSocket>
 
 #include <memory>
 
-#include "ipcserverproxy.h"
-
 QT_BEGIN_NAMESPACE
 class QProcess;
 QT_END_NAMESPACE
diff --git a/src/libs/clangbackendipc/connectionserver.cpp b/src/libs/clangbackendipc/connectionserver.cpp
index f16e2f56d76..804a0636734 100644
--- a/src/libs/clangbackendipc/connectionserver.cpp
+++ b/src/libs/clangbackendipc/connectionserver.cpp
@@ -30,12 +30,12 @@
 
 #include "connectionserver.h"
 
-#include <QLocalSocket>
-#include <QCoreApplication>
-#include <QTimer>
-
 #include <ipcserverinterface.h>
 
+#include <QCoreApplication>
+#include <QLocalSocket>
+#include <QTimer>
+
 #include <cstdlib>
 
 namespace ClangBackEnd {
diff --git a/src/libs/clangbackendipc/connectionserver.h b/src/libs/clangbackendipc/connectionserver.h
index 27d1265c95a..d6e06edb306 100644
--- a/src/libs/clangbackendipc/connectionserver.h
+++ b/src/libs/clangbackendipc/connectionserver.h
@@ -31,8 +31,10 @@
 #ifndef CLANGBACKEND_CONNECTIONSERVER_H
 #define CLANGBACKEND_CONNECTIONSERVER_H
 
-#include <QLocalServer>
 #include <ipcclientproxy.h>
+
+#include <QLocalServer>
+
 #include <vector>
 
 namespace ClangBackEnd {
diff --git a/src/libs/clangbackendipc/filecontainer.cpp b/src/libs/clangbackendipc/filecontainer.cpp
index 9073ca6f372..65f81a1ea04 100644
--- a/src/libs/clangbackendipc/filecontainer.cpp
+++ b/src/libs/clangbackendipc/filecontainer.cpp
@@ -30,9 +30,8 @@
 
 #include "filecontainer.h"
 
-#include <QtDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/filecontainer.h b/src/libs/clangbackendipc/filecontainer.h
index 2a749e08095..3025dfca5d0 100644
--- a/src/libs/clangbackendipc/filecontainer.h
+++ b/src/libs/clangbackendipc/filecontainer.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_FILECONTAINER_H
 #define CLANGBACKEND_FILECONTAINER_H
 
-#include <qmetatype.h>
+#include <clangbackendipc_global.h>
 
 #include <utf8string.h>
 
-#include <clangbackendipc_global.h>
+#include <QMetaType>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/ipcclientdispatcher.cpp b/src/libs/clangbackendipc/ipcclientdispatcher.cpp
index 7de8c7f01db..ecd840d2fa2 100644
--- a/src/libs/clangbackendipc/ipcclientdispatcher.cpp
+++ b/src/libs/clangbackendipc/ipcclientdispatcher.cpp
@@ -30,7 +30,7 @@
 
 #include "ipcclientdispatcher.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/ipcclientinterface.cpp b/src/libs/clangbackendipc/ipcclientinterface.cpp
index b1959ceab30..f66338d08b6 100644
--- a/src/libs/clangbackendipc/ipcclientinterface.cpp
+++ b/src/libs/clangbackendipc/ipcclientinterface.cpp
@@ -30,13 +30,13 @@
 
 #include "ipcclientinterface.h"
 
-#include <QVariant>
-#include <QtDebug>
-
-#include "cmbechocommand.h"
 #include "cmbcodecompletedcommand.h"
-#include "translationunitdoesnotexistcommand.h"
+#include "cmbechocommand.h"
 #include "projectpartsdonotexistcommand.h"
+#include "translationunitdoesnotexistcommand.h"
+
+#include <QDebug>
+#include <QVariant>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/ipcclientproxy.cpp b/src/libs/clangbackendipc/ipcclientproxy.cpp
index ea0655e7fb0..7f6a577d9d7 100644
--- a/src/libs/clangbackendipc/ipcclientproxy.cpp
+++ b/src/libs/clangbackendipc/ipcclientproxy.cpp
@@ -30,19 +30,18 @@
 
 #include "ipcclientproxy.h"
 
-#include <cmbalivecommand.h>
-
-#include <QVariant>
-#include <QVector>
-#include <QIODevice>
-#include <QtDebug>
-
-#include "ipcserverinterface.h"
+#include "cmbalivecommand.h"
+#include "cmbcodecompletedcommand.h"
 #include "cmbechocommand.h"
 #include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbcodecompletedcommand.h"
-#include "translationunitdoesnotexistcommand.h"
+#include "ipcserverinterface.h"
 #include "projectpartsdonotexistcommand.h"
+#include "translationunitdoesnotexistcommand.h"
+
+#include <QDebug>
+#include <QIODevice>
+#include <QVariant>
+#include <QVector>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/ipcclientproxy.h b/src/libs/clangbackendipc/ipcclientproxy.h
index 36820266c07..4bf36d0408c 100644
--- a/src/libs/clangbackendipc/ipcclientproxy.h
+++ b/src/libs/clangbackendipc/ipcclientproxy.h
@@ -31,16 +31,15 @@
 #ifndef CODELMODELBACKEND_IPCCLIENTPROXY_H
 #define CODELMODELBACKEND_IPCCLIENTPROXY_H
 
+#include "clangbackendipc_global.h"
+#include "ipcclientinterface.h"
+#include "readcommandblock.h"
+#include "writecommandblock.h"
+
 #include <QtGlobal>
 
 #include <memory>
 
-#include "clangbackendipc_global.h"
-#include "ipcclientinterface.h"
-
-#include "writecommandblock.h"
-#include "readcommandblock.h"
-
 QT_BEGIN_NAMESPACE
 class QLocalServer;
 class QIODevice;
diff --git a/src/libs/clangbackendipc/ipcinterface.h b/src/libs/clangbackendipc/ipcinterface.h
index 68cfa6724ec..c40c43056ac 100644
--- a/src/libs/clangbackendipc/ipcinterface.h
+++ b/src/libs/clangbackendipc/ipcinterface.h
@@ -31,14 +31,14 @@
 #ifndef CLANGBACKEND_IPCINTERFACE_H
 #define CLANGBACKEND_IPCINTERFACE_H
 
+#include "clangbackendipc_global.h"
+
 #include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QVariant;
 QT_END_NAMESPACE
 
-#include "clangbackendipc_global.h"
-
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT IpcInterface
diff --git a/src/libs/clangbackendipc/ipcserver.cpp b/src/libs/clangbackendipc/ipcserver.cpp
deleted file mode 100644
index 220361c6234..00000000000
--- a/src/libs/clangbackendipc/ipcserver.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "ipcserver.h"
-
-namespace ClangBackEnd {
-
-IpcServer::IpcServer()
-{
-
-}
-
-IpcServer::~IpcServer()
-{
-
-}
-
-} // namespace ClangBackEnd
-
diff --git a/src/libs/clangbackendipc/ipcserver.h b/src/libs/clangbackendipc/ipcserver.h
deleted file mode 100644
index 0512f992346..00000000000
--- a/src/libs/clangbackendipc/ipcserver.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef CLANGBACKEND_IPCSERVER_H
-#define CLANGBACKEND_IPCSERVER_H
-
-#include "ipcserverinterface.h"
-
-namespace ClangBackEnd {
-
-class IpcServer : public IpcServerInterface
-{
-public:
-    IpcServer();
-    ~IpcServer();
-};
-
-} // namespace ClangBackEnd
-
-#endif // CLANGBACKEND_IPCSERVER_H
diff --git a/src/libs/clangbackendipc/ipcserverinterface.cpp b/src/libs/clangbackendipc/ipcserverinterface.cpp
index 87ef9a5c3af..c5331a91d0f 100644
--- a/src/libs/clangbackendipc/ipcserverinterface.cpp
+++ b/src/libs/clangbackendipc/ipcserverinterface.cpp
@@ -30,14 +30,14 @@
 
 #include "ipcserverinterface.h"
 
-#include <QVariant>
-#include <QtDebug>
-
-#include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbregisterprojectsforcodecompletioncommand.h"
-#include "cmbunregisterprojectsforcodecompletioncommand.h"
 #include "cmbcompletecodecommand.h"
+#include "cmbregisterprojectsforcodecompletioncommand.h"
+#include "cmbregistertranslationunitsforcodecompletioncommand.h"
+#include "cmbunregisterprojectsforcodecompletioncommand.h"
+#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
+
+#include <QDebug>
+#include <QVariant>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/ipcserverproxy.cpp b/src/libs/clangbackendipc/ipcserverproxy.cpp
index 30e002cee24..f7356bbc504 100644
--- a/src/libs/clangbackendipc/ipcserverproxy.cpp
+++ b/src/libs/clangbackendipc/ipcserverproxy.cpp
@@ -30,20 +30,19 @@
 
 #include "ipcserverproxy.h"
 
-#include <QProcess>
-#include <QLocalSocket>
-#include <QLocalServer>
-
-#include <cmbendcommand.h>
 #include <cmbalivecommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
 #include <cmbcompletecodecommand.h>
-
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <ipcclientinterface.h>
 
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QProcess>
+
 namespace ClangBackEnd {
 
 IpcServerProxy::IpcServerProxy(IpcClientInterface *client, QIODevice *ioDevice)
diff --git a/src/libs/clangbackendipc/ipcserverproxy.h b/src/libs/clangbackendipc/ipcserverproxy.h
index f10a9595bb3..5f0a6eed255 100644
--- a/src/libs/clangbackendipc/ipcserverproxy.h
+++ b/src/libs/clangbackendipc/ipcserverproxy.h
@@ -30,16 +30,15 @@
 
 #ifndef CLANGBACKEND_IPCSERVERPROXY_H
 #define CLANGBACKEND_IPCSERVERPROXY_H
+#include "ipcserverinterface.h"
+#include "readcommandblock.h"
+#include "writecommandblock.h"
 
-#include <qglobal.h>
+#include <QtGlobal>
 #include <QTimer>
 
 #include <memory>
 
-#include "ipcserverinterface.h"
-#include "writecommandblock.h"
-#include "readcommandblock.h"
-
 QT_BEGIN_NAMESPACE
 class QVariant;
 class QProcess;
diff --git a/src/libs/clangbackendipc/projectpartcontainer.cpp b/src/libs/clangbackendipc/projectpartcontainer.cpp
index cd3f7a98a3e..692b755eb0a 100644
--- a/src/libs/clangbackendipc/projectpartcontainer.cpp
+++ b/src/libs/clangbackendipc/projectpartcontainer.cpp
@@ -30,7 +30,7 @@
 
 #include "projectpartcontainer.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 #include <QDataStream>
 
diff --git a/src/libs/clangbackendipc/projectpartcontainer.h b/src/libs/clangbackendipc/projectpartcontainer.h
index 4fdf26451e3..f21937658db 100644
--- a/src/libs/clangbackendipc/projectpartcontainer.h
+++ b/src/libs/clangbackendipc/projectpartcontainer.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_PROJECTCONTAINER_H
 #define CLANGBACKEND_PROJECTCONTAINER_H
 
-#include <QMetaType>
+#include <clangbackendipc_global.h>
 
 #include <utf8stringvector.h>
 
-#include <clangbackendipc_global.h>
+#include <QMetaType>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp b/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
index f0f78bf6207..8b1b5cd1a35 100644
--- a/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
+++ b/src/libs/clangbackendipc/projectpartsdonotexistcommand.cpp
@@ -30,9 +30,8 @@
 
 #include "projectpartsdonotexistcommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/projectpartsdonotexistcommand.h b/src/libs/clangbackendipc/projectpartsdonotexistcommand.h
index c633f9d6e9a..5adfdca28db 100644
--- a/src/libs/clangbackendipc/projectpartsdonotexistcommand.h
+++ b/src/libs/clangbackendipc/projectpartsdonotexistcommand.h
@@ -31,11 +31,11 @@
 #ifndef CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
 #define CLANGBACKEND_PROJECTPARTSDONOTEXISTCOMMAND_H
 
-#include <QMetaType>
+#include "clangbackendipc_global.h"
 
 #include <utf8stringvector.h>
 
-#include "clangbackendipc_global.h"
+#include <QMetaType>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/readcommandblock.cpp b/src/libs/clangbackendipc/readcommandblock.cpp
index 318b318e41e..301da098ef3 100644
--- a/src/libs/clangbackendipc/readcommandblock.cpp
+++ b/src/libs/clangbackendipc/readcommandblock.cpp
@@ -31,9 +31,9 @@
 #include "readcommandblock.h"
 
 #include <QDataStream>
+#include <QDebug>
 #include <QIODevice>
 #include <QVariant>
-#include <QtDebug>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
index 5c512dd19ec..ff3da8f8a58 100644
--- a/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
+++ b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.cpp
@@ -30,9 +30,8 @@
 
 #include "translationunitdoesnotexistcommand.h"
 
-#include <QDebug>
-
 #include <QDataStream>
+#include <QDebug>
 
 #include <ostream>
 
diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
index e6124d56ad7..dfb7103d0c5 100644
--- a/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
+++ b/src/libs/clangbackendipc/translationunitdoesnotexistcommand.h
@@ -31,10 +31,10 @@
 #ifndef CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
 #define CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSCOMMAND_H
 
-#include <QMetaType>
-
 #include "filecontainer.h"
 
+#include <QMetaType>
+
 namespace ClangBackEnd {
 
 class CMBIPC_EXPORT TranslationUnitDoesNotExistCommand
diff --git a/src/libs/clangbackendipc/writecommandblock.cpp b/src/libs/clangbackendipc/writecommandblock.cpp
index 3d0d2fca07f..88d564d8be6 100644
--- a/src/libs/clangbackendipc/writecommandblock.cpp
+++ b/src/libs/clangbackendipc/writecommandblock.cpp
@@ -31,9 +31,9 @@
 #include "writecommandblock.h"
 
 #include <QDataStream>
+#include <QDebug>
 #include <QIODevice>
 #include <QVariant>
-#include <QtDebug>
 
 namespace ClangBackEnd {
 
diff --git a/src/libs/sqlite/createtablecommand.h b/src/libs/sqlite/createtablecommand.h
index cd4bdd46db8..5dff27bef76 100644
--- a/src/libs/sqlite/createtablecommand.h
+++ b/src/libs/sqlite/createtablecommand.h
@@ -31,12 +31,12 @@
 #ifndef INTERNAL_CREATETABLECOMMAND_H
 #define INTERNAL_CREATETABLECOMMAND_H
 
+#include "columndefinition.h"
+#include "utf8string.h"
+
 #include <QMetaType>
 #include <QVector>
 
-#include "utf8string.h"
-#include "columndefinition.h"
-
 namespace Internal {
 
 class CreateTableCommand
diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.h b/src/libs/sqlite/createtablesqlstatementbuilder.h
index f70c972f39b..ecb24aa673c 100644
--- a/src/libs/sqlite/createtablesqlstatementbuilder.h
+++ b/src/libs/sqlite/createtablesqlstatementbuilder.h
@@ -31,11 +31,10 @@
 #ifndef CREATETABLESQLSTATEMENTBUILDER_H
 #define CREATETABLESQLSTATEMENTBUILDER_H
 
-#include <QVector>
-
+#include "columndefinition.h"
 #include "sqlstatementbuilder.h"
 
-#include "columndefinition.h"
+#include <QVector>
 
 namespace Internal {
 
diff --git a/src/libs/sqlite/sqlitecolumn.h b/src/libs/sqlite/sqlitecolumn.h
index a25fa1fa284..e2ea9bcf9d2 100644
--- a/src/libs/sqlite/sqlitecolumn.h
+++ b/src/libs/sqlite/sqlitecolumn.h
@@ -31,10 +31,10 @@
 #ifndef SQLITECOLUMN_H
 #define SQLITECOLUMN_H
 
-#include <QObject>
-
-#include "utf8string.h"
 #include "columndefinition.h"
+#include "utf8string.h"
+
+#include <QObject>
 
 class SQLITE_EXPORT SqliteColumn : public QObject
 {
diff --git a/src/libs/sqlite/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h
index a7d367cf16b..88ff8eecd3e 100644
--- a/src/libs/sqlite/sqlitedatabase.h
+++ b/src/libs/sqlite/sqlitedatabase.h
@@ -31,12 +31,12 @@
 #ifndef SQLITEDATABASE_H
 #define SQLITEDATABASE_H
 
+#include "sqlitedatabaseconnectionproxy.h"
+#include "sqliteglobal.h"
+
 #include <QString>
 #include <QVector>
 
-#include "sqliteglobal.h"
-#include "sqlitedatabaseconnectionproxy.h"
-
 class SqliteTable;
 
 class SQLITE_EXPORT SqliteDatabase : public QObject
diff --git a/src/libs/sqlite/sqlitedatabasebackend.cpp b/src/libs/sqlite/sqlitedatabasebackend.cpp
index c17aab3f72e..56926b30f55 100644
--- a/src/libs/sqlite/sqlitedatabasebackend.cpp
+++ b/src/libs/sqlite/sqlitedatabasebackend.cpp
@@ -30,18 +30,18 @@
 
 #include "sqlitedatabasebackend.h"
 
-#include <QThread>
-#include <QtDebug>
+#include "sqliteexception.h"
+#include "sqlitereadstatement.h"
+#include "sqlitereadwritestatement.h"
+#include "sqlitestatement.h"
+#include "sqlitewritestatement.h"
 
-#include "sqlite3.h"
+#include <QThread>
+#include <QDebug>
 
 #include "okapi_bm25.h"
 
-#include "sqliteexception.h"
-#include "sqlitestatement.h"
-#include "sqlitereadstatement.h"
-#include "sqlitewritestatement.h"
-#include "sqlitereadwritestatement.h"
+#include "sqlite3.h"
 
 #if defined(Q_OS_UNIX)
 #define QTC_THREAD_LOCAL __thread
diff --git a/src/libs/sqlite/sqlitedatabasebackend.h b/src/libs/sqlite/sqlitedatabasebackend.h
index 5b1b21788cf..4d8a6751100 100644
--- a/src/libs/sqlite/sqlitedatabasebackend.h
+++ b/src/libs/sqlite/sqlitedatabasebackend.h
@@ -31,12 +31,12 @@
 #ifndef SQLITEDATABASEBACKEND_H
 #define SQLITEDATABASEBACKEND_H
 
-#include <QStringList>
-
 #include "sqliteglobal.h"
 
 #include "utf8stringvector.h"
 
+#include <QStringList>
+
 struct sqlite3;
 
 class SQLITE_EXPORT SqliteDatabaseBackend
diff --git a/src/libs/sqlite/sqlitedatabaseconnection.cpp b/src/libs/sqlite/sqlitedatabaseconnection.cpp
index 29e1d19fec7..a73d2c105ed 100644
--- a/src/libs/sqlite/sqlitedatabaseconnection.cpp
+++ b/src/libs/sqlite/sqlitedatabaseconnection.cpp
@@ -30,20 +30,20 @@
 
 #include "sqlitedatabaseconnection.h"
 
+#include "sqliteexception.h"
+#include "sqliteglobal.h"
+
 #include <sqlite3.h>
 
-#include <QtDebug>
+#include <QDebug>
 
 #ifdef Q_OS_LINUX
 #include <sys/resource.h>
+#include <sys/syscall.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sys/syscall.h>
 #endif
 
-#include "sqliteexception.h"
-#include "sqliteglobal.h"
-
 SqliteDatabaseConnection::SqliteDatabaseConnection(QObject *parent) :
     QObject(parent)
 {
diff --git a/src/libs/sqlite/sqlitedatabaseconnection.h b/src/libs/sqlite/sqlitedatabaseconnection.h
index 548bcb32ce6..335fe51f7b1 100644
--- a/src/libs/sqlite/sqlitedatabaseconnection.h
+++ b/src/libs/sqlite/sqlitedatabaseconnection.h
@@ -31,10 +31,10 @@
 #ifndef SQLITEDATABASECONNECTIONCONTROLLER_H
 #define SQLITEDATABASECONNECTIONCONTROLLER_H
 
-#include <QObject>
-
 #include "sqlitedatabasebackend.h"
 
+#include <QObject>
+
 struct sqlite3;
 
 class SQLITE_EXPORT SqliteDatabaseConnection final : public QObject
diff --git a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h
index 21885645e55..0345f7f7d35 100644
--- a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h
+++ b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h
@@ -31,11 +31,11 @@
 #ifndef SQLITEDATABASECONNECTION_H
 #define SQLITEDATABASECONNECTION_H
 
+#include <sqliteglobal.h>
+
 #include <QObject>
 #include <QPointer>
 
-#include <sqliteglobal.h>
-
 struct sqlite3;
 class SqliteWorkerThread;
 
diff --git a/src/libs/sqlite/sqliteexception.cpp b/src/libs/sqlite/sqliteexception.cpp
index fde46941b6e..5b8e95c0c61 100644
--- a/src/libs/sqlite/sqliteexception.cpp
+++ b/src/libs/sqlite/sqliteexception.cpp
@@ -30,7 +30,7 @@
 
 #include "sqliteexception.h"
 
-#include <QtDebug>
+#include <QDebug>
 
 SqliteException::SqliteException(const char *whatErrorHasHappen, const char *sqliteErrorMessage)
     : whatErrorHasHappen(whatErrorHasHappen),
diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h
index beab962c6ed..01da8a0314a 100644
--- a/src/libs/sqlite/sqliteexception.h
+++ b/src/libs/sqlite/sqliteexception.h
@@ -31,10 +31,10 @@
 #ifndef SQLITEEXCEPTION_H
 #define SQLITEEXCEPTION_H
 
-#include <QByteArray>
-
 #include "sqliteglobal.h"
 
+#include <QByteArray>
+
 class SQLITE_EXPORT SqliteException
 {
 public:
diff --git a/src/libs/sqlite/sqlitereadwritestatement.cpp b/src/libs/sqlite/sqlitereadwritestatement.cpp
index 1427a83a0d3..c3008e1bf1b 100644
--- a/src/libs/sqlite/sqlitereadwritestatement.cpp
+++ b/src/libs/sqlite/sqlitereadwritestatement.cpp
@@ -30,7 +30,6 @@
 
 #include "sqlitereadwritestatement.h"
 
-
 SqliteReadWriteStatement::SqliteReadWriteStatement(const Utf8String &sqlStatementUft8)
     : SqliteStatement(sqlStatementUft8)
 {
diff --git a/src/libs/sqlite/sqlitestatement.cpp b/src/libs/sqlite/sqlitestatement.cpp
index 4b8e3338a4b..d093c135828 100644
--- a/src/libs/sqlite/sqlitestatement.cpp
+++ b/src/libs/sqlite/sqlitestatement.cpp
@@ -30,16 +30,16 @@
 
 #include "sqlitestatement.h"
 
-#include <QMutex>
-#include <QWaitCondition>
-#include <QVariant>
-#include <QtGlobal>
-
-#include "sqlite3.h"
-
 #include "sqlitedatabasebackend.h"
 #include "sqliteexception.h"
 
+#include <QMutex>
+#include <QtGlobal>
+#include <QVariant>
+#include <QWaitCondition>
+
+#include "sqlite3.h"
+
 #if defined(__GNUC__)
 #  pragma GCC diagnostic ignored "-Wignored-qualifiers"
 #endif
diff --git a/src/libs/sqlite/sqlitestatement.h b/src/libs/sqlite/sqlitestatement.h
index 7c19af335a3..f2749a9a897 100644
--- a/src/libs/sqlite/sqlitestatement.h
+++ b/src/libs/sqlite/sqlitestatement.h
@@ -31,23 +31,21 @@
 #ifndef SQLITESTATEMENT_H
 #define SQLITESTATEMENT_H
 
-#include <type_traits>
-#include <memory>
+#include "sqliteglobal.h"
+
+#include "sqliteexception.h"
+#include "utf8stringvector.h"
 
 #include <QString>
 #include <QVariant>
 #include <QVector>
 
-#include "sqliteglobal.h"
+#include <type_traits>
+#include <memory>
 
 struct sqlite3_stmt;
 struct sqlite3;
 
-#include "sqliteexception.h"
-#include "utf8stringvector.h"
-
-
-
 class SQLITE_EXPORT SqliteStatement
 {
 protected:
diff --git a/src/libs/sqlite/sqlitetable.h b/src/libs/sqlite/sqlitetable.h
index ed4be02462c..010a0600a8c 100644
--- a/src/libs/sqlite/sqlitetable.h
+++ b/src/libs/sqlite/sqlitetable.h
@@ -31,12 +31,12 @@
 #ifndef SQLITETABLE_H
 #define SQLITETABLE_H
 
-#include <QObject>
-#include <QVector>
-#include "utf8string.h"
-
 #include "sqliteglobal.h"
 #include "tablewriteworkerproxy.h"
+#include "utf8string.h"
+
+#include <QObject>
+#include <QVector>
 
 class SqliteColumn;
 class SqliteDatabase;
diff --git a/src/libs/sqlite/sqlitetransaction.cpp b/src/libs/sqlite/sqlitetransaction.cpp
index 6e2b757569b..77ca4f6f79d 100644
--- a/src/libs/sqlite/sqlitetransaction.cpp
+++ b/src/libs/sqlite/sqlitetransaction.cpp
@@ -32,7 +32,6 @@
 
 #include "sqlitewritestatement.h"
 
-
 SqliteAbstractTransaction::~SqliteAbstractTransaction()
 {
     if (!isAlreadyCommited)
diff --git a/src/libs/sqlite/sqliteworkerthread.h b/src/libs/sqlite/sqliteworkerthread.h
index 5a504a69aae..e6c84655355 100644
--- a/src/libs/sqlite/sqliteworkerthread.h
+++ b/src/libs/sqlite/sqliteworkerthread.h
@@ -31,9 +31,9 @@
 #ifndef SQLITEWORKERTHREAD_H
 #define SQLITEWORKERTHREAD_H
 
-#include <QThread>
-#include <QPointer>
 #include <QMutex>
+#include <QPointer>
+#include <QThread>
 #include <QWaitCondition>
 
 class SqliteDatabaseConnection;
diff --git a/src/libs/sqlite/sqlstatementbuilder.h b/src/libs/sqlite/sqlstatementbuilder.h
index 5fcd3d51f05..f3efc29701b 100644
--- a/src/libs/sqlite/sqlstatementbuilder.h
+++ b/src/libs/sqlite/sqlstatementbuilder.h
@@ -31,11 +31,11 @@
 #ifndef SQLSTATEMENTBUILDER_H
 #define SQLSTATEMENTBUILDER_H
 
-#include <vector>
-#include <utility>
-
 #include "utf8string.h"
 
+#include <utility>
+#include <vector>
+
 class SQLITE_EXPORT SqlStatementBuilder
 {
     using BindingPair = std::pair<Utf8String, Utf8String>;
diff --git a/src/libs/sqlite/tablewriteworker.cpp b/src/libs/sqlite/tablewriteworker.cpp
index 6a84909e0df..875602b8308 100644
--- a/src/libs/sqlite/tablewriteworker.cpp
+++ b/src/libs/sqlite/tablewriteworker.cpp
@@ -31,9 +31,8 @@
 #include "tablewriteworker.h"
 
 #include "createtablesqlstatementbuilder.h"
-
-#include "sqlitewritestatement.h"
 #include "sqlitetransaction.h"
+#include "sqlitewritestatement.h"
 
 namespace Internal {
 
diff --git a/src/libs/sqlite/tablewriteworker.h b/src/libs/sqlite/tablewriteworker.h
index b2a369add5f..1e063c157ad 100644
--- a/src/libs/sqlite/tablewriteworker.h
+++ b/src/libs/sqlite/tablewriteworker.h
@@ -31,10 +31,10 @@
 #ifndef INTERNAL_TABLEWRITEWORKER_H
 #define INTERNAL_TABLEWRITEWORKER_H
 
-#include <QObject>
-
 #include "createtablecommand.h"
 
+#include <QObject>
+
 namespace Internal {
 
 class TableWriteWorker : public QObject
diff --git a/src/libs/sqlite/tablewriteworkerproxy.cpp b/src/libs/sqlite/tablewriteworkerproxy.cpp
index b6df81bae45..3f26028644b 100644
--- a/src/libs/sqlite/tablewriteworkerproxy.cpp
+++ b/src/libs/sqlite/tablewriteworkerproxy.cpp
@@ -30,10 +30,9 @@
 
 #include "tablewriteworkerproxy.h"
 
-#include "tablewriteworker.h"
-#include "sqlitetable.h"
-
 #include "createtablecommand.h"
+#include "sqlitetable.h"
+#include "tablewriteworker.h"
 
 namespace Internal {
 
diff --git a/src/libs/sqlite/tablewriteworkerproxy.h b/src/libs/sqlite/tablewriteworkerproxy.h
index 4a1d4e03335..eaa21697913 100644
--- a/src/libs/sqlite/tablewriteworkerproxy.h
+++ b/src/libs/sqlite/tablewriteworkerproxy.h
@@ -31,12 +31,12 @@
 #ifndef INTERNAL_TABLEWRITEWORKERPROXY_H
 #define INTERNAL_TABLEWRITEWORKERPROXY_H
 
+#include "createtablecommand.h"
+
 #include <QObject>
 
 #include <memory>
 
-#include "createtablecommand.h"
-
 QT_BEGIN_NAMESPACE
 class QThread;
 QT_END_NAMESPACE
diff --git a/src/libs/sqlite/utf8string.h b/src/libs/sqlite/utf8string.h
index c6e8cf41be5..4a7c8512ccb 100644
--- a/src/libs/sqlite/utf8string.h
+++ b/src/libs/sqlite/utf8string.h
@@ -31,11 +31,11 @@
 #ifndef UTF8STRING_H
 #define UTF8STRING_H
 
+#include "sqliteglobal.h"
+
 #include <QByteArray>
 #include <QMetaType>
 
-#include "sqliteglobal.h"
-
 class Utf8StringVector;
 class Utf8String;
 
diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/sqlite/utf8stringvector.h
index f8ee679e8dd..a726be1a2db 100644
--- a/src/libs/sqlite/utf8stringvector.h
+++ b/src/libs/sqlite/utf8stringvector.h
@@ -31,12 +31,11 @@
 #ifndef UTF8STRINGVECTOR_H
 #define UTF8STRINGVECTOR_H
 
+#include "sqliteglobal.h"
 #include "utf8string.h"
 
 #include <QVector>
 
-#include "sqliteglobal.h"
-
 class SQLITE_EXPORT Utf8StringVector : public QVector<Utf8String>
 {
 public:
diff --git a/src/plugins/clangcodemodel/completionchunkstotextconverter.h b/src/plugins/clangcodemodel/completionchunkstotextconverter.h
index 41940f51e18..20d4472b5ba 100644
--- a/src/plugins/clangcodemodel/completionchunkstotextconverter.h
+++ b/src/plugins/clangcodemodel/completionchunkstotextconverter.h
@@ -33,10 +33,10 @@
 
 #include <clangbackendipc/codecompletionchunk.h>
 
-#include <QString>
-
 #include <sqlite/utf8string.h>
 
+#include <QString>
+
 namespace ClangCodeModel {
 namespace Internal {
 
diff --git a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
index 1f3fdca0844..12b38d84bfe 100644
--- a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
+++ b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h
@@ -31,7 +31,6 @@
 #ifndef CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
 #define CLANGBACKEND_CLANGCODECOMPLETERESULTS_H
 
-
 #include <clang-c/Index.h>
 
 #include <utf8string.h>
diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.cpp b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
index 11805928d1d..d192da2193f 100644
--- a/src/tools/clangbackend/ipcsource/clangipcserver.cpp
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
@@ -30,25 +30,24 @@
 
 #include "clangipcserver.h"
 
-#include <QCoreApplication>
-
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
 #include <cmbcodecompletedcommand.h>
 #include <cmbcompletecodecommand.h>
-#include <translationunitdoesnotexistcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <projectpartsdonotexistcommand.h>
+#include <translationunitdoesnotexistcommand.h>
 
-#include "translationunits.h"
 #include "codecompleter.h"
-#include "translationunitdoesnotexistexception.h"
-#include "translationunitisnullexception.h"
-#include "translationunitfilenotexitexception.h"
 #include "projectpartsdonotexistexception.h"
+#include "translationunitdoesnotexistexception.h"
+#include "translationunitfilenotexitexception.h"
+#include "translationunitisnullexception.h"
 #include "translationunitparseerrorexception.h"
+#include "translationunits.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 
 namespace ClangBackEnd {
diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.h b/src/tools/clangbackend/ipcsource/clangipcserver.h
index 4f2418da430..0f763d29d4a 100644
--- a/src/tools/clangbackend/ipcsource/clangipcserver.h
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.h
@@ -33,11 +33,11 @@
 
 #include "ipcserverinterface.h"
 
-#include "translationunit.h"
 #include "projectpart.h"
-#include "unsavedfiles.h"
 #include "projects.h"
+#include "translationunit.h"
 #include "translationunits.h"
+#include "unsavedfiles.h"
 
 #include <utf8string.h>
 
diff --git a/src/tools/clangbackend/ipcsource/codecompleter.cpp b/src/tools/clangbackend/ipcsource/codecompleter.cpp
index 6aebe1a5f12..e8f88b4c1d0 100644
--- a/src/tools/clangbackend/ipcsource/codecompleter.cpp
+++ b/src/tools/clangbackend/ipcsource/codecompleter.cpp
@@ -30,12 +30,11 @@
 
 #include "codecompleter.h"
 
-#include "clangstring.h"
 #include "clangcodecompleteresults.h"
-#include "translationunit.h"
+#include "clangstring.h"
 #include "codecompletefailedexception.h"
-
 #include "codecompletionsextractor.h"
+#include "translationunit.h"
 
 #include <clang-c/Index.h>
 
diff --git a/src/tools/clangbackend/ipcsource/codecompleter.h b/src/tools/clangbackend/ipcsource/codecompleter.h
index cf9f0aba6b5..488abc4987a 100644
--- a/src/tools/clangbackend/ipcsource/codecompleter.h
+++ b/src/tools/clangbackend/ipcsource/codecompleter.h
@@ -31,11 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETER_H
 #define CLANGBACKEND_CODECOMPLETER_H
 
-#include <codecompletion.h>
-#include <utf8stringvector.h>
-
 #include "translationunit.h"
 
+#include <codecompletion.h>
+
+#include <utf8stringvector.h>
+
 namespace ClangBackEnd {
 
 class TranslationUnit;
diff --git a/src/tools/clangbackend/ipcsource/codecompletionsextractor.h b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h
index efeae114859..11d10895203 100644
--- a/src/tools/clangbackend/ipcsource/codecompletionsextractor.h
+++ b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h
@@ -31,12 +31,12 @@
 #ifndef CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
 #define CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H
 
+#include <codecompletion.h>
+
 #include <clang-c/Index.h>
 
 #include <QVector>
 
-#include <codecompletion.h>
-
 namespace ClangBackEnd {
 
 class CodeCompletionsExtractor
diff --git a/src/tools/clangbackend/ipcsource/projectpart.cpp b/src/tools/clangbackend/ipcsource/projectpart.cpp
index 24828cc9653..9e25a7864e1 100644
--- a/src/tools/clangbackend/ipcsource/projectpart.cpp
+++ b/src/tools/clangbackend/ipcsource/projectpart.cpp
@@ -30,11 +30,11 @@
 
 #include "projectpart.h"
 
-#include <cstring>
+#include <projectpartcontainer.h>
 
 #include <utf8stringvector.h>
 
-#include <projectpartcontainer.h>
+#include <cstring>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/projectpart.h b/src/tools/clangbackend/ipcsource/projectpart.h
index 3b5419986b7..f5191cb5ad3 100644
--- a/src/tools/clangbackend/ipcsource/projectpart.h
+++ b/src/tools/clangbackend/ipcsource/projectpart.h
@@ -31,9 +31,9 @@
 #ifndef CLANGBACKEND_PROJECT_H
 #define CLANGBACKEND_PROJECT_H
 
+#include <chrono>
 #include <memory>
 #include <vector>
-#include <chrono>
 
 class Utf8String;
 class Utf8StringVector;
diff --git a/src/tools/clangbackend/ipcsource/projects.cpp b/src/tools/clangbackend/ipcsource/projects.cpp
index cd6d4d0488b..34dcc5e059b 100644
--- a/src/tools/clangbackend/ipcsource/projects.cpp
+++ b/src/tools/clangbackend/ipcsource/projects.cpp
@@ -30,10 +30,10 @@
 
 #include "projects.h"
 
-#include <QtGlobal>
-
 #include "projectpartsdonotexistexception.h"
 
+#include <QtGlobal>
+
 namespace ClangBackEnd {
 
 void ProjectParts::createOrUpdate(const QVector<ProjectPartContainer> &projectContainers)
diff --git a/src/tools/clangbackend/ipcsource/projects.h b/src/tools/clangbackend/ipcsource/projects.h
index 10580365663..be376b5953a 100644
--- a/src/tools/clangbackend/ipcsource/projects.h
+++ b/src/tools/clangbackend/ipcsource/projects.h
@@ -31,10 +31,10 @@
 #ifndef CLANGBACKEND_PROJECTS_H
 #define CLANGBACKEND_PROJECTS_H
 
-#include <projectpartcontainer.h>
-
 #include "projectpart.h"
 
+#include <projectpartcontainer.h>
+
 #include <vector>
 
 namespace ClangBackEnd {
diff --git a/src/tools/clangbackend/ipcsource/translationunit.cpp b/src/tools/clangbackend/ipcsource/translationunit.cpp
index 63e173b3426..02b43e77ce2 100644
--- a/src/tools/clangbackend/ipcsource/translationunit.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunit.cpp
@@ -30,17 +30,16 @@
 
 #include "translationunit.h"
 
-#include <QFileInfo>
+#include "codecompleter.h"
+#include "projectpart.h"
+#include "translationunitfilenotexitexception.h"
+#include "translationunitisnullexception.h"
+#include "translationunitparseerrorexception.h"
+#include "unsavedfiles.h"
 
 #include <utf8string.h>
 
-#include "codecompleter.h"
-
-#include "translationunitisnullexception.h"
-#include "translationunitfilenotexitexception.h"
-#include "translationunitparseerrorexception.h"
-#include "unsavedfiles.h"
-#include "projectpart.h"
+#include <QFileInfo>
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangbackend/ipcsource/translationunit.h b/src/tools/clangbackend/ipcsource/translationunit.h
index 5f7bc475d79..5383023869e 100644
--- a/src/tools/clangbackend/ipcsource/translationunit.h
+++ b/src/tools/clangbackend/ipcsource/translationunit.h
@@ -33,11 +33,11 @@
 
 #include <clang-c/Index.h>
 
+#include <QtGlobal>
+
 #include <chrono>
 #include <memory>
 
-#include <QtGlobal>
-
 class Utf8String;
 
 namespace ClangBackEnd {
diff --git a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
index c4a5b9389fb..df441d7f67a 100644
--- a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
+++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp
@@ -30,8 +30,6 @@
 
 #include "translationunitparseerrorexception.h"
 
-
-
 namespace ClangBackEnd {
 
 TranslationUnitParseErrorException::TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId)
diff --git a/src/tools/clangbackend/ipcsource/translationunits.h b/src/tools/clangbackend/ipcsource/translationunits.h
index 9a1478ad3bd..69ab600a22d 100644
--- a/src/tools/clangbackend/ipcsource/translationunits.h
+++ b/src/tools/clangbackend/ipcsource/translationunits.h
@@ -31,13 +31,14 @@
 #ifndef CLANGBACKEND_TRANSLATIONUNITS_H
 #define CLANGBACKEND_TRANSLATIONUNITS_H
 
+#include "translationunit.h"
+
 #include <filecontainer.h>
+
 #include <QVector>
 
 #include <vector>
 
-#include "translationunit.h"
-
 namespace ClangBackEnd {
 
 class ProjectParts;
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
index 5e9c0f99dfd..609b3490ed7 100644
--- a/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.cpp
@@ -30,7 +30,6 @@
 
 #include "unsavedfiles.h"
 
-
 #include <cstring>
 
 namespace ClangBackEnd {
diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/ipcsource/unsavedfiles.h
index b1cc55440cf..8a0a02a4307 100644
--- a/src/tools/clangbackend/ipcsource/unsavedfiles.h
+++ b/src/tools/clangbackend/ipcsource/unsavedfiles.h
@@ -33,14 +33,14 @@
 
 #include <filecontainer.h>
 
-#include <chrono>
-#include <vector>
-#include <memory>
-
 #include <QVector>
 
 #include <clang-c/Index.h>
 
+#include <chrono>
+#include <vector>
+#include <memory>
+
 namespace ClangBackEnd {
 
 using time_point = std::chrono::steady_clock::time_point;
diff --git a/tests/unit/echoserver/echoipcserver.cpp b/tests/unit/echoserver/echoipcserver.cpp
index 81a818d0a56..1a967c8ed6b 100644
--- a/tests/unit/echoserver/echoipcserver.cpp
+++ b/tests/unit/echoserver/echoipcserver.cpp
@@ -30,20 +30,19 @@
 
 #include "echoipcserver.h"
 
-#include "cmbendcommand.h"
-#include "cmbechocommand.h"
-#include "cmbregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
-#include "cmbregisterprojectsforcodecompletioncommand.h"
-#include "cmbunregisterprojectsforcodecompletioncommand.h"
-#include "cmbcompletecodecommand.h"
 #include "cmbcodecompletedcommand.h"
-
+#include "cmbcompletecodecommand.h"
+#include "cmbechocommand.h"
+#include "cmbendcommand.h"
+#include "cmbregisterprojectsforcodecompletioncommand.h"
+#include "cmbregistertranslationunitsforcodecompletioncommand.h"
+#include "cmbunregisterprojectsforcodecompletioncommand.h"
+#include "cmbunregistertranslationunitsforcodecompletioncommand.h"
 #include "connectionserver.h"
 
-#include <QtDebug>
-
 #include <QCoreApplication>
+#include <QDebug>
+
 
 namespace ClangBackEnd {
 
diff --git a/tests/unit/echoserver/echoserverprocessmain.cpp b/tests/unit/echoserver/echoserverprocessmain.cpp
index 3a8b0b1ed5d..829efffa9ab 100644
--- a/tests/unit/echoserver/echoserverprocessmain.cpp
+++ b/tests/unit/echoserver/echoserverprocessmain.cpp
@@ -28,11 +28,11 @@
 **
 ****************************************************************************/
 
-#include <QCoreApplication>
+#include <cmbcommands.h>
+#include <connectionserver.h>
+#include <echoipcserver.h>
 
-#include "echoipcserver.h"
-#include "connectionserver.h"
-#include "cmbcommands.h"
+#include <QCoreApplication>
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/unit/unittest/clangcodecompleteresultstest.cpp b/tests/unit/unittest/clangcodecompleteresultstest.cpp
index 228ec8ce872..a56fc5ed7f3 100644
--- a/tests/unit/unittest/clangcodecompleteresultstest.cpp
+++ b/tests/unit/unittest/clangcodecompleteresultstest.cpp
@@ -28,18 +28,18 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include <clangcodecompleteresults.h>
+#include <projectpart.h>
+#include <translationunit.h>
+#include <unsavedfiles.h>
+#include <utf8string.h>
 
 #include <clang-c/Index.h>
 
-#include <clangcodecompleteresults.h>
-#include <translationunit.h>
-#include <projectpart.h>
-#include <unsavedfiles.h>
-#include <utf8string.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 
diff --git a/tests/unit/unittest/clangipcservertest.cpp b/tests/unit/unittest/clangipcservertest.cpp
index 4070ad05794..3f52dbd7bf2 100644
--- a/tests/unit/unittest/clangipcservertest.cpp
+++ b/tests/unit/unittest/clangipcservertest.cpp
@@ -28,33 +28,31 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-
-#include "gtest-qt-printing.h"
+#include "mockipclient.h"
 
+#include <clangipcserver.h>
 #include <ipcclientproxy.h>
 #include <ipcserverproxy.h>
-#include <clangipcserver.h>
 #include <translationunitdoesnotexistexception.h>
 #include <translationunitparseerrorexception.h>
 
 #include <cmbcodecompletedcommand.h>
 #include <cmbcompletecodecommand.h>
 #include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
 #include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <translationunitdoesnotexistcommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
 #include <projectpartsdonotexistcommand.h>
+#include <translationunitdoesnotexistcommand.h>
 
 #include <QBuffer>
 #include <QFile>
-#include <projectpartsdonotexistcommand.h>
 
-#include "mockipclient.h"
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using testing::Property;
 using testing::Contains;
diff --git a/tests/unit/unittest/clangstringtest.cpp b/tests/unit/unittest/clangstringtest.cpp
index a7b5f86767d..459dea1f572 100644
--- a/tests/unit/unittest/clangstringtest.cpp
+++ b/tests/unit/unittest/clangstringtest.cpp
@@ -28,16 +28,17 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-#include "gtest-qt-printing.h"
+#include <clangstring.h>
+
+#include <utf8string.h>
 
 #include <clang-c/CXString.h>
 #include <clang-c/Index.h>
 
-#include <clangstring.h>
-#include <utf8string.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 
diff --git a/tests/unit/unittest/clientserverinprocesstest.cpp b/tests/unit/unittest/clientserverinprocesstest.cpp
index 3d29e596f0a..500fd225828 100644
--- a/tests/unit/unittest/clientserverinprocesstest.cpp
+++ b/tests/unit/unittest/clientserverinprocesstest.cpp
@@ -28,38 +28,39 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
-
-#include "gtest-qt-printing.h"
-#include "translationunitdoesnotexistcommand.h"
-
-#include <QString>
-#include <QBuffer>
-#include <QVariant>
-#include <vector>
-
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-
-#include <ipcserverproxy.h>
-#include <ipcclientproxy.h>
-#include <projectpartsdonotexistcommand.h>
 
 #include "mockipclient.h"
 #include "mockipcserver.h"
 
+#include <ipcclientproxy.h>
+#include <ipcserverproxy.h>
+#include <projectpartsdonotexistcommand.h>
+
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbechocommand.h>
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <readcommandblock.h>
+#include <translationunitdoesnotexistcommand.h>
+#include <writecommandblock.h>
+
+#include <QBuffer>
+#include <QString>
+#include <QVariant>
+
+#include <vector>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 using namespace ClangBackEnd;
 
 namespace {
diff --git a/tests/unit/unittest/clientserveroutsideprocess.cpp b/tests/unit/unittest/clientserveroutsideprocess.cpp
index 22be5abce8f..bd2571afb00 100644
--- a/tests/unit/unittest/clientserveroutsideprocess.cpp
+++ b/tests/unit/unittest/clientserveroutsideprocess.cpp
@@ -28,10 +28,28 @@
 **
 ****************************************************************************/
 
+#include "mockipclient.h"
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock.h"
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbechocommand.h>
+#include <cmbendcommand.h>
+#include <cmbregisterprojectsforcodecompletioncommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregisterprojectsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <connectionclient.h>
+#include <projectpartsdonotexistcommand.h>
+#include <readcommandblock.h>
+#include <translationunitdoesnotexistcommand.h>
+#include <writecommandblock.h>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 #include <QBuffer>
 #include <QProcess>
@@ -41,26 +59,6 @@
 
 #include <vector>
 
-#include "gtest-qt-printing.h"
-
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbechocommand.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbregisterprojectsforcodecompletioncommand.h>
-#include <cmbunregisterprojectsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-#include <connectionclient.h>
-#include <translationunitdoesnotexistcommand.h>
-#include <projectpartsdonotexistcommand.h>
-
-#include <mockipclient.h>
-
 #ifdef Q_OS_WIN
 #define QTC_HOST_EXE_SUFFIX L".exe"
 #else
diff --git a/tests/unit/unittest/codecompletionsextractortest.cpp b/tests/unit/unittest/codecompletionsextractortest.cpp
index e9a4f268569..91a5adcec6e 100644
--- a/tests/unit/unittest/codecompletionsextractortest.cpp
+++ b/tests/unit/unittest/codecompletionsextractortest.cpp
@@ -28,24 +28,23 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
+#include <clangcodecompleteresults.h>
+#include <codecompletionsextractor.h>
+#include <filecontainer.h>
+#include <projectpart.h>
+#include <translationunit.h>
+#include <unsavedfiles.h>
+#include <utf8stringvector.h>
 
 #include <clang-c/Index.h>
 
-#include <codecompletionsextractor.h>
-#include <clangcodecompleteresults.h>
-#include <filecontainer.h>
-#include <translationunit.h>
-#include <unsavedfiles.h>
-#include <projectpart.h>
-#include <utf8stringvector.h>
-
 #include <QFile>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 using ClangBackEnd::CodeCompletionsExtractor;
 using ClangBackEnd::ClangCodeCompleteResults;
 using ClangBackEnd::TranslationUnit;
diff --git a/tests/unit/unittest/completionchunkstotextconvertertest.cpp b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
index c5c7f596e90..06ce46df7c9 100644
--- a/tests/unit/unittest/completionchunkstotextconvertertest.cpp
+++ b/tests/unit/unittest/completionchunkstotextconvertertest.cpp
@@ -28,15 +28,14 @@
 **
 ****************************************************************************/
 
-
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
-
 #include <codecompletionchunk.h>
 #include <completionchunkstotextconverter.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 namespace {
 
 using ClangBackEnd::CodeCompletionChunk;
diff --git a/tests/unit/unittest/gtest-qt-printing.cpp b/tests/unit/unittest/gtest-qt-printing.cpp
deleted file mode 100644
index da82cd25953..00000000000
--- a/tests/unit/unittest/gtest-qt-printing.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://www.qt.io/licensing.  For further information
-** use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-//#include "gtest-qt-printing.h"
diff --git a/tests/unit/unittest/gtest-qt-printing.h b/tests/unit/unittest/gtest-qt-printing.h
index 353efad9ea6..7d8bed0aecb 100644
--- a/tests/unit/unittest/gtest-qt-printing.h
+++ b/tests/unit/unittest/gtest-qt-printing.h
@@ -31,10 +31,10 @@
 #include <QString>
 #include <QDebug>
 
-#include <iostream>
-
 #include <gtest/gtest-printers.h>
 
+#include <iostream>
+
 #ifndef GTESTQTPRINTING_H
 #define GTESTQTPRINTING_H
 
diff --git a/tests/unit/unittest/main.cpp b/tests/unit/unittest/main.cpp
index a1b332e7d7e..be9922797a0 100644
--- a/tests/unit/unittest/main.cpp
+++ b/tests/unit/unittest/main.cpp
@@ -28,13 +28,15 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include <cmbcommands.h>
 #include <sqliteglobal.h>
 
+#include <cmbcommands.h>
+
 #include <QCoreApplication>
 
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 int main(int argc, char *argv[])
 {
     ClangBackEnd::Commands::registerCommands();
diff --git a/tests/unit/unittest/mockipclient.h b/tests/unit/unittest/mockipclient.h
index 9a09a06cc2a..97dc2825b64 100644
--- a/tests/unit/unittest/mockipclient.h
+++ b/tests/unit/unittest/mockipclient.h
@@ -33,6 +33,10 @@
 
 #include <ipcclientinterface.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 class MockIpcClient : public ClangBackEnd::IpcClientInterface {
  public:
diff --git a/tests/unit/unittest/mockipcserver.h b/tests/unit/unittest/mockipcserver.h
index 276ee1aa8a9..cc7e54c5792 100644
--- a/tests/unit/unittest/mockipcserver.h
+++ b/tests/unit/unittest/mockipcserver.h
@@ -33,6 +33,11 @@
 
 #include <ipcserverinterface.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 class MockIpcServer : public ClangBackEnd::IpcServerInterface {
  public:
   MOCK_METHOD0(end,
diff --git a/tests/unit/unittest/projecttest.cpp b/tests/unit/unittest/projecttest.cpp
index daab4e8816a..ddc2cb0dd65 100644
--- a/tests/unit/unittest/projecttest.cpp
+++ b/tests/unit/unittest/projecttest.cpp
@@ -28,16 +28,15 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
-
 #include <projectpart.h>
-#include <utf8stringvector.h>
-#include <projects.h>
 #include <projectpartsdonotexistexception.h>
+#include <projects.h>
+#include <utf8stringvector.h>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 #include <chrono>
 #include <thread>
diff --git a/tests/unit/unittest/readandwritecommandblocktest.cpp b/tests/unit/unittest/readandwritecommandblocktest.cpp
index d9de87b529b..9e07b6d397f 100644
--- a/tests/unit/unittest/readandwritecommandblocktest.cpp
+++ b/tests/unit/unittest/readandwritecommandblocktest.cpp
@@ -28,26 +28,25 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include <cmbalivecommand.h>
+#include <cmbcodecompletedcommand.h>
+#include <cmbcommands.h>
+#include <cmbcompletecodecommand.h>
+#include <cmbendcommand.h>
+#include <cmbregistertranslationunitsforcodecompletioncommand.h>
+#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
+#include <readcommandblock.h>
+#include <writecommandblock.h>
 
-#include <QString>
 #include <QBuffer>
+#include <QString>
 #include <QVariant>
 #include <vector>
 
-#include <cmbendcommand.h>
-#include <cmbalivecommand.h>
-#include <cmbcommands.h>
-#include <cmbregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbunregistertranslationunitsforcodecompletioncommand.h>
-#include <cmbcodecompletedcommand.h>
-#include <cmbcompletecodecommand.h>
-#include <writecommandblock.h>
-#include <readcommandblock.h>
-
-#include "gtest-qt-printing.h"
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using namespace testing;
 namespace CodeModelBackeEndTest {
diff --git a/tests/unit/unittest/sqlitecolumntest.cpp b/tests/unit/unittest/sqlitecolumntest.cpp
index a716dc5f3d4..f3cbe752269 100644
--- a/tests/unit/unittest/sqlitecolumntest.cpp
+++ b/tests/unit/unittest/sqlitecolumntest.cpp
@@ -28,13 +28,13 @@
 **
 ****************************************************************************/
 
-
-#include <gtest/gtest.h>
-#include <gmock/gmock-matchers.h>
-#include "gtest-qt-printing.h"
-
 #include <sqlitecolumn.h>
 
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 namespace {
 
 class SqliteColumn : public ::testing::Test
diff --git a/tests/unit/unittest/sqlitedatabasebackendtest.cpp b/tests/unit/unittest/sqlitedatabasebackendtest.cpp
index c023d852689..5b46ec7dd40 100644
--- a/tests/unit/unittest/sqlitedatabasebackendtest.cpp
+++ b/tests/unit/unittest/sqlitedatabasebackendtest.cpp
@@ -28,16 +28,17 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
-
-#include <QDir>
-
 #include "sqlitedatabasebackend.h"
 #include "sqliteexception.h"
 #include "sqlitewritestatement.h"
 
+#include <QDir>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
+
 namespace {
 
 class SqliteDatabaseBackend : public ::testing::Test
diff --git a/tests/unit/unittest/sqlitedatabasetest.cpp b/tests/unit/unittest/sqlitedatabasetest.cpp
index b4c979fe17c..a55a2d01a4c 100644
--- a/tests/unit/unittest/sqlitedatabasetest.cpp
+++ b/tests/unit/unittest/sqlitedatabasetest.cpp
@@ -28,19 +28,19 @@
 **
 ****************************************************************************/
 
-
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
-
-#include <QVariant>
-#include <QSignalSpy>
+#include "spydummy.h"
 
 #include <sqlitedatabase.h>
 #include <sqlitetable.h>
 #include <utf8string.h>
 
-#include "spydummy.h"
+#include <QSignalSpy>
+#include <QVariant>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 
diff --git a/tests/unit/unittest/sqlitestatementtest.cpp b/tests/unit/unittest/sqlitestatementtest.cpp
index 5e218168ee8..ddecb5d9b1f 100644
--- a/tests/unit/unittest/sqlitestatementtest.cpp
+++ b/tests/unit/unittest/sqlitestatementtest.cpp
@@ -28,22 +28,23 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include <sqlitedatabasebackend.h>
+#include <sqlitereadstatement.h>
+#include <sqlitereadwritestatement.h>
+#include <sqlitewritestatement.h>
+#include <utf8string.h>
 
-#include <QDir>
-#include <QVariant>
-#include <QStringList>
 #include <QByteArray>
+#include <QDir>
 #include <QMap>
 #include <QString>
+#include <QStringList>
+#include <QVariant>
 
-#include <sqlitereadwritestatement.h>
-#include <sqlitereadstatement.h>
-#include <sqlitewritestatement.h>
-#include <sqlitedatabasebackend.h>
-#include <utf8string.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 class SqliteStatement : public ::testing::Test
diff --git a/tests/unit/unittest/sqlitetabletest.cpp b/tests/unit/unittest/sqlitetabletest.cpp
index fa5e6711634..4d0b9e2780d 100644
--- a/tests/unit/unittest/sqlitetabletest.cpp
+++ b/tests/unit/unittest/sqlitetabletest.cpp
@@ -28,19 +28,20 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
-
-#include <QVariant>
-#include <QSignalSpy>
+#include "spydummy.h"
 
+#include <sqlitecolumn.h>
 #include <sqlitedatabase.h>
 #include <sqlitetable.h>
-#include <sqlitecolumn.h>
 #include <utf8string.h>
 
-#include "spydummy.h"
+#include <QSignalSpy>
+#include <QVariant>
+
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 namespace {
 
diff --git a/tests/unit/unittest/sqlstatementbuildertest.cpp b/tests/unit/unittest/sqlstatementbuildertest.cpp
index 1f04c64f5f4..7babc6b9a54 100644
--- a/tests/unit/unittest/sqlstatementbuildertest.cpp
+++ b/tests/unit/unittest/sqlstatementbuildertest.cpp
@@ -28,15 +28,16 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gtest-qt-printing.h"
+#include <sqlstatementbuilderexception.h>
+#include <sqlstatementbuilder.h>
+#include <utf8stringvector.h>
 
 #include <QString>
 
-#include <sqlstatementbuilder.h>
-#include <sqlstatementbuilderexception.h>
-#include <utf8stringvector.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using namespace ::testing;
 
diff --git a/tests/unit/unittest/translationunitstest.cpp b/tests/unit/unittest/translationunitstest.cpp
index 3b74c5a1664..105129fce6a 100644
--- a/tests/unit/unittest/translationunitstest.cpp
+++ b/tests/unit/unittest/translationunitstest.cpp
@@ -28,25 +28,26 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
+#include <filecontainer.h>
+#include <projectpartcontainer.h>
+#include <projectpart.h>
+#include <projectpartsdonotexistexception.h>
+#include <projects.h>
+#include <translationunitdoesnotexistexception.h>
+#include <translationunitfilenotexitexception.h>
+#include <translationunit.h>
+#include <translationunitisnullexception.h>
+#include <translationunits.h>
+#include <unsavedfiles.h>
+#include <utf8string.h>
+
 
 #include <clang-c/Index.h>
 
-#include <translationunit.h>
-#include <unsavedfiles.h>
-#include <utf8string.h>
-#include <projectpart.h>
-#include <translationunits.h>
-#include <filecontainer.h>
-#include <projectpartcontainer.h>
-#include <projects.h>
-#include <translationunitdoesnotexistexception.h>
-#include <translationunitisnullexception.h>
-#include <translationunitfilenotexitexception.h>
-#include <projectpartsdonotexistexception.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 using ClangBackEnd::TranslationUnit;
 using ClangBackEnd::UnsavedFiles;
diff --git a/tests/unit/unittest/translationunittest.cpp b/tests/unit/unittest/translationunittest.cpp
index 72cd39cf296..aba1a15876a 100644
--- a/tests/unit/unittest/translationunittest.cpp
+++ b/tests/unit/unittest/translationunittest.cpp
@@ -28,28 +28,29 @@
 **
 ****************************************************************************/
 
-#include "gtest/gtest.h"
-#include "gmock/gmock-matchers.h"
-#include "gmock/gmock-generated-matchers.h"
-#include "gtest-qt-printing.h"
+#include <filecontainer.h>
+#include <projectpart.h>
+#include <projects.h>
+#include <translationunitdoesnotexistexception.h>
+#include <translationunitfilenotexitexception.h>
+#include <translationunit.h>
+#include <translationunitisnullexception.h>
+#include <translationunitparseerrorexception.h>
+#include <translationunits.h>
+#include <unsavedfiles.h>
+#include <utf8string.h>
 
 #include <clang-c/Index.h>
 
-#include <translationunit.h>
-#include <unsavedfiles.h>
-#include <utf8string.h>
-#include <projectpart.h>
-#include <translationunits.h>
-#include <filecontainer.h>
-#include <projects.h>
-#include <translationunitdoesnotexistexception.h>
-#include <translationunitisnullexception.h>
-#include <translationunitfilenotexitexception.h>
-#include <translationunitparseerrorexception.h>
+#include <gmock/gmock.h>
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+#include <gtest-qt-printing.h>
 
 #include <chrono>
 #include <thread>
 
+
 using ClangBackEnd::TranslationUnit;
 using ClangBackEnd::UnsavedFiles;
 using ClangBackEnd::ProjectPart;
diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro
index 330a4f3d5b1..a7cab75de44 100644
--- a/tests/unit/unittest/unittest.pro
+++ b/tests/unit/unittest/unittest.pro
@@ -46,7 +46,6 @@ SOURCES += main.cpp \
     readandwritecommandblocktest.cpp \
     clientserverinprocesstest.cpp \
     clientserveroutsideprocess.cpp \
-    gtest-qt-printing.cpp \
     codecompletiontest.cpp \
     ../../../src/libs/utils/qtcassert.cpp \
     clangstringtest.cpp \