diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp
index 75a48eabfdc..aa8a3fb7736 100644
--- a/src/libs/utils/infobar.cpp
+++ b/src/libs/utils/infobar.cpp
@@ -30,13 +30,13 @@
 #include "qtcsettings.h"
 #include "utilsicons.h"
 
+#include <QComboBox>
 #include <QHBoxLayout>
-#include <QSettings>
-#include <QVBoxLayout>
 #include <QLabel>
 #include <QPainter>
+#include <QSettings>
 #include <QToolButton>
-#include <QComboBox>
+#include <QVBoxLayout>
 
 static const char C_SUPPRESSED_WARNINGS[] = "SuppressedWarnings";
 
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp
index 142ac4fccb3..e7960afe5e5 100644
--- a/src/libs/utils/json.cpp
+++ b/src/libs/utils/json.cpp
@@ -25,8 +25,8 @@
 
 #include "json.h"
 
-#include <utils/qtcassert.h>
-#include <utils/fileutils.h>
+#include "fileutils.h"
+#include "qtcassert.h"
 
 #include <QDir>
 #include <QJsonDocument>
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp
index 9a2c067cb29..70375e8018a 100644
--- a/src/libs/utils/layoutbuilder.cpp
+++ b/src/libs/utils/layoutbuilder.cpp
@@ -25,9 +25,9 @@
 
 #include "layoutbuilder.h"
 
-#include <utils/algorithm.h>
-#include <utils/aspects.h>
-#include <utils/qtcassert.h>
+#include "algorithm.h"
+#include "aspects.h"
+#include "qtcassert.h"
 
 #include <QFormLayout>
 #include <QGridLayout>
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index 54c7a4577ea..0b8de22e6c8 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -25,8 +25,8 @@
 
 #include "namevaluesdialog.h"
 
-#include <utils/environment.h>
-#include <utils/hostosinfo.h>
+#include "environment.h"
+#include "hostosinfo.h"
 
 #include <QDialogButtonBox>
 #include <QLabel>
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index a6aa0e9dd9b..7d3fdc697b6 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -26,6 +26,7 @@
 #include "persistentsettings.h"
 
 #include "fileutils.h"
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QDateTime>
@@ -43,8 +44,6 @@
 #include <QMessageBox>
 #endif
 
