diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
index d249977338a..689ee1b398c 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
@@ -26,7 +26,6 @@
 #include "sshdeviceprocess.h"
 
 #include "idevice.h"
-#include "../runcontrol.h"
 
 #include <coreplugin/icore.h>
 #include <ssh/sshconnection.h>
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
index 7ee346d78a4..ebf6b53397d 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "../projectexplorer_export.h"
 
 #include <utils/qtcprocess.h>
 
@@ -33,6 +33,8 @@
 
 namespace ProjectExplorer {
 
+class IDevice;
+
 class PROJECTEXPLORER_EXPORT SshDeviceProcess : public Utils::QtcProcess
 {
     Q_OBJECT
diff --git a/src/plugins/qnx/qnxdeviceprocess.h b/src/plugins/qnx/qnxdeviceprocess.h
index 52de0d275ba..bcbf386bff4 100644
--- a/src/plugins/qnx/qnxdeviceprocess.h
+++ b/src/plugins/qnx/qnxdeviceprocess.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "qnx_export.h"
-#include <remotelinux/linuxdevice.h>
+
 #include <projectexplorer/devicesupport/sshdeviceprocess.h>
 
 namespace Qnx {
diff --git a/src/plugins/remotelinux/linuxdeviceprocess.h b/src/plugins/remotelinux/linuxdeviceprocess.h
index 5598b4b8bbb..2faefd2bdb1 100644
--- a/src/plugins/remotelinux/linuxdeviceprocess.h
+++ b/src/plugins/remotelinux/linuxdeviceprocess.h
@@ -29,8 +29,6 @@
 
 #include <projectexplorer/devicesupport/sshdeviceprocess.h>
 
-#include <QStringList>
-
 namespace RemoteLinux {
 
 class REMOTELINUX_EXPORT LinuxDeviceProcess : public ProjectExplorer::SshDeviceProcess