Removed module names from #include directives.

Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

152 files changed, 523 insertions, 523 deletions

diff --git a/src/libs/utils/annotateditemdelegate.cpp b/src/libs/utils/annotateditemdelegate.cpp
index 69d022f66a..326bac9607 100644
--- a/src/libs/utils/annotateditemdelegate.cpp
+++ b/src/libs/utils/annotateditemdelegate.cpp
@@ -32,13 +32,13 @@
 
 #include "annotateditemdelegate.h"
 
-#include <QtCore/QSize>
-#include <QtCore/QModelIndex>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOptionViewItemV4>
-#include <QtGui/QApplication>
+#include <QSize>
+#include <QModelIndex>
+#include <QStandardItemModel>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionViewItemV4>
+#include <QApplication>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/annotateditemdelegate.h b/src/libs/utils/annotateditemdelegate.h
index ef5cefbfc3..33f565b8a0 100644
--- a/src/libs/utils/annotateditemdelegate.h
+++ b/src/libs/utils/annotateditemdelegate.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
-#include <QtGui/QStyledItemDelegate>
+#include <QString>
+#include <QStyledItemDelegate>
 
 namespace Utils {
 
diff --git a/src/libs/utils/basevalidatinglineedit.cpp b/src/libs/utils/basevalidatinglineedit.cpp
index 1071c60465..375f4a7a32 100644
--- a/src/libs/utils/basevalidatinglineedit.cpp
+++ b/src/libs/utils/basevalidatinglineedit.cpp
@@ -32,7 +32,7 @@
 
 #include "basevalidatinglineedit.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 enum { debug = 0 };
 
diff --git a/src/libs/utils/basevalidatinglineedit.h b/src/libs/utils/basevalidatinglineedit.h
index b0edee4da7..1d9b591ff9 100644
--- a/src/libs/utils/basevalidatinglineedit.h
+++ b/src/libs/utils/basevalidatinglineedit.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QLineEdit>
+#include <QLineEdit>
 
 namespace Utils {
 
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp
index d4b71afefb..7288eb36c0 100644
--- a/src/libs/utils/buildablehelperlibrary.cpp
+++ b/src/libs/utils/buildablehelperlibrary.cpp
@@ -32,19 +32,19 @@
 
 #include "buildablehelperlibrary.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QHash>
-#include <QtCore/QProcess>
-#include <QtCore/QDir>
-#include <QtCore/QDateTime>
+#include <QFileInfo>
+#include <QCoreApplication>
+#include <QHash>
+#include <QProcess>
+#include <QDir>
+#include <QDateTime>
 
 #include <utils/environment.h>
 #include <utils/synchronousprocess.h>
 #include <utils/fileutils.h>
 
-#include <QtGui/QDesktopServices>
-#include <QtCore/QDebug>
+#include <QDesktopServices>
+#include <QDebug>
 
 namespace Utils {
 
diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h
index bd9cd7dad3..6b4c185252 100644
--- a/src/libs/utils/buildablehelperlibrary.h
+++ b/src/libs/utils/buildablehelperlibrary.h
@@ -37,7 +37,7 @@
 #include <utils/environment.h>
 #include <utils/fileutils.h>
 
-#include <QtCore/QString>
+#include <QString>
 
 QT_FORWARD_DECLARE_CLASS(QFileInfo)
 
diff --git a/src/libs/utils/changeset.cpp b/src/libs/utils/changeset.cpp
index 904635828a..b3d62263dd 100644
--- a/src/libs/utils/changeset.cpp
+++ b/src/libs/utils/changeset.cpp
@@ -32,7 +32,7 @@
 
 #include "changeset.h"
 
-#include <QtGui/QTextCursor>
+#include <QTextCursor>
 
 namespace Utils {
 
diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h
index a00c9b6a2a..ab80832d8b 100644
--- a/src/libs/utils/changeset.h
+++ b/src/libs/utils/changeset.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
-#include <QtCore/QList>
+#include <QString>
+#include <QList>
 
 QT_FORWARD_DECLARE_CLASS(QTextCursor)
 
diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp
index 99e80093ab..4966f9afdd 100644
--- a/src/libs/utils/checkablemessagebox.cpp
+++ b/src/libs/utils/checkablemessagebox.cpp
@@ -32,21 +32,21 @@
 
 #include "checkablemessagebox.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QVariant>
-
-#include <QtGui/QPushButton>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QDialog>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QVBoxLayout>
+#include <QDebug>
+#include <QVariant>
+
+#include <QPushButton>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QSpacerItem>
+#include <QVBoxLayout>
 
 
 /*!
diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h
index 50c6af6438..141e279f7f 100644
--- a/src/libs/utils/checkablemessagebox.h
+++ b/src/libs/utils/checkablemessagebox.h
@@ -35,9 +35,9 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QMessageBox>
-#include <QtGui/QDialog>
+#include <QDialogButtonBox>
+#include <QMessageBox>
+#include <QDialog>
 
 namespace Utils {
 
diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp
index 65b389a4c8..dedc0d08e6 100644
--- a/src/libs/utils/classnamevalidatinglineedit.cpp
+++ b/src/libs/utils/classnamevalidatinglineedit.cpp
@@ -34,8 +34,8 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QRegExp>
+#include <QDebug>
+#include <QRegExp>
 
 /*!
     \class Utils::ClassNameValidatingLineEdit
diff --git a/src/libs/utils/codegeneration.cpp b/src/libs/utils/codegeneration.cpp
index bd957993e2..fd5a4f3864 100644
--- a/src/libs/utils/codegeneration.cpp
+++ b/src/libs/utils/codegeneration.cpp
@@ -32,9 +32,9 @@
 
 #include "codegeneration.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QStringList>
-#include <QtCore/QFileInfo>
+#include <QTextStream>
+#include <QStringList>
+#include <QFileInfo>
 
 namespace Utils {
 
diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h
index a614bb71ee..a2fe6c79f2 100644
--- a/src/libs/utils/codegeneration.h
+++ b/src/libs/utils/codegeneration.h
@@ -34,7 +34,7 @@
 #define CODEGENERATION_H
 
 #include "utils_global.h"
-#include <QtCore/QString>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QTextStream;
diff --git a/src/libs/utils/completingtextedit.cpp b/src/libs/utils/completingtextedit.cpp
index 9d6b9395c5..9881c46925 100644
--- a/src/libs/utils/completingtextedit.cpp
+++ b/src/libs/utils/completingtextedit.cpp
@@ -32,10 +32,10 @@
 
 #include "completingtextedit.h"
 
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QCompleter>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QScrollBar>
+#include <QAbstractItemView>
+#include <QCompleter>
+#include <QKeyEvent>
+#include <QScrollBar>
 
 static bool isEndOfWordChar(const QChar &c)
 {
diff --git a/src/libs/utils/completingtextedit.h b/src/libs/utils/completingtextedit.h
index 68efe6e435..b10be6dd50 100644
--- a/src/libs/utils/completingtextedit.h
+++ b/src/libs/utils/completingtextedit.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QTextEdit>
+#include <QTextEdit>
 
 QT_BEGIN_NAMESPACE
 class QCompleter;
diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h
index 2cf3d9911e..eb9eb216a5 100644
--- a/src/libs/utils/consoleprocess.h
+++ b/src/libs/utils/consoleprocess.h
@@ -37,10 +37,10 @@
 
 #include "environment.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QProcess>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QProcess>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/libs/utils/consoleprocess_p.h b/src/libs/utils/consoleprocess_p.h
index 36c5281acb..8782db7fc3 100644
--- a/src/libs/utils/consoleprocess_p.h
+++ b/src/libs/utils/consoleprocess_p.h
@@ -35,16 +35,16 @@
 
 #include "consoleprocess.h"
 
-#include <QtCore/QTemporaryFile>
+#include <QTemporaryFile>
 
-#include <QtNetwork/QLocalSocket>
-#include <QtNetwork/QLocalServer>
+#include <QLocalSocket>
+#include <QLocalServer>
 
 #ifdef Q_OS_WIN
 #  if QT_VERSION >= 0x050000
-#    include <QtCore/QWinEventNotifier>
+#    include <QWinEventNotifier>
 #  else
-#    include <QtCore/private/qwineventnotifier_p.h>
+#    include <private/qwineventnotifier_p.h>
 #  endif
 #  include <windows.h>
 #endif
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index 1ffbe58338..26b12aaada 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -35,9 +35,9 @@
 #include "environment.h"
 #include "qtcprocess.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
+#include <QCoreApplication>
+#include <QDir>
+#include <QSettings>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp
index 3451ab3929..ff3b3e1850 100644
--- a/src/libs/utils/consoleprocess_win.cpp
+++ b/src/libs/utils/consoleprocess_win.cpp
@@ -35,9 +35,9 @@
 #include "qtcprocess.h"
 #include "winutils.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtCore/QAbstractEventDispatcher>
+#include <QCoreApplication>
+#include <QDir>
+#include <QAbstractEventDispatcher>
 
 #include <stdlib.h>
 
diff --git a/src/libs/utils/crumblepath.cpp b/src/libs/utils/crumblepath.cpp
index f600b76dfe..a69258802a 100644
--- a/src/libs/utils/crumblepath.cpp
+++ b/src/libs/utils/crumblepath.cpp
@@ -33,14 +33,14 @@
 #include "crumblepath.h"
 #include "stylehelper.h"
 
-#include <QtCore/QList>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
-#include <QtGui/QStyle>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QImage>
+#include <QList>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QMenu>
+#include <QStyle>
+#include <QResizeEvent>
+#include <QPainter>
+#include <QImage>
 
 #include <qtcassert.h>
 
diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h
index 96f6040ba0..c5066c41c8 100644
--- a/src/libs/utils/crumblepath.h
+++ b/src/libs/utils/crumblepath.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
-#include <QtCore/QVariant>
+#include <QWidget>
+#include <QVariant>
 
 namespace Utils {
 
diff --git a/src/libs/utils/debuggerlanguagechooser.cpp b/src/libs/utils/debuggerlanguagechooser.cpp
index 7612707559..ddef12387d 100644
--- a/src/libs/utils/debuggerlanguagechooser.cpp
+++ b/src/libs/utils/debuggerlanguagechooser.cpp
@@ -32,10 +32,10 @@
 
 #include "debuggerlanguagechooser.h"
 
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QCheckBox>
-#include <QtGui/QSpinBox>
-#include <QtGui/QLabel>
+#include <QHBoxLayout>
+#include <QCheckBox>
+#include <QSpinBox>
+#include <QLabel>
 
 namespace Utils {
 
diff --git a/src/libs/utils/debuggerlanguagechooser.h b/src/libs/utils/debuggerlanguagechooser.h
index 4cb50883f7..5cfae8399b 100644
--- a/src/libs/utils/debuggerlanguagechooser.h
+++ b/src/libs/utils/debuggerlanguagechooser.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_FORWARD_DECLARE_CLASS(QCheckBox)
 QT_FORWARD_DECLARE_CLASS(QLabel)
diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp
index fd65df3e16..15cabc42fd 100644
--- a/src/libs/utils/detailsbutton.cpp
+++ b/src/libs/utils/detailsbutton.cpp
@@ -34,10 +34,10 @@
 
 #include <utils/stylehelper.h>
 
-#include <QtCore/QPropertyAnimation>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QStyleOption>
+#include <QPropertyAnimation>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QStyleOption>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h
index 6dd561e1dc..428bec5c8d 100644
--- a/src/libs/utils/detailsbutton.h
+++ b/src/libs/utils/detailsbutton.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QAbstractButton>
-#include <QtGui/QPixmap>
+#include <QAbstractButton>
+#include <QPixmap>
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsOpacityEffect)
 
diff --git a/src/libs/utils/detailswidget.cpp b/src/libs/utils/detailswidget.cpp
index c5f73ae39c..6628988f82 100644
--- a/src/libs/utils/detailswidget.cpp
+++ b/src/libs/utils/detailswidget.cpp
@@ -33,15 +33,15 @@
 #include "detailswidget.h"
 #include "detailsbutton.h"
 
-#include <QtCore/QStack>
-#include <QtCore/QPropertyAnimation>
-
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QCheckBox>
-#include <QtGui/QPainter>
-#include <QtGui/QScrollArea>
-#include <QtGui/QApplication>
+#include <QStack>
+#include <QPropertyAnimation>
+
+#include <QGridLayout>
+#include <QLabel>
+#include <QCheckBox>
+#include <QPainter>
+#include <QScrollArea>
+#include <QApplication>
 
 /*!
     \class Utils::DetailsWidget
diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h
index 35eae5d41a..65c9b6da61 100644
--- a/src/libs/utils/detailswidget.h
+++ b/src/libs/utils/detailswidget.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Utils {
 
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp
index 0734c51d06..4390150f73 100644
--- a/src/libs/utils/environment.cpp
+++ b/src/libs/utils/environment.cpp
@@ -32,9 +32,9 @@
 
 #include "environment.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QProcess>
-#include <QtCore/QString>
+#include <QDir>
+#include <QProcess>
+#include <QString>
 
 namespace Utils {
 
diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h
index 123816bf33..29a85962a1 100644
--- a/src/libs/utils/environment.h
+++ b/src/libs/utils/environment.h
@@ -35,10 +35,10 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
 
 namespace Utils {
 
diff --git a/src/libs/utils/environmentmodel.cpp b/src/libs/utils/environmentmodel.cpp
index a5a460baec..63d7af5828 100644
--- a/src/libs/utils/environmentmodel.cpp
+++ b/src/libs/utils/environmentmodel.cpp
@@ -34,7 +34,7 @@
 
 #include <utils/environment.h>
 
-#include <QtGui/QFont>
+#include <QFont>
 
 namespace Utils {
 
diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h
index e82a5aa28e..6ebf70bd53 100644
--- a/src/libs/utils/environmentmodel.h
+++ b/src/libs/utils/environmentmodel.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QAbstractTableModel>
+#include <QAbstractTableModel>
 
 namespace Utils {
 class Environment;
diff --git a/src/libs/utils/faketooltip.cpp b/src/libs/utils/faketooltip.cpp
index 2b84ba7b60..ee879a8632 100644
--- a/src/libs/utils/faketooltip.cpp
+++ b/src/libs/utils/faketooltip.cpp
@@ -32,8 +32,8 @@
 
 #include "faketooltip.h"
 
-#include <QtGui/QStyleOption>
-#include <QtGui/QStylePainter>
+#include <QStyleOption>
+#include <QStylePainter>
 
 /*!
     \class Utils::FakeToolTip
diff --git a/src/libs/utils/faketooltip.h b/src/libs/utils/faketooltip.h
index 78b37b3c7f..2d2f8054b4 100644
--- a/src/libs/utils/faketooltip.h
+++ b/src/libs/utils/faketooltip.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Utils {
 
diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 1d3afb6149..f1b7d807ad 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -32,18 +32,18 @@
 
 #include "fancylineedit.h"
 
-#include <QtCore/QEvent>
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QPropertyAnimation>
-#include <QtGui/QApplication>
-#include <QtGui/QMenu>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QLabel>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
-#include <QtGui/QPaintEvent>
+#include <QEvent>
+#include <QDebug>
+#include <QString>
+#include <QPropertyAnimation>
+#include <QApplication>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QLabel>
+#include <QAbstractButton>
+#include <QPainter>
+#include <QStyle>
+#include <QPaintEvent>
 
 /*!
     \class Utils::FancyLineEdit
diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h
index 4be9d5d406..6e4471a99c 100644
--- a/src/libs/utils/fancylineedit.h
+++ b/src/libs/utils/fancylineedit.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QLineEdit>
-#include <QtGui/QAbstractButton>
+#include <QLineEdit>
+#include <QAbstractButton>
 
 namespace Utils {
 
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 9a9b126ce9..1302567c88 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -34,14 +34,14 @@
 
 #include "qtcassert.h"
 
-#include <QtCore/QList>
-#include <QtCore/QHash>
-
-#include <QtGui/QAction>
-#include <QtGui/QContextMenuEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QDockWidget>
-#include <QtCore/QSettings>
+#include <QList>
+#include <QHash>
+
+#include <QAction>
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QDockWidget>
+#include <QSettings>
 
 static const char lockedKeyC[] = "Locked";
 static const char stateKeyC[] = "State";
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index 2b695db34b..f81f02638e 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index 33c820bb22..06c7f979d5 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -33,8 +33,8 @@
 #include "fileinprojectfinder.h"
 #include <utils/qtcassert.h>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QUrl>
+#include <QFileInfo>
+#include <QUrl>
 
 namespace Utils {
 
diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h
index 0b5cd6a81a..f528837a98 100644
--- a/src/libs/utils/fileinprojectfinder.h
+++ b/src/libs/utils/fileinprojectfinder.h
@@ -35,8 +35,8 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QHash>
-#include <QtCore/QStringList>
+#include <QHash>
+#include <QStringList>
 
 QT_FORWARD_DECLARE_CLASS(QUrl)
 
diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp
index b034c58fcf..bc37cfa4b6 100644
--- a/src/libs/utils/filenamevalidatinglineedit.cpp
+++ b/src/libs/utils/filenamevalidatinglineedit.cpp
@@ -33,8 +33,8 @@
 #include "filenamevalidatinglineedit.h"
 #include "qtcassert.h"
 
-#include <QtCore/QRegExp>
-#include <QtCore/QDebug>
+#include <QRegExp>
+#include <QDebug>
 
 /*!
   \class Utils::FileNameValidatingLineEdit
diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp
index 7387f51c9c..0f2f17dee9 100644
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -33,12 +33,12 @@
 #include "filesearch.h"
 #include <cctype>
 
-#include <QtCore/QBuffer>
-#include <QtCore/QFile>
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QRegExp>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextCodec>
+#include <QBuffer>
+#include <QFile>
+#include <QtConcurrentRun>
+#include <QRegExp>
+#include <QCoreApplication>
+#include <QTextCodec>
 
 #include "runextensions.h"
 
diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h
index df09d0e7bc..3d7de6166a 100644
--- a/src/libs/utils/filesearch.h
+++ b/src/libs/utils/filesearch.h
@@ -35,12 +35,12 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QStringList>
-#include <QtCore/QFuture>
-#include <QtCore/QMap>
-#include <QtCore/QStack>
-#include <QtCore/QDir>
-#include <QtGui/QTextDocument>
+#include <QStringList>
+#include <QFuture>
+#include <QMap>
+#include <QStack>
+#include <QDir>
+#include <QTextDocument>
 
 QT_FORWARD_DECLARE_CLASS(QTextCodec)
 
diff --git a/src/libs/utils/filesystemwatcher.cpp b/src/libs/utils/filesystemwatcher.cpp
index f8ac4fa8fa..35d4889870 100644
--- a/src/libs/utils/filesystemwatcher.cpp
+++ b/src/libs/utils/filesystemwatcher.cpp
@@ -32,11 +32,11 @@
 
 #include "filesystemwatcher.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFileSystemWatcher>
-#include <QtCore/QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QFileSystemWatcher>
+#include <QDateTime>
 
 enum { debug = 0 };
 
diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h
index 62b78f5738..a75defffcb 100644
--- a/src/libs/utils/filesystemwatcher.h
+++ b/src/libs/utils/filesystemwatcher.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QStringList>
+#include <QObject>
+#include <QStringList>
 
 namespace Utils {
 class FileSystemWatcherPrivate;
diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 9a9c827217..3c201d31c7 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -35,13 +35,13 @@
 
 #include "qtcassert.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QDateTime>
-#include <QtCore/QDataStream>
-#include <QtCore/QTextStream>
-#include <QtGui/QMessageBox>
+#include <QDir>
+#include <QFileInfo>
+#include <QTemporaryFile>
+#include <QDateTime>
+#include <QDataStream>
+#include <QTextStream>
+#include <QMessageBox>
 
 namespace Utils {
 
diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index fd46d594d2..e47e1c96fe 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -35,11 +35,11 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QIODevice>
-#include <QtCore/QXmlStreamWriter> // Mac.
-#include <QtCore/QFileInfo>
-#include <QtCore/QMetaType>
+#include <QCoreApplication>
+#include <QIODevice>
+#include <QXmlStreamWriter> // Mac.
+#include <QFileInfo>
+#include <QMetaType>
 
 QT_BEGIN_NAMESPACE
 class QFile;
diff --git a/src/libs/utils/filewizarddialog.cpp b/src/libs/utils/filewizarddialog.cpp
index 6f25a03819..6cfe526acd 100644
--- a/src/libs/utils/filewizarddialog.cpp
+++ b/src/libs/utils/filewizarddialog.cpp
@@ -33,7 +33,7 @@
 #include "filewizarddialog.h"
 #include "filewizardpage.h"
 
-#include <QtGui/QAbstractButton>
+#include <QAbstractButton>
 
 /*!
   \class Utils::FileWizardDialog
diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index b71d29958a..e65ee0a01a 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWizardPage>
+#include <QWizardPage>
 
 namespace Utils {
 
diff --git a/src/libs/utils/flowlayout.cpp b/src/libs/utils/flowlayout.cpp
index 80d2b56608..165d2035ca 100644
--- a/src/libs/utils/flowlayout.cpp
+++ b/src/libs/utils/flowlayout.cpp
@@ -32,9 +32,9 @@
 
 #include "flowlayout.h"
 
-#include <QtCore/QRect>
-#include <QtGui/QWidgetItem>
-#include <QtGui/QWidget>
+#include <QRect>
+#include <QWidgetItem>
+#include <QWidget>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/flowlayout.h b/src/libs/utils/flowlayout.h
index 2eba623ad4..ca757327b2 100644
--- a/src/libs/utils/flowlayout.h
+++ b/src/libs/utils/flowlayout.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QLayout>
-#include <QtGui/QStyle>
+#include <QLayout>
+#include <QStyle>
 
 namespace Utils {
 
diff --git a/src/libs/utils/historycompleter.cpp b/src/libs/utils/historycompleter.cpp
index 08fa3b6b48..267090b4ff 100644
--- a/src/libs/utils/historycompleter.cpp
+++ b/src/libs/utils/historycompleter.cpp
@@ -32,15 +32,15 @@
 
 #include "historycompleter.h"
 
-#include <QtCore/QAbstractListModel>
-#include <QtCore/QSettings>
-
-#include <QtGui/QLineEdit>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QListView>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
+#include <QAbstractListModel>
+#include <QSettings>
+
+#include <QLineEdit>
+#include <QKeyEvent>
+#include <QItemDelegate>
+#include <QListView>
+#include <QPainter>
+#include <QStyle>
 
 static const char SETTINGS_PREFIX[] = "CompleterHistory/";
 
diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h
index 7ee5a1ac17..2b813e1aaa 100644
--- a/src/libs/utils/historycompleter.h
+++ b/src/libs/utils/historycompleter.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QCompleter>
+#include <QCompleter>
 
 QT_FORWARD_DECLARE_CLASS(QSettings)
 
diff --git a/src/libs/utils/htmldocextractor.cpp b/src/libs/utils/htmldocextractor.cpp
index 247033dc41..fcfd0ea188 100644
--- a/src/libs/utils/htmldocextractor.cpp
+++ b/src/libs/utils/htmldocextractor.cpp
@@ -32,10 +32,10 @@
 
 #include "htmldocextractor.h"
 
-#include <QtCore/QLatin1String>
-#include <QtCore/QLatin1Char>
-#include <QtCore/QStringList>
-#include <QtCore/QRegExp>
+#include <QLatin1String>
+#include <QLatin1Char>
+#include <QStringList>
+#include <QRegExp>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h
index 2331bde76b..3718a5dc7b 100644
--- a/src/libs/utils/htmldocextractor.h
+++ b/src/libs/utils/htmldocextractor.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 namespace Utils {
 
diff --git a/src/libs/utils/ipaddresslineedit.cpp b/src/libs/utils/ipaddresslineedit.cpp
index a63368ed65..5177b3dcc5 100644
--- a/src/libs/utils/ipaddresslineedit.cpp
+++ b/src/libs/utils/ipaddresslineedit.cpp
@@ -32,7 +32,7 @@
 
 #include "ipaddresslineedit.h"
 
-#include <QtGui/QRegExpValidator>
+#include <QRegExpValidator>
 
 /*!
   \class Utils::IpAddressLineEdit
diff --git a/src/libs/utils/iwelcomepage.h b/src/libs/utils/iwelcomepage.h
index b63be0b9b6..38a973bb7c 100644
--- a/src/libs/utils/iwelcomepage.h
+++ b/src/libs/utils/iwelcomepage.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QUrl>
+#include <QObject>
+#include <QUrl>
 
 QT_FORWARD_DECLARE_CLASS(QDeclarativeEngine)
 
diff --git a/src/libs/utils/json.cpp b/src/libs/utils/json.cpp
index 5719f8f695..fbbdf1d86a 100644
--- a/src/libs/utils/json.cpp
+++ b/src/libs/utils/json.cpp
@@ -35,11 +35,11 @@
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QFile>
-#include <QtCore/QStringBuilder>
-#include <QtCore/QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QFile>
+#include <QStringBuilder>
+#include <QDebug>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h
index ed8f047c59..1b95f4121c 100644
--- a/src/libs/utils/json.h
+++ b/src/libs/utils/json.h
@@ -35,16 +35,16 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QVector>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QVariant>
-#include <QtCore/QStringList>
-#include <QtCore/QLatin1String>
-#include <QtCore/QDateTime>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QHash>
+#include <QVector>
+#include <QScopedPointer>
+#include <QVariant>
+#include <QStringList>
+#include <QLatin1String>
+#include <QDateTime>
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
 
 namespace Utils {
 
diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h
index de60387567..9fc458f7c7 100644
--- a/src/libs/utils/linecolumnlabel.h
+++ b/src/libs/utils/linecolumnlabel.h
@@ -34,7 +34,7 @@
 #define LINECOLUMNLABEL_H
 
 #include "utils_global.h"
-#include <QtGui/QLabel>
+#include <QLabel>
 
 namespace Utils {
 
diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h
index 346b549255..06afc2c827 100644
--- a/src/libs/utils/listutils.h
+++ b/src/libs/utils/listutils.h
@@ -33,7 +33,7 @@
 #ifndef LISTUTILS_H
 #define LISTUTILS_H
 
-#include <QtCore/QList>
+#include <QList>
 
 namespace Utils {
 
diff --git a/src/libs/utils/multitask.h b/src/libs/utils/multitask.h
index 71c09a6453..3d9b16b0ff 100644
--- a/src/libs/utils/multitask.h
+++ b/src/libs/utils/multitask.h
@@ -36,12 +36,12 @@
 #include "utils_global.h"
 #include "runextensions.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QList>
-#include <QtCore/QEventLoop>
-#include <QtCore/QFutureWatcher>
-#include <QtCore/QtConcurrentRun>
-#include <QtCore/QThreadPool>
+#include <QObject>
+#include <QList>
+#include <QEventLoop>
+#include <QFutureWatcher>
+#include <QtConcurrentRun>
+#include <QThreadPool>
 
 #include <QtDebug>
 
diff --git a/src/libs/utils/navigationtreeview.cpp b/src/libs/utils/navigationtreeview.cpp
index 19b3ae198c..962f240d28 100644
--- a/src/libs/utils/navigationtreeview.cpp
+++ b/src/libs/utils/navigationtreeview.cpp
@@ -32,11 +32,11 @@
 
 #include "navigationtreeview.h"
 
-#include <QtGui/QHeaderView>
-#include <QtGui/QFocusEvent>
+#include <QHeaderView>
+#include <QFocusEvent>
 
 #ifdef Q_OS_MAC
-#include <QtGui/QKeyEvent>
+#include <QKeyEvent>
 #endif
 
 /*!
diff --git a/src/libs/utils/navigationtreeview.h b/src/libs/utils/navigationtreeview.h
index 4ad7b9cd5b..58a6a6095c 100644
--- a/src/libs/utils/navigationtreeview.h
+++ b/src/libs/utils/navigationtreeview.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QTreeView>
+#include <QTreeView>
 
 namespace Utils {
 
diff --git a/src/libs/utils/networkaccessmanager.cpp b/src/libs/utils/networkaccessmanager.cpp
index 2ff0a74e16..55ce1af26d 100644
--- a/src/libs/utils/networkaccessmanager.cpp
+++ b/src/libs/utils/networkaccessmanager.cpp
@@ -32,9 +32,9 @@
 
 #include "networkaccessmanager.h"
 
-#include <QtCore/QLocale>
-#include <QtCore/QUrl>
-#include <QtNetwork/QNetworkReply>
+#include <QLocale>
+#include <QUrl>
+#include <QNetworkReply>
 
 #ifdef Q_OS_UNIX
 #include <sys/utsname.h>
diff --git a/src/libs/utils/networkaccessmanager.h b/src/libs/utils/networkaccessmanager.h
index 0a3af715c2..6dbec736cc 100644
--- a/src/libs/utils/networkaccessmanager.h
+++ b/src/libs/utils/networkaccessmanager.h
@@ -32,7 +32,7 @@
 
 #include "utils_global.h"
 
-#include <QtNetwork/QNetworkAccessManager>
+#include <QNetworkAccessManager>
 
 QT_FORWARD_DECLARE_CLASS(QUrl)
 
diff --git a/src/libs/utils/newclasswidget.cpp b/src/libs/utils/newclasswidget.cpp
index 792d3d29fb..a94e686924 100644
--- a/src/libs/utils/newclasswidget.cpp
+++ b/src/libs/utils/newclasswidget.cpp
@@ -35,12 +35,12 @@
 
 #include <utils/filewizardpage.h>
 
-#include <QtGui/QFileDialog>
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtCore/QRegExp>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QStringList>
+#include <QDir>
+#include <QDebug>
+#include <QRegExp>
 
 enum { debugNewClassWidget = 0 };
 
diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h
index 3628f91b9b..3bd9b2385d 100644
--- a/src/libs/utils/newclasswidget.h
+++ b/src/libs/utils/newclasswidget.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QStringList;
diff --git a/src/libs/utils/outputformatter.cpp b/src/libs/utils/outputformatter.cpp
index 88d4b3c57c..93b74a35f0 100644
--- a/src/libs/utils/outputformatter.cpp
+++ b/src/libs/utils/outputformatter.cpp
@@ -32,10 +32,10 @@
 
 #include "outputformatter.h"
 
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QColor>
+#include <QPlainTextEdit>
+#include <QColor>
 
-#include <QtCore/QString>
+#include <QString>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index 2a32fa5113..93c05f5288 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -36,8 +36,8 @@
 #include "utils_global.h"
 #include "outputformat.h"
 
-#include <QtCore/QObject>
-#include <QtGui/QFont>
+#include <QObject>
+#include <QFont>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h
index 7259a2d25e..45f84cbe65 100644
--- a/src/libs/utils/parameteraction.h
+++ b/src/libs/utils/parameteraction.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QAction>
+#include <QAction>
 
 namespace Utils {
 
diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp
index 9ac747cf50..4a3cf3a723 100644
--- a/src/libs/utils/pathchooser.cpp
+++ b/src/libs/utils/pathchooser.cpp
@@ -38,18 +38,18 @@
 
 #include "synchronousprocess.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtCore/QProcess>
-
-#include <QtGui/qevent.h>
-#include <QtGui/QDesktopServices>
-#include <QtGui/QFileDialog>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+#include <QProcess>
+
+#include <qevent.h>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QPushButton>
 
 /*!
     \class Utils::PathChooser
diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h
index 246e61140f..517fb4644f 100644
--- a/src/libs/utils/pathchooser.h
+++ b/src/libs/utils/pathchooser.h
@@ -37,7 +37,7 @@
 
 #include "fileutils.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
index 54c18b6aa0..f88aefa3a9 100644
--- a/src/libs/utils/pathlisteditor.cpp
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -32,22 +32,22 @@
 
 #include "pathlisteditor.h"
 
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QToolButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QFileDialog>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-
-#include <QtCore/QSignalMapper>
-#include <QtCore/QMimeData>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QPlainTextEdit>
+#include <QToolButton>
+#include <QSpacerItem>
+#include <QFileDialog>
+#include <QTextCursor>
+#include <QTextBlock>
+#include <QMenu>
+#include <QAction>
+
+#include <QSignalMapper>
+#include <QMimeData>
+#include <QSharedPointer>
+#include <QDir>
+#include <QDebug>
 
 /*!
     \class Utils::PathListEditor
diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h
index 99c05e1144..0604d8da1a 100644
--- a/src/libs/utils/pathlisteditor.h
+++ b/src/libs/utils/pathlisteditor.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
-#include <QtCore/QStringList>
+#include <QWidget>
+#include <QStringList>
 
 namespace Utils {
 
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 092c6ba05c..82d470c5be 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -36,14 +36,14 @@
 
 #include <utils/fileutils.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QFile>
-#include <QtCore/QVariant>
-#include <QtCore/QStack>
-#include <QtCore/QXmlStreamAttributes>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/QDateTime>
+#include <QDebug>
+#include <QFile>
+#include <QVariant>
+#include <QStack>
+#include <QXmlStreamAttributes>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QDateTime>
 
 #include <utils/qtcassert.h>
 
diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h
index 6160f9030c..5ac353bb21 100644
--- a/src/libs/utils/persistentsettings.h
+++ b/src/libs/utils/persistentsettings.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QVariant>
+#include <QMap>
+#include <QVariant>
 
 QT_BEGIN_NAMESPACE
 class QWidget;
diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp
index 1182748cc2..bf6e7f89fe 100644
--- a/src/libs/utils/projectintropage.cpp
+++ b/src/libs/utils/projectintropage.cpp
@@ -34,9 +34,9 @@
 #include "filewizardpage.h"
 #include "ui_projectintropage.h"
 
-#include <QtGui/QMessageBox>
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
+#include <QMessageBox>
+#include <QDir>
+#include <QFileInfo>
 
 
 /*!
diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h
index a3bb33a789..88163d5ea5 100644
--- a/src/libs/utils/projectintropage.h
+++ b/src/libs/utils/projectintropage.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWizardPage>
+#include <QWizardPage>
 
 namespace Utils {
 
diff --git a/src/libs/utils/proxyaction.h b/src/libs/utils/proxyaction.h
index 0f381087a4..7149552848 100644
--- a/src/libs/utils/proxyaction.h
+++ b/src/libs/utils/proxyaction.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QPointer>
-#include <QtGui/QAction>
+#include <QPointer>
+#include <QAction>
 
 namespace Utils {
 
diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h
index 5cd30c8a45..11a0df20b3 100644
--- a/src/libs/utils/qtcassert.h
+++ b/src/libs/utils/qtcassert.h
@@ -33,7 +33,7 @@
 #ifndef QTC_ASSERT_H
 #define QTC_ASSERT_H
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #define QTC_ASSERT_STRINGIFY_INTERNAL(x) #x
 #define QTC_ASSERT_STRINGIFY(x) QTC_ASSERT_STRINGIFY_INTERNAL(x)
diff --git a/src/libs/utils/qtcolorbutton.cpp b/src/libs/utils/qtcolorbutton.cpp
index 40a0d3b7bf..0056e4c3bb 100644
--- a/src/libs/utils/qtcolorbutton.cpp
+++ b/src/libs/utils/qtcolorbutton.cpp
@@ -32,12 +32,12 @@
 
 #include "qtcolorbutton.h"
 
-#include <QtCore/QMimeData>
-#include <QtGui/QApplication>
-#include <QtGui/QColorDialog>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QPainter>
-#include <QtGui/QDrag>
+#include <QMimeData>
+#include <QApplication>
+#include <QColorDialog>
+#include <QDragEnterEvent>
+#include <QPainter>
+#include <QDrag>
 
 namespace Utils {
 
diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h
index 6e194efd2b..d0c194b7f7 100644
--- a/src/libs/utils/qtcolorbutton.h
+++ b/src/libs/utils/qtcolorbutton.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QToolButton>
+#include <QToolButton>
 
 namespace Utils {
 
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 662c182797..c8d70380b9 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -33,9 +33,9 @@
 #include "qtcprocess.h"
 #include "stringutils.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-#include <QtCore/QCoreApplication>
+#include <QDir>
+#include <QDebug>
+#include <QCoreApplication>
 
 #ifdef Q_OS_WIN
 #include <qt_windows.h>
@@ -776,7 +776,7 @@ QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(MxSave, Q_MOVABLE_TYPE);
 QT_END_NAMESPACE
 
-#include <QtCore/QStack>
+#include <QStack>
 
 #endif
 
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index f5e11ce3ae..fb901d216f 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -33,7 +33,7 @@
 #ifndef QTCPROCESS_H
 #define QTCPROCESS_H
 
-#include <QtCore/QProcess>
+#include <QProcess>
 
 #include "utils_global.h"
 
diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp
index ae781d7b4b..02fe16f88a 100644
--- a/src/libs/utils/reloadpromptutils.cpp
+++ b/src/libs/utils/reloadpromptutils.cpp
@@ -32,11 +32,11 @@
 
 #include "reloadpromptutils.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QAbstractButton>
+#include <QCoreApplication>
+#include <QDir>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QAbstractButton>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/savedaction.cpp b/src/libs/utils/savedaction.cpp
index ae358a10bb..f2a31e9fbf 100644
--- a/src/libs/utils/savedaction.cpp
+++ b/src/libs/utils/savedaction.cpp
@@ -35,18 +35,18 @@
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QSettings>
-
-#include <QtGui/QAbstractButton>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLineEdit>
-#include <QtGui/QRadioButton>
-#include <QtGui/QSpinBox>
-#include <QtGui/QTextEdit>
+#include <QDebug>
+#include <QSettings>
+
+#include <QAbstractButton>
+#include <QAction>
+#include <QActionGroup>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QSpinBox>
+#include <QTextEdit>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h
index 0a0b398f68..59123ef899 100644
--- a/src/libs/utils/savedaction.h
+++ b/src/libs/utils/savedaction.h
@@ -35,11 +35,11 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
-#include <QtCore/QVariant>
-#include <QtCore/QList>
+#include <QString>
+#include <QVariant>
+#include <QList>
 
-#include <QtGui/QAction>
+#include <QAction>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h
index 8662dd1971..dfddf99b26 100644
--- a/src/libs/utils/savefile.h
+++ b/src/libs/utils/savefile.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QTemporaryFile>
+#include <QTemporaryFile>
 
 namespace Utils {
 
diff --git a/src/libs/utils/settingsselector.cpp b/src/libs/utils/settingsselector.cpp
index 31a54c273c..8c54ebcad5 100644
--- a/src/libs/utils/settingsselector.cpp
+++ b/src/libs/utils/settingsselector.cpp
@@ -32,18 +32,18 @@
 
 #include "settingsselector.h"
 
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QVariant>
-
-#include <QtGui/QAction>
-#include <QtGui/QComboBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QInputDialog>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
+#include <QAbstractItemModel>
+#include <QVariant>
+
+#include <QAction>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QInputDialog>
+#include <QLabel>
+#include <QMenu>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSpacerItem>
 
 namespace Utils {
 
diff --git a/src/libs/utils/settingsselector.h b/src/libs/utils/settingsselector.h
index ab67d080c4..5ae1042e6a 100644
--- a/src/libs/utils/settingsselector.h
+++ b/src/libs/utils/settingsselector.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QAbstractItemModel;
diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h
index e5e55200dd..dcb5b74668 100644
--- a/src/libs/utils/settingsutils.h
+++ b/src/libs/utils/settingsutils.h
@@ -33,10 +33,10 @@
 #ifndef SETTINGSUTILS_H
 #define SETTINGSUTILS_H
 
-#include <QtCore/QSettings>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QSettings>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
 
 namespace Utils {
 
diff --git a/src/libs/utils/ssh/sftpchannel.cpp b/src/libs/utils/ssh/sftpchannel.cpp
index bf532e5b35..d5cf0f6b67 100644
--- a/src/libs/utils/ssh/sftpchannel.cpp
+++ b/src/libs/utils/ssh/sftpchannel.cpp
@@ -37,8 +37,8 @@
 #include "sshincomingpacket_p.h"
 #include "sshsendfacility_p.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
+#include <QDir>
+#include <QFile>
 
 /*!
     \class Utils::SftpChannel
diff --git a/src/libs/utils/ssh/sftpchannel.h b/src/libs/utils/ssh/sftpchannel.h
index bc9911bf23..31e99c3147 100644
--- a/src/libs/utils/ssh/sftpchannel.h
+++ b/src/libs/utils/ssh/sftpchannel.h
@@ -38,10 +38,10 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
 
 namespace Utils {
 
diff --git a/src/libs/utils/ssh/sftpchannel_p.h b/src/libs/utils/ssh/sftpchannel_p.h
index a5fc47de90..c2b2f79b18 100644
--- a/src/libs/utils/ssh/sftpchannel_p.h
+++ b/src/libs/utils/ssh/sftpchannel_p.h
@@ -39,8 +39,8 @@
 #include "sftpoutgoingpacket_p.h"
 #include "sshchannel_p.h"
 
-#include <QtCore/QByteArray>
-#include <QtCore/QMap>
+#include <QByteArray>
+#include <QMap>
 
 namespace Utils {
 class SftpChannel;
diff --git a/src/libs/utils/ssh/sftpoperation.cpp b/src/libs/utils/ssh/sftpoperation.cpp
index c32fc46501..733741a9cb 100644
--- a/src/libs/utils/ssh/sftpoperation.cpp
+++ b/src/libs/utils/ssh/sftpoperation.cpp
@@ -34,7 +34,7 @@
 
 #include "sftpoutgoingpacket_p.h"
 
-#include <QtCore/QFile>
+#include <QFile>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sftpoperation_p.h b/src/libs/utils/ssh/sftpoperation_p.h
index 8ea75f4281..eeaa69ac10 100644
--- a/src/libs/utils/ssh/sftpoperation_p.h
+++ b/src/libs/utils/ssh/sftpoperation_p.h
@@ -35,10 +35,10 @@
 
 #include "sftpdefs.h"
 
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QSharedPointer>
+#include <QByteArray>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QFile;
diff --git a/src/libs/utils/ssh/sftpoutgoingpacket.cpp b/src/libs/utils/ssh/sftpoutgoingpacket.cpp
index ac9e32f981..38412e6643 100644
--- a/src/libs/utils/ssh/sftpoutgoingpacket.cpp
+++ b/src/libs/utils/ssh/sftpoutgoingpacket.cpp
@@ -34,7 +34,7 @@
 
 #include "sshpacket_p.h"
 
-#include <QtCore/QtEndian>
+#include <QtEndian>
 
 #include <limits>
 
diff --git a/src/libs/utils/ssh/sftppacket_p.h b/src/libs/utils/ssh/sftppacket_p.h
index 17d157a467..9666ef1e11 100644
--- a/src/libs/utils/ssh/sftppacket_p.h
+++ b/src/libs/utils/ssh/sftppacket_p.h
@@ -33,9 +33,9 @@
 #ifndef SFTPPACKET_P_H
 #define SFTPPACKET_P_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QList>
+#include <QString>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshcapabilities.cpp b/src/libs/utils/ssh/sshcapabilities.cpp
index 76f80919ff..a5aa08ea77 100644
--- a/src/libs/utils/ssh/sshcapabilities.cpp
+++ b/src/libs/utils/ssh/sshcapabilities.cpp
@@ -34,8 +34,8 @@
 
 #include "sshexception_p.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
+#include <QCoreApplication>
+#include <QString>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshcapabilities_p.h b/src/libs/utils/ssh/sshcapabilities_p.h
index eb1e99fe0d..cf322e6711 100644
--- a/src/libs/utils/ssh/sshcapabilities_p.h
+++ b/src/libs/utils/ssh/sshcapabilities_p.h
@@ -33,8 +33,8 @@
 #ifndef CAPABILITIES_P_H
 #define CAPABILITIES_P_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
+#include <QByteArray>
+#include <QList>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshchannel.cpp b/src/libs/utils/ssh/sshchannel.cpp
index ead09d7f09..80e564c5cb 100644
--- a/src/libs/utils/ssh/sshchannel.cpp
+++ b/src/libs/utils/ssh/sshchannel.cpp
@@ -37,7 +37,7 @@
 
 #include <botan/exceptn.h>
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshchannel_p.h b/src/libs/utils/ssh/sshchannel_p.h
index fb626b1b4e..89e43d032b 100644
--- a/src/libs/utils/ssh/sshchannel_p.h
+++ b/src/libs/utils/ssh/sshchannel_p.h
@@ -33,9 +33,9 @@
 #ifndef SSHCHANNEL_P_H
 #define SSHCHANNEL_P_H
 
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QObject>
+#include <QString>
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
diff --git a/src/libs/utils/ssh/sshchannelmanager.cpp b/src/libs/utils/ssh/sshchannelmanager.cpp
index c7d5493b3a..3ce488e2bc 100644
--- a/src/libs/utils/ssh/sshchannelmanager.cpp
+++ b/src/libs/utils/ssh/sshchannelmanager.cpp
@@ -39,7 +39,7 @@
 #include "sshremoteprocess_p.h"
 #include "sshsendfacility_p.h"
 
-#include <QtCore/QList>
+#include <QList>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshchannelmanager_p.h b/src/libs/utils/ssh/sshchannelmanager_p.h
index 71fdfc914b..ab88206a73 100644
--- a/src/libs/utils/ssh/sshchannelmanager_p.h
+++ b/src/libs/utils/ssh/sshchannelmanager_p.h
@@ -33,9 +33,9 @@
 #ifndef SSHCHANNELLAYER_P_H
 #define SSHCHANNELLAYER_P_H
 
-#include <QtCore/QHash>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
+#include <QHash>
+#include <QObject>
+#include <QSharedPointer>
 
 namespace Utils {
 
diff --git a/src/libs/utils/ssh/sshconnection.cpp b/src/libs/utils/ssh/sshconnection.cpp
index 8dbfead8d2..08b5d8eacc 100644
--- a/src/libs/utils/ssh/sshconnection.cpp
+++ b/src/libs/utils/ssh/sshconnection.cpp
@@ -46,11 +46,11 @@
 #include <botan/exceptn.h>
 #include <botan/init.h>
 
-#include <QtCore/QFile>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QTcpSocket>
+#include <QFile>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QNetworkProxy>
+#include <QTcpSocket>
 
 /*!
     \class Utils::SshConnection
diff --git a/src/libs/utils/ssh/sshconnection.h b/src/libs/utils/ssh/sshconnection.h
index a9aa532c18..983c6c6890 100644
--- a/src/libs/utils/ssh/sshconnection.h
+++ b/src/libs/utils/ssh/sshconnection.h
@@ -37,11 +37,11 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QObject>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QString>
-#include <QtNetwork/QHostAddress>
+#include <QByteArray>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QHostAddress>
 
 namespace Utils {
 class SftpChannel;
diff --git a/src/libs/utils/ssh/sshconnection_p.h b/src/libs/utils/ssh/sshconnection_p.h
index 896a5a3492..4756e05202 100644
--- a/src/libs/utils/ssh/sshconnection_p.h
+++ b/src/libs/utils/ssh/sshconnection_p.h
@@ -39,12 +39,12 @@
 #include "sshremoteprocess.h"
 #include "sshsendfacility_p.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QObject>
-#include <QtCore/QPair>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QTimer>
+#include <QHash>
+#include <QList>
+#include <QObject>
+#include <QPair>
+#include <QScopedPointer>
+#include <QTimer>
 
 QT_BEGIN_NAMESPACE
 class QTcpSocket;
diff --git a/src/libs/utils/ssh/sshconnectionmanager.cpp b/src/libs/utils/ssh/sshconnectionmanager.cpp
index e594f2741f..8c1c8cd03e 100644
--- a/src/libs/utils/ssh/sshconnectionmanager.cpp
+++ b/src/libs/utils/ssh/sshconnectionmanager.cpp
@@ -34,12 +34,12 @@
 
 #include "sshconnection.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QList>
-#include <QtCore/QMutex>
-#include <QtCore/QMutexLocker>
-#include <QtCore/QObject>
-#include <QtCore/QThread>
+#include <QCoreApplication>
+#include <QList>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QObject>
+#include <QThread>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshconnectionmanager.h b/src/libs/utils/ssh/sshconnectionmanager.h
index a7ecfbb171..3b26d6c83b 100644
--- a/src/libs/utils/ssh/sshconnectionmanager.h
+++ b/src/libs/utils/ssh/sshconnectionmanager.h
@@ -35,8 +35,8 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QScopedPointer>
-#include <QtCore/QSharedPointer>
+#include <QScopedPointer>
+#include <QSharedPointer>
 
 namespace Utils {
 class SshConnection;
diff --git a/src/libs/utils/ssh/sshcryptofacility.cpp b/src/libs/utils/ssh/sshcryptofacility.cpp
index cf0f1a579c..d5386d91c6 100644
--- a/src/libs/utils/ssh/sshcryptofacility.cpp
+++ b/src/libs/utils/ssh/sshcryptofacility.cpp
@@ -51,8 +51,8 @@
 #include <botan/pubkey.h>
 #include <botan/rsa.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QList>
+#include <QDebug>
+#include <QList>
 
 #include <string>
 
diff --git a/src/libs/utils/ssh/sshcryptofacility_p.h b/src/libs/utils/ssh/sshcryptofacility_p.h
index c0c5f2a398..b19c18b9f4 100644
--- a/src/libs/utils/ssh/sshcryptofacility_p.h
+++ b/src/libs/utils/ssh/sshcryptofacility_p.h
@@ -36,8 +36,8 @@
 #include <botan/auto_rng.h>
 #include <botan/symkey.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QScopedPointer>
+#include <QByteArray>
+#include <QScopedPointer>
 
 namespace Botan {
     class BigInt;
diff --git a/src/libs/utils/ssh/sshexception_p.h b/src/libs/utils/ssh/sshexception_p.h
index 8efa4e2987..e21c9d9fc9 100644
--- a/src/libs/utils/ssh/sshexception_p.h
+++ b/src/libs/utils/ssh/sshexception_p.h
@@ -35,9 +35,9 @@
 
 #include "ssherrors.h"
 
-#include <QtCore/QByteArray>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QString>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshincomingpacket_p.h b/src/libs/utils/ssh/sshincomingpacket_p.h
index 689f035636..e632881d9b 100644
--- a/src/libs/utils/ssh/sshincomingpacket_p.h
+++ b/src/libs/utils/ssh/sshincomingpacket_p.h
@@ -38,8 +38,8 @@
 #include "sshcryptofacility_p.h"
 #include "sshpacketparser_p.h"
 
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QList>
+#include <QString>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshkeyexchange_p.h b/src/libs/utils/ssh/sshkeyexchange_p.h
index f07cd7344e..83be2fad86 100644
--- a/src/libs/utils/ssh/sshkeyexchange_p.h
+++ b/src/libs/utils/ssh/sshkeyexchange_p.h
@@ -35,8 +35,8 @@
 
 #include <botan/dh.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QScopedPointer>
+#include <QByteArray>
+#include <QScopedPointer>
 
 namespace Botan { class HashFunction; }
 
diff --git a/src/libs/utils/ssh/sshkeygenerator.cpp b/src/libs/utils/ssh/sshkeygenerator.cpp
index 4484882e43..3a1752c343 100644
--- a/src/libs/utils/ssh/sshkeygenerator.cpp
+++ b/src/libs/utils/ssh/sshkeygenerator.cpp
@@ -45,8 +45,8 @@
 #include <botan/rsa.h>
 #include <botan/x509_key.h>
 
-#include <QtCore/QDateTime>
-#include <QtGui/QInputDialog>
+#include <QDateTime>
+#include <QInputDialog>
 
 #include <string>
 
diff --git a/src/libs/utils/ssh/sshkeygenerator.h b/src/libs/utils/ssh/sshkeygenerator.h
index d615bf5125..506039e3bc 100644
--- a/src/libs/utils/ssh/sshkeygenerator.h
+++ b/src/libs/utils/ssh/sshkeygenerator.h
@@ -35,8 +35,8 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QSharedPointer>
+#include <QCoreApplication>
+#include <QSharedPointer>
 
 namespace Botan {
     class Private_Key;
diff --git a/src/libs/utils/ssh/sshkeypasswordretriever.cpp b/src/libs/utils/ssh/sshkeypasswordretriever.cpp
index 4fe24c8129..7c00751ec6 100644
--- a/src/libs/utils/ssh/sshkeypasswordretriever.cpp
+++ b/src/libs/utils/ssh/sshkeypasswordretriever.cpp
@@ -31,9 +31,9 @@
 **************************************************************************/
 #include "sshkeypasswordretriever_p.h"
 
-#include <QtCore/QString>
-#include <QtGui/QApplication>
-#include <QtGui/QInputDialog>
+#include <QString>
+#include <QApplication>
+#include <QInputDialog>
 
 #include <iostream>
 
diff --git a/src/libs/utils/ssh/sshoutgoingpacket.cpp b/src/libs/utils/ssh/sshoutgoingpacket.cpp
index 16594c9f0d..e79f65a60e 100644
--- a/src/libs/utils/ssh/sshoutgoingpacket.cpp
+++ b/src/libs/utils/ssh/sshoutgoingpacket.cpp
@@ -35,7 +35,7 @@
 #include "sshcapabilities_p.h"
 #include "sshcryptofacility_p.h"
 
-#include <QtCore/QtEndian>
+#include <QtEndian>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshpacket.cpp b/src/libs/utils/ssh/sshpacket.cpp
index 8cf741adb3..7af1f25078 100644
--- a/src/libs/utils/ssh/sshpacket.cpp
+++ b/src/libs/utils/ssh/sshpacket.cpp
@@ -37,7 +37,7 @@
 #include "sshexception_p.h"
 #include "sshpacketparser_p.h"
 
-#include <QtCore/QDebug>
+#include <QDebug>
 
 #include <cctype>
 
diff --git a/src/libs/utils/ssh/sshpacket_p.h b/src/libs/utils/ssh/sshpacket_p.h
index 486ec6c39c..594f13c744 100644
--- a/src/libs/utils/ssh/sshpacket_p.h
+++ b/src/libs/utils/ssh/sshpacket_p.h
@@ -35,9 +35,9 @@
 
 #include "sshexception_p.h"
 
-#include <QtCore/QtEndian>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
+#include <QtEndian>
+#include <QByteArray>
+#include <QList>
 
 #include <botan/bigint.h>
 
diff --git a/src/libs/utils/ssh/sshpacketparser_p.h b/src/libs/utils/ssh/sshpacketparser_p.h
index c811ef4b9d..a1e0e7eab9 100644
--- a/src/libs/utils/ssh/sshpacketparser_p.h
+++ b/src/libs/utils/ssh/sshpacketparser_p.h
@@ -35,9 +35,9 @@
 
 #include <botan/bigint.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <QByteArray>
+#include <QList>
+#include <QString>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/ssh/sshpseudoterminal.h b/src/libs/utils/ssh/sshpseudoterminal.h
index 679ef6986f..263bcd574d 100644
--- a/src/libs/utils/ssh/sshpseudoterminal.h
+++ b/src/libs/utils/ssh/sshpseudoterminal.h
@@ -35,8 +35,8 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QByteArray>
-#include <QtCore/QHash>
+#include <QByteArray>
+#include <QHash>
 
 namespace Utils {
 
diff --git a/src/libs/utils/ssh/sshremoteprocess.cpp b/src/libs/utils/ssh/sshremoteprocess.cpp
index 0368026019..813e1f824c 100644
--- a/src/libs/utils/ssh/sshremoteprocess.cpp
+++ b/src/libs/utils/ssh/sshremoteprocess.cpp
@@ -40,7 +40,7 @@
 
 #include <utils/qtcassert.h>
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
 #include <cstring>
 #include <cstdlib>
diff --git a/src/libs/utils/ssh/sshremoteprocess.h b/src/libs/utils/ssh/sshremoteprocess.h
index db73596b0a..ed4e96e5d7 100644
--- a/src/libs/utils/ssh/sshremoteprocess.h
+++ b/src/libs/utils/ssh/sshremoteprocess.h
@@ -35,8 +35,8 @@
 
 #include <utils/utils_global.h>
 
-#include <QtCore/QProcess>
-#include <QtCore/QSharedPointer>
+#include <QProcess>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/src/libs/utils/ssh/sshremoteprocess_p.h b/src/libs/utils/ssh/sshremoteprocess_p.h
index d44d0c70c3..eba60a6ac1 100644
--- a/src/libs/utils/ssh/sshremoteprocess_p.h
+++ b/src/libs/utils/ssh/sshremoteprocess_p.h
@@ -37,9 +37,9 @@
 
 #include "sshchannel_p.h"
 
-#include <QtCore/QList>
-#include <QtCore/QPair>
-#include <QtCore/QProcess>
+#include <QList>
+#include <QPair>
+#include <QProcess>
 
 namespace Utils {
 class SshRemoteProcess;
diff --git a/src/libs/utils/ssh/sshsendfacility.cpp b/src/libs/utils/ssh/sshsendfacility.cpp
index f58cf4e23f..771d145405 100644
--- a/src/libs/utils/ssh/sshsendfacility.cpp
+++ b/src/libs/utils/ssh/sshsendfacility.cpp
@@ -35,7 +35,7 @@
 #include "sshkeyexchange_p.h"
 #include "sshoutgoingpacket_p.h"
 
-#include <QtNetwork/QTcpSocket>
+#include <QTcpSocket>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/statuslabel.cpp b/src/libs/utils/statuslabel.cpp
index 086998477c..c1c198bd40 100644
--- a/src/libs/utils/statuslabel.cpp
+++ b/src/libs/utils/statuslabel.cpp
@@ -32,7 +32,7 @@
 
 #include "statuslabel.h"
 
-#include <QtCore/QTimer>
+#include <QTimer>
 
 /*!
     \class Utils::StatusLabel
diff --git a/src/libs/utils/statuslabel.h b/src/libs/utils/statuslabel.h
index 85b9a43fd2..babd403b9f 100644
--- a/src/libs/utils/statuslabel.h
+++ b/src/libs/utils/statuslabel.h
@@ -37,7 +37,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 
-#include <QtGui/QLabel>
+#include <QLabel>
 
 namespace Utils {
 
diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp
index cc7a347874..b284b7fc26 100644
--- a/src/libs/utils/stringutils.cpp
+++ b/src/libs/utils/stringutils.cpp
@@ -32,10 +32,10 @@
 
 #include "stringutils.h"
 
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QString>
+#include <QStringList>
+#include <QFileInfo>
+#include <QDir>
 
 #include <limits.h>
 
diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp
index 461949e627..267bcb559f 100644
--- a/src/libs/utils/styledbar.cpp
+++ b/src/libs/utils/styledbar.cpp
@@ -34,11 +34,11 @@
 
 #include "stylehelper.h"
 
-#include <QtCore/QVariant>
-#include <QtGui/QPainter>
-#include <QtGui/QPixmapCache>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QVariant>
+#include <QPainter>
+#include <QPixmapCache>
+#include <QStyle>
+#include <QStyleOption>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h
index b56b834e26..a1abcffb7a 100644
--- a/src/libs/utils/styledbar.h
+++ b/src/libs/utils/styledbar.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWidget>
+#include <QWidget>
 
 namespace Utils {
 
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index d22fcb4382..0e2cbb9d2b 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -32,14 +32,14 @@
 
 #include "stylehelper.h"
 
-#include <QtGui/QPixmapCache>
-#include <QtGui/QWidget>
-#include <QtCore/QRect>
-#include <QtGui/QPainter>
-#include <QtGui/QApplication>
-#include <QtGui/QPalette>
-#include <QtGui/QStyleOption>
-#include <QtCore/QObject>
+#include <QPixmapCache>
+#include <QWidget>
+#include <QRect>
+#include <QPainter>
+#include <QApplication>
+#include <QPalette>
+#include <QStyleOption>
+#include <QObject>
 
 // Clamps float color values within (0, 255)
 static int clamp(float x)
diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h
index b7928016f0..1902c1c49d 100644
--- a/src/libs/utils/stylehelper.h
+++ b/src/libs/utils/stylehelper.h
@@ -35,8 +35,8 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QColor>
-#include <QtGui/QStyle>
+#include <QColor>
+#include <QStyle>
 
 QT_BEGIN_NAMESPACE
 class QPalette;
diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp
index fd36dcc943..e2649941ae 100644
--- a/src/libs/utils/submiteditorwidget.cpp
+++ b/src/libs/utils/submiteditorwidget.cpp
@@ -34,17 +34,17 @@
 #include "submitfieldwidget.h"
 #include "ui_submiteditorwidget.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QPointer>
-#include <QtCore/QTimer>
-#include <QtCore/QScopedPointer>
-
-#include <QtGui/QPushButton>
-#include <QtGui/QMenu>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QToolButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QShortcut>
+#include <QDebug>
+#include <QPointer>
+#include <QTimer>
+#include <QScopedPointer>
+
+#include <QPushButton>
+#include <QMenu>
+#include <QHBoxLayout>
+#include <QToolButton>
+#include <QSpacerItem>
+#include <QShortcut>
 
 enum { debug = 0 };
 enum { defaultLineWidth = 72 };
diff --git a/src/libs/utils/submiteditorwidget.h b/src/libs/utils/submiteditorwidget.h
index b724211e8a..999bb71726 100644
--- a/src/libs/utils/submiteditorwidget.h
+++ b/src/libs/utils/submiteditorwidget.h
@@ -36,8 +36,8 @@
 #include "utils_global.h"
 #include "completingtextedit.h"
 
-#include <QtGui/QWidget>
-#include <QtGui/QAbstractItemView>
+#include <QWidget>
+#include <QAbstractItemView>
 
 QT_BEGIN_NAMESPACE
 class QListWidgetItem;
diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/libs/utils/submitfieldwidget.cpp
index f2d9d111f3..4d7b173810 100644
--- a/src/libs/utils/submitfieldwidget.cpp
+++ b/src/libs/utils/submitfieldwidget.cpp
@@ -32,17 +32,17 @@
 
 #include "submitfieldwidget.h"
 
-#include <QtGui/QComboBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QLineEdit>
-#include <QtGui/QToolButton>
-#include <QtGui/QCompleter>
-#include <QtGui/QIcon>
-#include <QtGui/QToolBar>
-
-#include <QtCore/QList>
-#include <QtCore/QDebug>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLineEdit>
+#include <QToolButton>
+#include <QCompleter>
+#include <QIcon>
+#include <QToolBar>
+
+#include <QList>
+#include <QDebug>
 
 enum { debug = 0 };
 enum { spacing = 2 };
diff --git a/src/libs/utils/submitfieldwidget.h b/src/libs/utils/submitfieldwidget.h
index 31f531839e..c74863e550 100644
--- a/src/libs/utils/submitfieldwidget.h
+++ b/src/libs/utils/submitfieldwidget.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include  <QtGui/QWidget>
+#include  <QWidget>
 
 QT_BEGIN_NAMESPACE
 class QCompleter;
diff --git a/src/libs/utils/synchronousprocess.cpp b/src/libs/utils/synchronousprocess.cpp
index 6f9f81ab0a..2a9790d9bd 100644
--- a/src/libs/utils/synchronousprocess.cpp
+++ b/src/libs/utils/synchronousprocess.cpp
@@ -33,15 +33,15 @@
 #include "synchronousprocess.h"
 #include <qtcassert.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QTimer>
-#include <QtCore/QEventLoop>
-#include <QtCore/QTextCodec>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtGui/QMessageBox>
-
-#include <QtGui/QApplication>
+#include <QDebug>
+#include <QTimer>
+#include <QEventLoop>
+#include <QTextCodec>
+#include <QFileInfo>
+#include <QDir>
+#include <QMessageBox>
+
+#include <QApplication>
 
 #include <limits.h>
 
diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h
index 726f488d51..436bcccce1 100644
--- a/src/libs/utils/synchronousprocess.h
+++ b/src/libs/utils/synchronousprocess.h
@@ -35,10 +35,10 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QProcess>
-#include <QtCore/QStringList>
-#include <QtCore/QSharedPointer>
+#include <QObject>
+#include <QProcess>
+#include <QStringList>
+#include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 class QTextCodec;
diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp
index 2be5938702..ec592ead18 100644
--- a/src/libs/utils/textfileformat.cpp
+++ b/src/libs/utils/textfileformat.cpp
@@ -34,10 +34,10 @@
 #include "fileutils.h"
 #include "qtcassert.h"
 
-#include <QtCore/QTextCodec>
-#include <QtCore/QStringList>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
+#include <QTextCodec>
+#include <QStringList>
+#include <QCoreApplication>
+#include <QDebug>
 
 enum { debug = 0 };
 
diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h
index 967f17f4e5..d33fa309c9 100644
--- a/src/libs/utils/textfileformat.h
+++ b/src/libs/utils/textfileformat.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QtGlobal>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE
 class QTextCodec;
diff --git a/src/libs/utils/treewidgetcolumnstretcher.cpp b/src/libs/utils/treewidgetcolumnstretcher.cpp
index 9819543503..87a5118cd4 100644
--- a/src/libs/utils/treewidgetcolumnstretcher.cpp
+++ b/src/libs/utils/treewidgetcolumnstretcher.cpp
@@ -31,9 +31,9 @@
 **************************************************************************/
 
 #include "treewidgetcolumnstretcher.h"
-#include <QtGui/QTreeWidget>
-#include <QtGui/QHideEvent>
-#include <QtGui/QHeaderView>
+#include <QTreeWidget>
+#include <QHideEvent>
+#include <QHeaderView>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/treewidgetcolumnstretcher.h b/src/libs/utils/treewidgetcolumnstretcher.h
index 9cd10cca86..47b1eb364a 100644
--- a/src/libs/utils/treewidgetcolumnstretcher.h
+++ b/src/libs/utils/treewidgetcolumnstretcher.h
@@ -34,7 +34,7 @@
 #define TREEWIDGETCOLUMNSTRETCHER_H
 
 #include "utils_global.h"
-#include <QtCore/QObject>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QTreeWidget;
diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp
index 3a0f425e21..d3992aad6b 100644
--- a/src/libs/utils/uncommentselection.cpp
+++ b/src/libs/utils/uncommentselection.cpp
@@ -31,11 +31,11 @@
 **************************************************************************/
 
 #include "uncommentselection.h"
-#include <QtCore/QtGlobal>
-#include <QtGui/QPlainTextEdit>
-#include <QtGui/QTextCursor>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextDocument>
+#include <QtGlobal>
+#include <QPlainTextEdit>
+#include <QTextCursor>
+#include <QTextBlock>
+#include <QTextDocument>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h
index d7fba7be5c..e1a4136e93 100644
--- a/src/libs/utils/uncommentselection.h
+++ b/src/libs/utils/uncommentselection.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp
index a9e62e434e..67649c63fa 100644
--- a/src/libs/utils/unixutils.cpp
+++ b/src/libs/utils/unixutils.cpp
@@ -32,10 +32,10 @@
 
 
 #include "unixutils.h"
-#include <QtCore/QSettings>
-#include <QtCore/QObject>
-#include <QtCore/QFileInfo>
-#include <QtCore/QCoreApplication>
+#include <QSettings>
+#include <QObject>
+#include <QFileInfo>
+#include <QCoreApplication>
 
 using namespace Utils;
 
diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h
index ac5ad185f9..efd92478f4 100644
--- a/src/libs/utils/unixutils.h
+++ b/src/libs/utils/unixutils.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QString>
+#include <QString>
 
 QT_BEGIN_NAMESPACE
 class QSettings;
diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h
index cc20359f0a..7cfbbd1a92 100644
--- a/src/libs/utils/utils_global.h
+++ b/src/libs/utils/utils_global.h
@@ -33,7 +33,7 @@
 #ifndef UTILS_GLOBAL_H
 #define UTILS_GLOBAL_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 #if defined(QTCREATOR_UTILS_LIB)
 #  define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp
index 0473de9f88..94e7491e20 100644
--- a/src/libs/utils/winutils.cpp
+++ b/src/libs/utils/winutils.cpp
@@ -37,12 +37,12 @@
 #define _WIN32_WINNT 0x0501
 #include <windows.h>
 
-#include <QtCore/QString>
-#include <QtCore/QVector>
-#include <QtCore/QDebug>
-#include <QtCore/QLibrary>
-#include <QtCore/QTextStream>
-#include <QtCore/QDir>
+#include <QString>
+#include <QVector>
+#include <QDebug>
+#include <QLibrary>
+#include <QTextStream>
+#include <QDir>
 
 namespace Utils {
 
diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h
index 0c60c32966..a94e090025 100644
--- a/src/libs/utils/winutils.h
+++ b/src/libs/utils/winutils.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtCore/QProcess> // Q_PID (is PROCESS_INFORMATION*)
+#include <QProcess> // Q_PID (is PROCESS_INFORMATION*)
 
 QT_BEGIN_NAMESPACE
 class QString;
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index f77a48bdf1..75b5fb6c1e 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -32,14 +32,14 @@
 
 #include "wizard.h"
 
-#include <QtCore/QMap>
-#include <QtCore/QHash>
-#include <QtCore/QVariant>
-
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QStyle>
+#include <QMap>
+#include <QHash>
+#include <QVariant>
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QStyle>
 
 /*! \class Utils::Wizard
 
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h
index 26d259686c..1ea793a239 100644
--- a/src/libs/utils/wizard.h
+++ b/src/libs/utils/wizard.h
@@ -35,7 +35,7 @@
 
 #include "utils_global.h"
 
-#include <QtGui/QWizard>
+#include <QWizard>
 
 namespace Utils {