diff --git a/src/plugins/remotelinux/abstractpackagingstep.cpp b/src/plugins/remotelinux/abstractpackagingstep.cpp
index 3b705859b12..688663ead85 100644
--- a/src/plugins/remotelinux/abstractpackagingstep.cpp
+++ b/src/plugins/remotelinux/abstractpackagingstep.cpp
@@ -28,15 +28,11 @@
 ****************************************************************************/
 #include "abstractpackagingstep.h"
 
-#include "remotelinuxdeployconfiguration.h"
-
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/task.h>
-#include <utils/fileutils.h>
 
 #include <QDateTime>
 #include <QFileInfo>
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
index 5f8755d1542..9fb44a79e30 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
@@ -34,7 +34,6 @@
 #include <projectexplorer/devicesupport/idevice.h>
 
 #include <QObject>
-#include <QSharedPointer>
 #include <QVariantMap>
 
 namespace QSsh { class SshConnection; }
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 17f9964d2d0..a52db4941e2 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -32,10 +32,8 @@
 #include "abstractremotelinuxdeployservice.h"
 #include "remotelinuxdeployconfiguration.h"
 
-#include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/target.h>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
index ba10fbae02c..d83d1d7f424 100644
--- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
+++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
@@ -34,7 +34,6 @@
 
 #include <projectexplorer/deployablefile.h>
 #include <utils/qtcassert.h>
-#include <ssh/sshconnection.h>
 
 #include <QFileInfo>
 #include <QString>
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index dae40b9dd96..70e991cffde 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -29,15 +29,12 @@
 #include "genericdirectuploadstep.h"
 
 #include "genericdirectuploadservice.h"
-#include "remotelinuxdeployconfiguration.h"
 
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/target.h>
 
 #include <QCheckBox>
 #include <QVBoxLayout>
-#include <QList>
-#include <QSharedPointer>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index cfe734ec07e..9c94f21a708 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -35,8 +35,6 @@
 #include <ssh/sshconnection.h>
 #include <ssh/sshkeycreationdialog.h>
 
-#include <QTextStream>
-
 using namespace ProjectExplorer;
 using namespace RemoteLinux;
 using namespace QSsh;
diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
index 6146a13da3f..4f76f2500c5 100644
--- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
+++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.cpp
@@ -31,15 +31,10 @@
 #include "genericdirectuploadstep.h"
 #include "remotelinuxcheckforfreediskspacestep.h"
 #include "remotelinuxdeployconfiguration.h"
-#include "remotelinuxdeployconfigurationfactory.h"
 #include "remotelinuxcustomcommanddeploymentstep.h"
 #include "tarpackagecreationstep.h"
 #include "uploadandinstalltarpackagestep.h"
 
-#include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/target.h>
-
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 9a537b22f29..572f87497b0 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -36,8 +36,6 @@
 
 #include <coreplugin/id.h>
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
-#include <ssh/sshconnection.h>
-#include <utils/portlist.h>
 #include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index 2443e6e31dc..8bc3747a800 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -33,7 +33,6 @@
 #include <coreplugin/icore.h>
 #include <ssh/sshconnection.h>
 
-#include <QTimer>
 #include <QFileDialog>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 545c0ed330b..750dedccdda 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -34,10 +34,8 @@
 #include <debugger/debuggerengine.h>
 #include <debugger/debuggerstartparameters.h>
 #include <debugger/debuggerkitinformation.h>
-#include <projectexplorer/abi.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
-#include <projectexplorer/kit.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
@@ -46,7 +44,6 @@
 #include <utils/qtcassert.h>
 
 #include <QPointer>
-#include <QSharedPointer>
 
 using namespace QSsh;
 using namespace Debugger;
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 15de35bf536..6e0146d5d64 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -30,9 +30,6 @@
 
 #include "remotelinuxdeployconfigurationwidget.h"
 
