diff --git a/src/libs/utils/launcherinterface.cpp b/src/libs/utils/launcherinterface.cpp
index 4f03c2be6c1..dd110f2b985 100644
--- a/src/libs/utils/launcherinterface.cpp
+++ b/src/libs/utils/launcherinterface.cpp
@@ -28,11 +28,11 @@
 #include "launcherpackets.h"
 #include "launchersocket.h"
 
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qprocess.h>
-#include <QtNetwork/qlocalserver.h>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QLocalServer>
+#include <QProcess>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
diff --git a/src/libs/utils/launcherinterface.h b/src/libs/utils/launcherinterface.h
index ffafe26a5c1..28a92ec1a3c 100644
--- a/src/libs/utils/launcherinterface.h
+++ b/src/libs/utils/launcherinterface.h
@@ -30,13 +30,8 @@
 #include <QObject>
 #include <QThread>
 
-QT_BEGIN_NAMESPACE
-class QLocalServer;
-QT_END_NAMESPACE
-
 namespace Utils {
 namespace Internal {
-class LauncherProcess;
 class LauncherSocket;
 class LauncherInterfacePrivate;
 }
diff --git a/src/libs/utils/launcherpackets.cpp b/src/libs/utils/launcherpackets.cpp
index 92498b97f1b..629ed812a19 100644
--- a/src/libs/utils/launcherpackets.cpp
+++ b/src/libs/utils/launcherpackets.cpp
@@ -25,8 +25,8 @@
 
 #include "launcherpackets.h"
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qcoreapplication.h>
+#include <QByteArray>
+#include <QCoreApplication>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/launcherpackets.h b/src/libs/utils/launcherpackets.h
index 60ef92cb2fb..372290f1ca5 100644
--- a/src/libs/utils/launcherpackets.h
+++ b/src/libs/utils/launcherpackets.h
@@ -27,9 +27,9 @@
 
 #include "processutils.h"
 
-#include <QtCore/qdatastream.h>
-#include <QtCore/qprocess.h>
-#include <QtCore/qstringlist.h>
+#include <QDataStream>
+#include <QProcess>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE
 class QByteArray;
diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp
index 5f602739c24..7e98fdc3daf 100644
--- a/src/libs/utils/launchersocket.cpp
+++ b/src/libs/utils/launchersocket.cpp
@@ -28,9 +28,10 @@
 
 #include "qtcassert.h"
 
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qelapsedtimer.h>
-#include <QtNetwork/qlocalsocket.h>
+#include <QCoreApplication>
+#include <QElapsedTimer>
+#include <QLocalSocket>
+#include <QMutexLocker>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/libs/utils/launchersocket.h b/src/libs/utils/launchersocket.h
index 2e4d7311f23..dd5ca64fda4 100644
--- a/src/libs/utils/launchersocket.h
+++ b/src/libs/utils/launchersocket.h
@@ -28,11 +28,9 @@
 #include "launcherpackets.h"
 #include "processutils.h"
 
-#include <QtCore/qobject.h>
-
 #include <QHash>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QObject>
 #include <QProcess>
 #include <QWaitCondition>
 
@@ -44,8 +42,6 @@ class QLocalSocket;
 QT_END_NAMESPACE
 
 namespace Utils {
-class LauncherInterface;
-
 namespace Internal {
 
 class LauncherInterfacePrivate;
@@ -198,7 +194,6 @@ private:
     bool m_unixTerminalDisabled = false;
 
     friend class LauncherSocket;
-    friend class CallerHandle;
 };
 
 class LauncherSocket : public QObject
diff --git a/src/tools/processlauncher/launchersockethandler.cpp b/src/tools/processlauncher/launchersockethandler.cpp
index f495f42d5d7..73234347346 100644
--- a/src/tools/processlauncher/launchersockethandler.cpp
+++ b/src/tools/processlauncher/launchersockethandler.cpp
@@ -28,10 +28,10 @@
 #include "launcherlogging.h"
 #include "processutils.h"
 
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qprocess.h>
-#include <QtCore/qtimer.h>
-#include <QtNetwork/qlocalsocket.h>
+#include <QCoreApplication>
+#include <QLocalSocket>
+#include <QProcess>
+#include <QTimer>
 
 namespace Utils {
 namespace Internal {
diff --git a/src/tools/processlauncher/launchersockethandler.h b/src/tools/processlauncher/launchersockethandler.h
index cfd65b36e17..56762bec9fd 100644
--- a/src/tools/processlauncher/launchersockethandler.h
+++ b/src/tools/processlauncher/launchersockethandler.h
@@ -27,9 +27,9 @@
 
 #include <launcherpackets.h>
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qobject.h>
+#include <QByteArray>
+#include <QHash>
+#include <QObject>
 
 QT_BEGIN_NAMESPACE
 class QLocalSocket;