-#include <utils/qtcassert.h>
-
 // Read and write rectangle in X11 resource syntax "12x12+4+3"
 static QString rectangleToString(const QRect &r)
 {
diff --git a/src/libs/utils/processinfo.cpp b/src/libs/utils/processinfo.cpp
index 1575c0fe632..8508e85197b 100644
--- a/src/libs/utils/processinfo.cpp
+++ b/src/libs/utils/processinfo.cpp
@@ -34,8 +34,8 @@
 #include <string.h>
 #include <unistd.h>
 #elif defined(Q_OS_WIN)
+#include "winutils.h"
 #include <windows.h>
-#include <utils/winutils.h>
 #include <tlhelp32.h>
 #include <psapi.h>
 #endif
diff --git a/src/libs/utils/qrcparser.cpp b/src/libs/utils/qrcparser.cpp
index 999faf60803..24846ebf63b 100644
--- a/src/libs/utils/qrcparser.cpp
+++ b/src/libs/utils/qrcparser.cpp
@@ -25,7 +25,7 @@
 
 #include "qrcparser.h"
 
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index deb10d3944c..c8a5f59259f 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -26,7 +26,6 @@
 #include "qtcprocess.h"
 
 #include "algorithm.h"
-#include "commandline.h"
 #include "guard.h"
 #include "hostosinfo.h"
 #include "launcherinterface.h"
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index 210791157c6..212ef622892 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -23,9 +23,10 @@
 **
 ****************************************************************************/
 
-#include "fileutils.h"
 #include "reloadpromptutils.h"
 
+#include "fileutils.h"
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QMessageBox>
diff --git a/src/libs/utils/removefiledialog.cpp b/src/libs/utils/removefiledialog.cpp
index 4bc4fa24dad..edc9f57dbf3 100644
--- a/src/libs/utils/removefiledialog.cpp
+++ b/src/libs/utils/removefiledialog.cpp
@@ -26,7 +26,7 @@
 #include "removefiledialog.h"
 #include "ui_removefiledialog.h"
 
-#include <utils/filepath.h>
+#include "filepath.h"
 
 namespace Utils {
 
diff --git a/src/libs/utils/savefile.cpp b/src/libs/utils/savefile.cpp
index ab950657d36..859085ea09f 100644
--- a/src/libs/utils/savefile.cpp
+++ b/src/libs/utils/savefile.cpp
@@ -24,8 +24,12 @@
 ****************************************************************************/
 
 #include "savefile.h"
-#include "qtcassert.h"
+
 #include "filepath.h"
+#include "qtcassert.h"
+
+#include <QTemporaryFile>
+
 #ifdef Q_OS_WIN
 #  include <windows.h>
 #  include <io.h>
@@ -34,8 +38,6 @@
 #  include <sys/stat.h>
 #endif
 
-#include <QTemporaryFile>
-
 namespace Utils {
 
 static QFile::Permissions m_umask;
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp
index 194befdb7f2..00f655a1ef6 100644
--- a/src/libs/utils/shellcommand.cpp
+++ b/src/libs/utils/shellcommand.cpp
@@ -26,7 +26,6 @@
 #include "shellcommand.h"
 
 #include "environment.h"
-#include "fileutils.h"
 #include "qtcassert.h"
 #include "qtcprocess.h"
 #include "runextensions.h"
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index cccd2f358fb..75c37bd49f9 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -25,10 +25,9 @@
 
 #include "stringutils.h"
 
+#include "algorithm.h"
 #include "hostosinfo.h"
-
-#include <utils/algorithm.h>
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QDir>
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 6b98ab2b830..fae47a5653b 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -27,8 +27,7 @@
 
 #include "theme/theme.h"
 #include "hostosinfo.h"
-
-#include <utils/qtcassert.h>
+#include "qtcassert.h"
 
 #include <QApplication>
 #include <QCommonStyle>
diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp
index 4652bfa43cd..a1dfebd08f6 100644
--- a/src/libs/utils/terminalcommand.cpp
+++ b/src/libs/utils/terminalcommand.cpp
@@ -25,11 +25,11 @@
 
 #include "terminalcommand.h"
 
-#include <utils/algorithm.h>
-#include <utils/commandline.h>
-#include <utils/environment.h>
-#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
+#include "algorithm.h"
+#include "commandline.h"
+#include "environment.h"
+#include "hostosinfo.h"
+#include "qtcassert.h"
 
 #include <QCoreApplication>
 #include <QFileInfo>
diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp
index 0b94879a80a..8a37aeec5b0 100644
--- a/src/libs/utils/terminalprocess.cpp
+++ b/src/libs/utils/terminalprocess.cpp
@@ -25,13 +25,13 @@
 
 #include "terminalprocess_p.h"
 
-#include <utils/environment.h>
-#include <utils/hostosinfo.h>
-#include <utils/commandline.h>
-#include <utils/qtcassert.h>
-#include <utils/qtcprocess.h>
-#include <utils/terminalcommand.h>
-#include <utils/winutils.h>
+#include "commandline.h"
+#include "environment.h"
+#include "hostosinfo.h"
+#include "qtcassert.h"
+#include "qtcprocess.h"
+#include "terminalcommand.h"
+#include "winutils.h"
 
 #include <QCoreApplication>
 #include <QLocalServer>
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp
index a8b85dce511..95c74d7cfe5 100644
--- a/src/libs/utils/textfileformat.cpp
+++ b/src/libs/utils/textfileformat.cpp
@@ -24,11 +24,12 @@
 ****************************************************************************/
 
 #include "textfileformat.h"
+
 #include "fileutils.h"
 #include "qtcassert.h"
 
-#include <QTextCodec>
 #include <QDebug>
+#include <QTextCodec>
 
 enum { debug = 0 };
 
diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp
index 60f10f5d71a..f7d22c20298 100644
--- a/src/libs/utils/tooltip/tooltip.cpp
+++ b/src/libs/utils/tooltip/tooltip.cpp
@@ -27,9 +27,9 @@
 #include "tips.h"
 #include "effects.h"
 
-#include <utils/faketooltip.h>
-#include <utils/hostosinfo.h>
-#include <utils/qtcassert.h>
+#include "faketooltip.h"
+#include "hostosinfo.h"
+#include "qtcassert.h"
 
 #include <QApplication>
 #include <QColor>
diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp
index 22e59b488fc..cc216afab58 100644
--- a/src/libs/utils/treemodel.cpp
+++ b/src/libs/utils/treemodel.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "treemodel.h"
+
 #include "qtcassert.h"
 
 #include <QStack>
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index 051344bbc1b..9b7e62be63b 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -26,7 +26,7 @@
 #include "uncommentselection.h"
 
 #include "qtcassert.h"
-#include "utils/multitextcursor.h"
+#include "multitextcursor.h"
 
 #include <QTextBlock>
 #include <QTextCursor>
diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp
index 535bfa2a041..02d02676a68 100644
--- a/src/libs/utils/unixutils.cpp
+++ b/src/libs/utils/unixutils.cpp
@@ -25,12 +25,12 @@
 
 #include "unixutils.h"
 
-#include "fileutils.h"
+#include "filepath.h"
 #include "qtcsettings.h"
 
-#include <QSettings>
-#include <QFileInfo>
 #include <QCoreApplication>
+#include <QFileInfo>
+#include <QSettings>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/url.cpp b/src/libs/utils/url.cpp
index 582a454a260..00f4996cc13 100644
--- a/src/libs/utils/url.cpp
+++ b/src/libs/utils/url.cpp
@@ -24,6 +24,7 @@
 ****************************************************************************/
 
 #include "url.h"
+
 #include "temporaryfile.h"
 
 #include <QHostAddress>
diff --git a/src/libs/utils/variablechooser.cpp b/src/libs/utils/variablechooser.cpp
index cebf894d605..32a7c1026de 100644
--- a/src/libs/utils/variablechooser.cpp
+++ b/src/libs/utils/variablechooser.cpp
@@ -36,7 +36,6 @@
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
-#include <QListWidgetItem>
 #include <QMenu>
 #include <QPlainTextEdit>
 #include <QPointer>
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index f0f291e575d..beffac23a0e 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -28,10 +28,9 @@
 #include "algorithm.h"
 #include "hostosinfo.h"
 #include "qtcassert.h"
+#include "theme/theme.h"
 #include "wizardpage.h"
 
-#include <utils/theme/theme.h>
-
 #include <QDebug>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -41,8 +40,8 @@
 #include <QLabel>
 #include <QMap>
 #include <QScrollArea>
-#include <QVBoxLayout>
 #include <QVariant>
+#include <QVBoxLayout>
 
 
 /*! \class Utils::Wizard