-#include <projectexplorer/project.h>
-#include <projectexplorer/target.h>
-
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
index fad2b76f9b9..dffea2ce6e6 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
@@ -32,10 +32,8 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/buildstep.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/deployconfiguration.h>
-#include <projectexplorer/devicesupport/idevice.h>
 
 namespace RemoteLinux {
 namespace Internal { class RemoteLinuxDeployConfigurationFactory; }
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
index 37979089735..9e07ce27fe7 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
@@ -36,7 +36,6 @@
 #include <projectexplorer/abi.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
index 53ade0d9251..cfc46612221 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.cpp
@@ -32,9 +32,7 @@
 #include "remotelinuxdeployconfiguration.h"
 #include "remotelinuxdeploymentdatamodel.h"
 
-#include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
index 13758181db0..eade1b8fcb8 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
+++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationwidget.h
@@ -31,7 +31,6 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/namedwidget.h>
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxdeploymentdatamodel.cpp b/src/plugins/remotelinux/remotelinuxdeploymentdatamodel.cpp
index a2022fb9c81..0542fb06d45 100644
--- a/src/plugins/remotelinux/remotelinuxdeploymentdatamodel.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeploymentdatamodel.cpp
@@ -29,8 +29,6 @@
 
 #include "remotelinuxdeploymentdatamodel.h"
 
-#include <QDir>
-
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 0aae9177c5e..92101bed6f9 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 #include "remotelinuxenvironmentreader.h"
 
-#include "linuxdevice.h"
-
 #include <ssh/sshremoteprocessrunner.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
index 6c487b8add2..7ee4c506eee 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
@@ -30,9 +30,10 @@
 #ifndef REMOTELINUXENVIRONMENTREADER_H
 #define REMOTELINUXENVIRONMENTREADER_H
 
-#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/environment.h>
 
+#include <QObject>
+
 namespace ProjectExplorer {
 class RunConfiguration;
 class Kit;
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
index 022872df1bb..a6b3e40d8b6 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
@@ -34,8 +34,6 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 
-#include <QSharedPointer>
-
 namespace RemoteLinux {
 
 namespace Internal {
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 310aaa7284c..682eebb7b81 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -36,15 +36,7 @@
 #include "remotelinuxrunconfigurationfactory.h"
 #include "remotelinuxruncontrolfactory.h"
 
-#include <coreplugin/icore.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-
-#include <projectexplorer/projectexplorerconstants.h>
-
 #include <QtPlugin>
-#include <QAction>
 
 namespace RemoteLinux {
 namespace Internal {
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 031c8dfe6ce..83f7230a523 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -29,20 +29,14 @@
 
 #include "remotelinuxrunconfiguration.h"
 
-#include "remotelinuxdeployconfiguration.h"
 #include "remotelinuxrunconfigurationwidget.h"
 
 #include <projectexplorer/buildtargetinfo.h>
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
-#include <projectexplorer/toolchain.h>
 #include <qtsupport/qtoutputformatter.h>
 
-#include <utils/portlist.h>
-#include <utils/qtcassert.h>
-
 using namespace ProjectExplorer;
 using namespace QSsh;
 using namespace Utils;
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
index d18c0065ae7..eec12119f8d 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp
@@ -39,7 +39,6 @@
 
 #include <QFileInfo>
 #include <QString>
-#include <QStringList>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
index 3aa1a12ca93..aa2819ff7d8 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.cpp
@@ -31,10 +31,7 @@
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxenvironmentreader.h"
 
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
 #include <projectexplorer/environmentwidget.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <utils/detailswidget.h>
 
 #include <QCoreApplication>
@@ -42,7 +39,6 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
-#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
index 8d3aa716272..93b3f69ec5f 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@ -33,9 +33,7 @@
 
 #include <projectexplorer/devicesupport/deviceapplicationrunner.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 #include <QString>
 #include <QIcon>
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 742196ae2fd..8cd5be8e448 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -33,12 +33,10 @@
 #include "remotelinuxrunconfiguration.h"
 #include "remotelinuxruncontrol.h"
 
-#include <debugger/debuggerconstants.h>
 #include <debugger/debuggerplugin.h>
 #include <debugger/debuggerrunner.h>
 #include <debugger/debuggerstartparameters.h>
 #include <projectexplorer/kitinformation.h>
-#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/remotelinux/sshkeydeployer.cpp b/src/plugins/remotelinux/sshkeydeployer.cpp
index b157aed173b..565da167a92 100644
--- a/src/plugins/remotelinux/sshkeydeployer.cpp
+++ b/src/plugins/remotelinux/sshkeydeployer.cpp
@@ -31,9 +31,6 @@
 #include <ssh/sshremoteprocessrunner.h>
 #include <utils/fileutils.h>
 
-#include <QFile>
-#include <QSharedPointer>
-
 using namespace QSsh;
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp
index 431db74d75d..ebcab8d8f3d 100644
--- a/src/plugins/remotelinux/tarpackagecreationstep.cpp
+++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp
@@ -28,8 +28,6 @@
 ****************************************************************************/
 #include "tarpackagecreationstep.h"
 
-#include "remotelinuxdeployconfiguration.h"
-
 #include <projectexplorer/deploymentdata.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index 1b7448fdecb..81ca05f2c3d 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -32,8 +32,6 @@
 #include "remotelinuxpackageinstaller.h"
 #include "tarpackagecreationstep.h"
 
-#include <projectexplorer/buildsteplist.h>
-
 using namespace ProjectExplorer;
 
 namespace RemoteLinux {