diff --git a/src/plugins/autotest/loadprojectscenario.cpp b/src/plugins/autotest/loadprojectscenario.cpp
index 2fa5c74636b..1150e47dc44 100644
--- a/src/plugins/autotest/loadprojectscenario.cpp
+++ b/src/plugins/autotest/loadprojectscenario.cpp
@@ -32,6 +32,8 @@
 
 #include <utils/algorithm.h>
 
+#include <QDebug>
+
 using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
index b94ced03abd..472c3734b3e 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
@@ -41,7 +41,7 @@ class BareMetalDeviceConfigurationWidget final
     Q_OBJECT
 
 public:
-    explicit BareMetalDeviceConfigurationWidget(const ProjectExplorer::IDevice::Ptr &deviceConfig);
+    explicit BareMetalDeviceConfigurationWidget(const ProjectExplorer::IDevicePtr &deviceConfig);
 
 private:
     void debugServerProviderChanged();
diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
index 79ada6a0a8b..083c4c2ab0c 100644
--- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
+++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 #include <utils/wizard.h>
 
 namespace BareMetal {
@@ -42,7 +42,7 @@ class BareMetalDeviceConfigurationWizard final : public Utils::Wizard
 public:
     explicit BareMetalDeviceConfigurationWizard(QWidget *parent = nullptr);
 
-    ProjectExplorer::IDevice::Ptr device() const;
+    ProjectExplorer::IDevicePtr device() const;
 
 private:
     BareMetalDeviceConfigurationWizardSetupPage *m_setupPage = nullptr;
diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
index 2e3c71197d8..95e5f57ab05 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
+++ b/src/plugins/boot2qt/qdbmakedefaultappservice.cpp
@@ -28,9 +28,10 @@
 #include "qdbconstants.h"
 #include "qdbrunconfiguration.h"
 
-#include <ssh/sshremoteprocessrunner.h>
-#include <projectexplorer/target.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/runconfigurationaspects.h>
+#include <projectexplorer/target.h>
+#include <ssh/sshremoteprocessrunner.h>
 
 namespace Qdb {
 namespace Internal {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 7040bd3ee8a..f48628b81ac 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -50,6 +50,7 @@
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/buildsteplist.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/namedwidget.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index c5762013ae6..856b4eed365 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
@@ -26,6 +26,7 @@
 #include "startremotedialog.h"
 
 #include <coreplugin/icore.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/runcontrol.h>
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index a8c251789be..d82a89ec2b6 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -66,6 +66,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/progressmanager/futureprogress.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/taskhub.h>
 
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 810e00448a6..192f59b8156 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -33,7 +33,7 @@
 #include "threadshandler.h"
 
 #include <coreplugin/icontext.h>
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 #include <projectexplorer/runcontrol.h>
 #include <texteditor/textmark.h>
 #include <utils/fileutils.h>
@@ -554,7 +554,7 @@ protected:
     bool isNativeMixedActiveFrame() const;
     void startDying() const;
 
-    ProjectExplorer::IDevice::ConstPtr device() const;
+    ProjectExplorer::IDeviceConstPtr device() const;
     DebuggerEngine *companionEngine() const;
 
 private:
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp
index e7f1c5f2d7f..1af1f95486a 100644
--- a/src/plugins/debugger/debuggerkitinformation.cpp
+++ b/src/plugins/debugger/debuggerkitinformation.cpp
@@ -28,9 +28,10 @@
 #include "debuggeritemmanager.h"
 #include "debuggeritem.h"
 
-#include <projectexplorer/toolchain.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runcontrol.h>
+#include <projectexplorer/toolchain.h>
 
 #include <utils/environment.h>
 #include <utils/fileutils.h>
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 2db6ecc167c..6a291750200 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -88,6 +88,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/buildmanager.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
 #include <projectexplorer/itaskhandler.h>
 #include <projectexplorer/project.h>
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 1786bd233b0..6012dacaf42 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -42,6 +42,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/devicesupport/deviceprocessesdialog.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/environmentaspect.h> // For the environment
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index a11cc098e90..a0664a267da 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -76,7 +76,7 @@ public:
     void setInferior(const ProjectExplorer::Runnable &runnable);
     void setInferiorExecutable(const Utils::FilePath &executable);
     void setInferiorEnvironment(const Utils::Environment &env); // Used by GammaRay plugin
-    void setInferiorDevice(ProjectExplorer::IDevice::ConstPtr device); // Used by cdbengine
+    void setInferiorDevice(ProjectExplorer::IDeviceConstPtr device); // Used by cdbengine
     void setRunControlName(const QString &name);
     void setStartMessage(const QString &msg);
     void addQmlServerInferiorCommandLineArgumentIfNeeded();
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1806339162b..2366a06701b 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -54,6 +54,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagebox.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/taskhub.h>
 
diff --git a/src/plugins/debugger/loadcoredialog.cpp b/src/plugins/debugger/loadcoredialog.cpp
index 3b87216db43..71fc01641d0 100644
--- a/src/plugins/debugger/loadcoredialog.cpp
+++ b/src/plugins/debugger/loadcoredialog.cpp
@@ -29,9 +29,10 @@
 #include "debuggerkitinformation.h"
 #include "gdb/gdbengine.h"
 
+#include <projectexplorer/devicesupport/devicefilesystemmodel.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/devicesupport/devicefilesystemmodel.h>
 #include <utils/pathchooser.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp
index 494a24af594..35f1a52f23d 100644
--- a/src/plugins/docker/kitdetector.cpp
+++ b/src/plugins/docker/kitdetector.cpp
@@ -31,6 +31,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/toolchain.h>
 #include <projectexplorer/toolchainmanager.h>
 
diff --git a/src/plugins/docker/kitdetector.h b/src/plugins/docker/kitdetector.h
index e31e2dd74d7..6e19d6f9597 100644
--- a/src/plugins/docker/kitdetector.h
+++ b/src/plugins/docker/kitdetector.h
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
+#include <utils/filepath.h>
 
 #include <QObject>
 
@@ -37,7 +38,7 @@ class KitDetector : public QObject
     Q_OBJECT
 
 public:
-    explicit KitDetector(const ProjectExplorer::IDevice::ConstPtr &device);
+    explicit KitDetector(const ProjectExplorer::IDeviceConstPtr &device);
     ~KitDetector() override;
 
     void autoDetect(const QString &sharedId, const Utils::FilePaths &selectedPaths) const;
diff --git a/src/plugins/ios/iosrunner.h b/src/plugins/ios/iosrunner.h
index d4cbb03f013..a54d55e8b1a 100644
--- a/src/plugins/ios/iosrunner.h
+++ b/src/plugins/ios/iosrunner.h
@@ -32,7 +32,7 @@
 #include <debugger/debuggerconstants.h>
 #include <debugger/debuggerruncontrol.h>
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 #include <projectexplorer/runconfiguration.h>
 
 #include <qmldebug/qmldebugcommandlinearguments.h>
@@ -83,7 +83,7 @@ private:
 
     IosToolHandler *m_toolHandler = nullptr;
     QString m_bundleDir;
-    ProjectExplorer::IDevice::ConstPtr m_device;
+    ProjectExplorer::IDeviceConstPtr m_device;
     IosDeviceType m_deviceType;
     bool m_cppDebug = false;
     QmlDebug::QmlDebugServicesPreset m_qmlDebugServices = QmlDebug::NoQmlDebugServices;
diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp
index 8fcc50a8042..eceae43a042 100644
--- a/src/plugins/perfprofiler/perfconfigwidget.cpp
+++ b/src/plugins/perfprofiler/perfconfigwidget.cpp
@@ -29,6 +29,7 @@
 
 #include <coreplugin/messagebox.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/runcontrol.h>
diff --git a/src/plugins/perfprofiler/perftracepointdialog.h b/src/plugins/perfprofiler/perftracepointdialog.h
index 94838d59172..3df2bb18ee2 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.h
+++ b/src/plugins/perfprofiler/perftracepointdialog.h
@@ -25,11 +25,13 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 
 #include <QDialog>
 #include <QProcess>
 
+namespace Utils { class QtcProcess; }
+
 namespace PerfProfiler {
 namespace Internal {
 
@@ -50,7 +52,7 @@ private:
     void finish();
 
     Ui::PerfTracePointDialog *m_ui;
-    ProjectExplorer::IDevice::ConstPtr m_device;
+    ProjectExplorer::IDeviceConstPtr m_device;
     std::unique_ptr<Utils::QtcProcess> m_process;
 
     void accept() final;
diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt
index 966f49d1c1e..65938ecd3a3 100644
--- a/src/plugins/projectexplorer/CMakeLists.txt
+++ b/src/plugins/projectexplorer/CMakeLists.txt
@@ -63,6 +63,7 @@ add_qtc_plugin(ProjectExplorer
     devicesupport/deviceusedportsgatherer.cpp devicesupport/deviceusedportsgatherer.h
     devicesupport/idevice.cpp devicesupport/idevice.h
     devicesupport/idevicefactory.cpp devicesupport/idevicefactory.h
+    devicesupport/idevicefwd.h
     devicesupport/idevicewidget.h
     devicesupport/localprocesslist.cpp devicesupport/localprocesslist.h
     devicesupport/sshdeviceprocess.cpp devicesupport/sshdeviceprocess.h
diff --git a/src/plugins/projectexplorer/applicationlauncher.h b/src/plugins/projectexplorer/applicationlauncher.h
index 5d339fd2711..be0b3432351 100644
--- a/src/plugins/projectexplorer/applicationlauncher.h
+++ b/src/plugins/projectexplorer/applicationlauncher.h
@@ -27,8 +27,6 @@
 
 #include "projectexplorer_export.h"
 
-#include "devicesupport/idevice.h"
-
 #include <utils/outputformat.h>
 #include <utils/processhandle.h>
 
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 4dc482c4f7d..4e868d36cf1 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -47,6 +47,7 @@
 #include <coreplugin/progressmanager/futureprogress.h>
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <extensionsystem/pluginmanager.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/algorithm.h>
 #include <utils/outputformatter.h>
 #include <utils/runextensions.h>
diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
index bca93342dd3..51358c269cc 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.cpp
@@ -25,6 +25,7 @@
 
 #include "devicefilesystemmodel.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/futuresynchronizer.h>
 #include <utils/qtcassert.h>
 #include <utils/runextensions.h>
diff --git a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h
index e77d6113a0e..f59c3faa442 100644
--- a/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h
+++ b/src/plugins/projectexplorer/devicesupport/devicefilesystemmodel.h
@@ -25,10 +25,13 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "../projectexplorer_export.h"
+#include "idevicefwd.h"
 
 #include <QAbstractItemModel>
 
+namespace Utils { class FilePath; }
+
 namespace ProjectExplorer {
 
 namespace Internal {
@@ -44,7 +47,7 @@ public:
     explicit DeviceFileSystemModel(QObject *parent = nullptr);
     ~DeviceFileSystemModel();
 
-    void setDevice(const IDevice::ConstPtr &device);
+    void setDevice(const IDeviceConstPtr &device);
 
     // Use this to get the full path of a file or directory.
     static const int PathRole = Qt::UserRole;
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
index 3144896cda0..2f5813ecc50 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
+++ b/src/plugins/projectexplorer/devicesupport/devicemanagermodel.h
@@ -26,12 +26,14 @@
 #pragma once
 
 #include "../projectexplorer_export.h"
-#include "idevice.h"
+#include "idevicefwd.h"
 
 #include <QAbstractListModel>
 
 #include <memory>
 
+namespace Utils { class Id; }
+
 namespace ProjectExplorer {
 namespace Internal { class DeviceManagerModelPrivate; }
 class IDevice;
@@ -47,9 +49,9 @@ public:
     void setFilter(const QList<Utils::Id> &filter);
     void setTypeFilter(Utils::Id type);
 
-    IDevice::ConstPtr device(int pos) const;
+    IDeviceConstPtr device(int pos) const;
     Utils::Id deviceId(int pos) const;
-    int indexOf(IDevice::ConstPtr dev) const;
+    int indexOf(IDeviceConstPtr dev) const;
     int indexForId(Utils::Id id) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
@@ -62,7 +64,7 @@ private:
     void handleDeviceListChanged();
 
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    bool matchesTypeFilter(const IDevice::ConstPtr &dev) const;
+    bool matchesTypeFilter(const IDeviceConstPtr &dev) const;
 
     const std::unique_ptr<Internal::DeviceManagerModelPrivate> d;
 };
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
index 82ce1981a6f..bfa054976d2 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp
@@ -25,6 +25,7 @@
 
 #include "deviceprocessesdialog.h"
 #include "deviceprocesslist.h"
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitchooser.h>
 #include <projectexplorer/kitinformation.h>
 
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
index d4cbd0c120f..08f10bc27d9 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.h
@@ -27,7 +27,7 @@
 
 #include "../projectexplorer_export.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 
 #include <QDialog>
 
@@ -51,7 +51,7 @@ public:
     void addAcceptButton(const QString &label);
     void addCloseButton();
 
-    void setDevice(const IDevice::ConstPtr &device);
+    void setDevice(const IDeviceConstPtr &device);
     void showAllDevices();
     Utils::ProcessInfo currentProcess() const;
     KitChooser *kitChooser() const;
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
index 4187793df9d..7924d77f47e 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.cpp
@@ -25,6 +25,7 @@
 
 #include "deviceprocesslist.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/fileutils.h>
 #include <utils/processinfo.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
index f6b0ecb89bb..53be4410263 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceprocesslist.h
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "../projectexplorer_export.h"
+#include "idevicefwd.h"
 
 #include <QAbstractItemModel>
 #include <QList>
@@ -43,7 +44,7 @@ class PROJECTEXPLORER_EXPORT DeviceProcessList : public QObject
     Q_OBJECT
 
 public:
-    DeviceProcessList(const IDevice::ConstPtr &device, QObject *parent = nullptr);
+    DeviceProcessList(const IDeviceConstPtr &device, QObject *parent = nullptr);
     ~DeviceProcessList() override;
 
     void update();
@@ -63,7 +64,7 @@ protected:
     void reportProcessKilled();
     void reportProcessListUpdated(const QList<Utils::ProcessInfo> &processes);
 
-    IDevice::ConstPtr device() const;
+    IDeviceConstPtr device() const;
 
 private:
     virtual void doUpdate() = 0;
diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
index 4514d624f09..d2cb58603b6 100644
--- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
+++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "idevicefwd.h"
 
 #include <QList>
 #include <QString>
@@ -38,7 +38,6 @@ class QPushButton;
 QT_END_NAMESPACE
 
 namespace ProjectExplorer {
-class IDevice;
 class DeviceManager;
 class DeviceManagerModel;
 class IDeviceWidget;
@@ -71,7 +70,7 @@ private:
     void initGui();
     void displayCurrent();
     void setDeviceInfoWidgetsEnabled(bool enable);
-    IDevice::ConstPtr currentDevice() const;
+    IDeviceConstPtr currentDevice() const;
     int currentIndex() const;
     void clearDetails();
     QString parseTestOutput();
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
index 94e97494478..dc4afab81ca 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.cpp
@@ -27,6 +27,7 @@
 
 #include <ssh/sshconnection.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/port.h>
 #include <utils/portlist.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
index da3f866ae29..02b09af4736 100644
--- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
+++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "idevicefwd.h"
 
 #include <projectexplorer/runcontrol.h>
 
@@ -46,7 +46,7 @@ public:
     DeviceUsedPortsGatherer(QObject *parent = nullptr);
     ~DeviceUsedPortsGatherer() override;
 
-    void start(const IDevice::ConstPtr &device);
+    void start(const IDeviceConstPtr &device);
     void stop();
     Utils::Port getNextFreePort(Utils::PortList *freePorts) const; // returns -1 if no more are left
     QList<Utils::Port> usedPorts() const;
diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h
index b85abc32ae5..c2237e4a24d 100644
--- a/src/plugins/projectexplorer/devicesupport/idevice.h
+++ b/src/plugins/projectexplorer/devicesupport/idevice.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "../projectexplorer_export.h"
+#include "idevicefwd.h"
 
 #include <utils/id.h>
 #include <utils/filepath.h>
@@ -123,8 +124,8 @@ class PROJECTEXPLORER_EXPORT IDevice : public QEnableSharedFromThis<IDevice>
 {
     friend class Internal::IDevicePrivate;
 public:
-    using Ptr = QSharedPointer<IDevice>;
-    using ConstPtr = QSharedPointer<const IDevice>;
+    using Ptr = IDevicePtr;
+    using ConstPtr = IDeviceConstPtr;
     template <class ...Args> using Continuation = std::function<void(Args...)>;
 
     enum Origin { ManuallyAdded, AutoDetected };
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
index 1ff8498d3eb..b12b0cae935 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.cpp
@@ -25,6 +25,7 @@
 
 #include "idevicefactory.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/algorithm.h>
 #include <utils/icon.h>
 #include <utils/qtcassert.h>
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefactory.h b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
index 59034aaef5f..f0265074e70 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicefactory.h
+++ b/src/plugins/projectexplorer/devicesupport/idevicefactory.h
@@ -25,12 +25,15 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "idevicefwd.h"
 #include <projectexplorer/projectexplorer_export.h>
+#include <utils/id.h>
 
 #include <QIcon>
 #include <QVariantMap>
 
+namespace Utils { class FilePath; }
+
 namespace ProjectExplorer {
 
 class PROJECTEXPLORER_EXPORT IDeviceFactory
@@ -43,8 +46,8 @@ public:
     QString displayName() const { return m_displayName; }
     QIcon icon() const { return m_icon; }
     bool canCreate() const;
-    IDevice::Ptr construct() const;
-    IDevice::Ptr create() const;
+    IDevicePtr construct() const;
+    IDevicePtr create() const;
 
     virtual bool canRestore(const QVariantMap &) const { return true; }
 
@@ -58,15 +61,15 @@ protected:
     void setDisplayName(const QString &displayName);
     void setIcon(const QIcon &icon);
     void setCombinedIcon(const Utils::FilePath &small, const Utils::FilePath &large);
-    void setConstructionFunction(const std::function<IDevice::Ptr ()> &constructor);
-    void setCreator(const std::function<IDevice::Ptr()> &creator);
+    void setConstructionFunction(const std::function<IDevicePtr ()> &constructor);
+    void setCreator(const std::function<IDevicePtr()> &creator);
 
 private:
-    std::function<IDevice::Ptr()> m_creator;
+    std::function<IDevicePtr()> m_creator;
     const Utils::Id m_deviceType;
     QString m_displayName;
     QIcon m_icon;
-    std::function<IDevice::Ptr()> m_constructor;
+    std::function<IDevicePtr()> m_constructor;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/idevicefwd.h b/src/plugins/projectexplorer/devicesupport/idevicefwd.h
new file mode 100644
index 00000000000..e4d0a1bf08b
--- /dev/null
+++ b/src/plugins/projectexplorer/devicesupport/idevicefwd.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QtGlobal>
+
+QT_BEGIN_NAMESPACE
+template <class T>
+class QSharedPointer;
+QT_END_NAMESPACE
+
+namespace ProjectExplorer {
+
+class IDevice;
+
+using IDevicePtr = QSharedPointer<IDevice>;
+using IDeviceConstPtr = QSharedPointer<const IDevice>;
+
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/idevicewidget.h b/src/plugins/projectexplorer/devicesupport/idevicewidget.h
index ef02ef847fe..8af4f37af21 100644
--- a/src/plugins/projectexplorer/devicesupport/idevicewidget.h
+++ b/src/plugins/projectexplorer/devicesupport/idevicewidget.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "idevice.h"
+#include "idevicefwd.h"
 #include <projectexplorer/projectexplorer_export.h>
 
 #include <QWidget>
@@ -40,14 +40,14 @@ public:
     virtual void updateDeviceFromUi() = 0;
 
 protected:
-    explicit IDeviceWidget(const IDevice::Ptr &device) :
+    explicit IDeviceWidget(const IDevicePtr &device) :
         m_device(device)
     { }
 
-    IDevice::Ptr device() const { return m_device; }
+    IDevicePtr device() const { return m_device; }
 
 private:
-    IDevice::Ptr m_device;
+    IDevicePtr m_device;
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
index b6362cb01e2..14b09034f5c 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.cpp
@@ -25,6 +25,7 @@
 
 #include "localprocesslist.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/processinfo.h>
 
 #include <QTimer>
diff --git a/src/plugins/projectexplorer/devicesupport/localprocesslist.h b/src/plugins/projectexplorer/devicesupport/localprocesslist.h
index 01f06e06e74..fbfd5e6368a 100644
--- a/src/plugins/projectexplorer/devicesupport/localprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/localprocesslist.h
@@ -35,7 +35,7 @@ class LocalProcessList : public DeviceProcessList
     Q_OBJECT
 
 public:
-    explicit LocalProcessList(const IDevice::ConstPtr &device, QObject *parent = nullptr);
+    explicit LocalProcessList(const IDeviceConstPtr &device, QObject *parent = nullptr);
 
 private:
     void doUpdate() override;
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
index 5e5084aa172..b35512504f1 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.cpp
@@ -27,6 +27,7 @@
 
 #include "idevice.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <ssh/sshremoteprocessrunner.h>
 #include <utils/fileutils.h>
 #include <utils/processinfo.h>
diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h
index 513583f0e7f..c8c5e344a82 100644
--- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h
+++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocesslist.h
@@ -35,7 +35,7 @@ class PROJECTEXPLORER_EXPORT SshDeviceProcessList : public DeviceProcessList
 {
     Q_OBJECT
 public:
-    explicit SshDeviceProcessList(const IDevice::ConstPtr &device, QObject *parent = nullptr);
+    explicit SshDeviceProcessList(const IDeviceConstPtr &device, QObject *parent = nullptr);
     ~SshDeviceProcessList() override;
 
 private:
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 0f0173d9839..3d0b49377bc 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -27,6 +27,7 @@
 
 #include "abiwidget.h"
 #include "clangparser.h"
+#include "devicesupport/idevice.h"
 #include "gccparser.h"
 #include "linuxiccparser.h"
 #include "projectmacro.h"
diff --git a/src/plugins/projectexplorer/kitinformation.h b/src/plugins/projectexplorer/kitinformation.h
index 5675b02c062..de0939b8388 100644
--- a/src/plugins/projectexplorer/kitinformation.h
+++ b/src/plugins/projectexplorer/kitinformation.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include "abi.h"
-#include "devicesupport/idevice.h"
+#include "devicesupport/idevicefwd.h"
 #include "kitmanager.h"
 #include "kit.h"
 
@@ -157,9 +157,9 @@ public:
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
     static Utils::Id id();
-    static IDevice::ConstPtr device(const Kit *k);
+    static IDeviceConstPtr device(const Kit *k);
     static Utils::Id deviceId(const Kit *k);
-    static void setDevice(Kit *k, IDevice::ConstPtr dev);
+    static void setDevice(Kit *k, IDeviceConstPtr dev);
     static void setDeviceId(Kit *k, Utils::Id dataId);
 
 private:
@@ -194,13 +194,13 @@ public:
     void addToMacroExpander(ProjectExplorer::Kit *kit, Utils::MacroExpander *expander) const override;
 
     static Utils::Id id();
-    static IDevice::ConstPtr device(const Kit *k);
+    static IDeviceConstPtr device(const Kit *k);
     static Utils::Id deviceId(const Kit *k);
-    static void setDevice(Kit *k, IDevice::ConstPtr dev);
+    static void setDevice(Kit *k, IDeviceConstPtr dev);
     static void setDeviceId(Kit *k, Utils::Id dataId);
 
 private:
-    static IDevice::ConstPtr defaultDevice();
+    static IDeviceConstPtr defaultDevice();
 
     void kitsWereLoaded();
     void deviceUpdated(Utils::Id dataId);
diff --git a/src/plugins/projectexplorer/projectconfiguration.cpp b/src/plugins/projectexplorer/projectconfiguration.cpp
index 0b9559a90b6..3215f0bdb3f 100644
--- a/src/plugins/projectexplorer/projectconfiguration.cpp
+++ b/src/plugins/projectexplorer/projectconfiguration.cpp
@@ -28,6 +28,7 @@
 #include "kitinformation.h"
 #include "target.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 564c12e3ac1..f699892fa91 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -221,6 +221,7 @@ Project {
                 "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h",
                 "idevice.cpp", "idevice.h",
                 "idevicefactory.cpp", "idevicefactory.h",
+                "idevicefwd.h",
                 "idevicewidget.h",
                 "localprocesslist.cpp", "localprocesslist.h",
                 "sshdeviceprocess.cpp", "sshdeviceprocess.h",
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 27ef9a01234..d302bb5a7be 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -40,6 +40,9 @@
 #include "target.h"
 #include "toolchain.h"
 
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/algorithm.h>
 #include <utils/checkablemessagebox.h>
 #include <utils/detailswidget.h>
@@ -49,9 +52,6 @@
 #include <utils/utilsicons.h>
 #include <utils/variablechooser.h>
 
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
-
 #include <QDir>
 #include <QFormLayout>
 #include <QHash>
diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h
index 34e10144241..caf6593d982 100644
--- a/src/plugins/projectexplorer/runconfiguration.h
+++ b/src/plugins/projectexplorer/runconfiguration.h
@@ -26,7 +26,6 @@
 #pragma once
 
 #include "buildtargetinfo.h"
-#include "devicesupport/idevice.h"
 #include "projectconfiguration.h"
 #include "projectexplorerconstants.h"
 #include "task.h"
diff --git a/src/plugins/projectexplorer/runcontrol.cpp b/src/plugins/projectexplorer/runcontrol.cpp
index c33f01baf1b..b94a4bce679 100644
--- a/src/plugins/projectexplorer/runcontrol.cpp
+++ b/src/plugins/projectexplorer/runcontrol.cpp
@@ -26,6 +26,7 @@
 #include "runcontrol.h"
 
 #include "devicesupport/desktopdevice.h"
+#include "devicesupport/idevice.h"
 #include "abi.h"
 #include "buildconfiguration.h"
 #include "customparser.h"
diff --git a/src/plugins/projectexplorer/runcontrol.h b/src/plugins/projectexplorer/runcontrol.h
index dddfb216066..4694bb8f9d8 100644
--- a/src/plugins/projectexplorer/runcontrol.h
+++ b/src/plugins/projectexplorer/runcontrol.h
@@ -27,7 +27,7 @@
 
 #include "applicationlauncher.h"
 #include "buildconfiguration.h"
-#include "devicesupport/idevice.h"
+#include "devicesupport/idevicefwd.h"
 #include "projectexplorerconstants.h"
 #include "runconfiguration.h"
 
@@ -70,7 +70,7 @@ public:
     Utils::CommandLine command;
     Utils::FilePath workingDirectory;
     Utils::Environment environment;
-    IDevice::ConstPtr device; // Override the kit's device. Keep unset by default.
+    IDeviceConstPtr device; // Override the kit's device. Keep unset by default.
     QVariantHash extraData;
 
     // FIXME: Not necessarily a display name
@@ -100,7 +100,7 @@ public:
 
     // Part of read-only interface of RunControl for convenience.
     void appendMessage(const QString &msg, Utils::OutputFormat format, bool appendNewLine = true);
-    IDevice::ConstPtr device() const;
+    IDeviceConstPtr device() const;
     const Runnable &runnable() const;
 
     // States
@@ -223,7 +223,7 @@ public:
 
     Utils::ProcessHandle applicationProcessHandle() const;
     void setApplicationProcessHandle(const Utils::ProcessHandle &handle);
-    IDevice::ConstPtr device() const;
+    IDeviceConstPtr device() const;
 
     RunConfiguration *runConfiguration() const; // FIXME: Remove.
     // FIXME: Try to cut down to amount of functions.
@@ -275,7 +275,7 @@ signals:
     void applicationProcessHandleChanged(QPrivateSignal); // Use setApplicationProcessHandle
 
 private:
-    void setDevice(const IDevice::ConstPtr &device);
+    void setDevice(const IDeviceConstPtr &device);
 
     friend class RunWorker;
     friend class Internal::RunWorkerPrivate;
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index bf3412cfe64..d61101e0b83 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -26,6 +26,7 @@
 #include "toolchain.h"
 
 #include "abi.h"
+#include "devicesupport/idevice.h"
 #include "headerpath.h"
 #include "projectexplorerconstants.h"
 #include "toolchainmanager.h"
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 133b9d39e36..2e41313f2ec 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -28,7 +28,7 @@
 #include "projectexplorer_export.h"
 
 #include "abi.h"
-#include "devicesupport/idevice.h"
+#include "devicesupport/idevicefwd.h"
 #include "headerpath.h"
 #include "projectmacro.h"
 #include "task.h"
@@ -251,14 +251,14 @@ class PROJECTEXPLORER_EXPORT ToolchainDetector
 {
 public:
     ToolchainDetector(const Toolchains &alreadyKnown,
-                      const IDevice::ConstPtr &device,
+                      const IDeviceConstPtr &device,
                       const Utils::FilePaths &searchPaths);
 
     bool isBadToolchain(const Utils::FilePath &toolchain) const;
     void addBadToolchain(const Utils::FilePath &toolchain) const;
 
     const Toolchains alreadyKnown;
-    const IDevice::ConstPtr device;
+    const IDeviceConstPtr device;
     const Utils::FilePaths searchPaths; // If empty use device path and/or magic.
 };
 
diff --git a/src/plugins/projectexplorer/xcodebuildparser.h b/src/plugins/projectexplorer/xcodebuildparser.h
index f7197322acc..e528edd5a9f 100644
--- a/src/plugins/projectexplorer/xcodebuildparser.h
+++ b/src/plugins/projectexplorer/xcodebuildparser.h
@@ -27,7 +27,6 @@
 
 #include "projectexplorer_export.h"
 #include "ioutputparser.h"
-#include "devicesupport/idevice.h"
 
 #include <QRegularExpression>
 #include <QStringList>
diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
index e6f266ed191..98d04e76a50 100644
--- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
+++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
@@ -31,6 +31,7 @@
 #include <coreplugin/messagemanager.h>
 #include <baremetal/baremetalconstants.h>
 #include <projectexplorer/abi.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/gcctoolchain.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index 030625bd64e..f944d3b18b9 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -40,38 +40,41 @@
 
 #include <app/app_version.h>
 
-#include <debugger/debuggericons.h>
-#include <debugger/debuggermainwindow.h>
-#include <debugger/analyzer/analyzermanager.h>
-
-#include <utils/fancymainwindow.h>
-#include <utils/fileinprojectfinder.h>
-#include <utils/qtcassert.h>
-#include <utils/url.h>
-#include <utils/utilsicons.h>
-#include <projectexplorer/environmentaspect.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/target.h>
-#include <projectexplorer/session.h>
-#include <projectexplorer/kitinformation.h>
-#include <projectexplorer/taskhub.h>
-#include <texteditor/texteditor.h>
-
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/find/findplugin.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/imode.h>
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/progressmanager/progressmanager.h>
-#include <coreplugin/imode.h>
+
+#include <debugger/analyzer/analyzermanager.h>
+#include <debugger/debuggericons.h>
+#include <debugger/debuggermainwindow.h>
+
+#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/environmentaspect.h>
+#include <projectexplorer/kitinformation.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/taskhub.h>
 
 #include <qtsupport/qtkitinformation.h>
 
+#include <texteditor/texteditor.h>
+
+#include <utils/fancymainwindow.h>
+#include <utils/fileinprojectfinder.h>
+#include <utils/qtcassert.h>
+#include <utils/url.h>
+#include <utils/utilsicons.h>
+
 #include <QApplication>
 #include <QDockWidget>
 #include <QElapsedTimer>
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 0864a478280..32bcad2d1d5 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -42,6 +42,7 @@
 #include <coreplugin/messagemanager.h>
 
 #include <projectexplorer/deploymentdata.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index dc56a3e28da..ad21606a0fb 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -34,6 +34,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/environmentaspect.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/kitmanager.h>
diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 751bab34013..2901f3a3f59 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -50,6 +50,7 @@
 #include <coreplugin/icore.h>
 #include <utils/algorithm.h>
 
+#include <QDebug>
 #include <QDir>
 #include <QMessageBox>
 #include <QFileInfo>
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index 9020d58098b..1feaf120710 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -30,6 +30,7 @@
 #include "qnxqtversion.h"
 
 #include <projectexplorer/deployablefile.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <qtsupport/qtversionmanager.h>
 #include <remotelinux/genericdirectuploadservice.h>
 #include <ssh/sshremoteprocessrunner.h>
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h
index 10e771ee045..45874dcc63c 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h
@@ -28,7 +28,7 @@
 #include <QDialog>
 
 #include <projectexplorer/deployablefile.h>
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 
 namespace QSsh {
 class SshRemoteProcessRunner;
@@ -57,7 +57,7 @@ public:
         Uploading
     };
 
-    explicit QnxDeployQtLibrariesDialog(const ProjectExplorer::IDevice::ConstPtr &device,
+    explicit QnxDeployQtLibrariesDialog(const ProjectExplorer::IDeviceConstPtr &device,
                                         QWidget *parent = nullptr);
     ~QnxDeployQtLibrariesDialog() override;
 
@@ -90,7 +90,7 @@ private:
     QSsh::SshRemoteProcessRunner *m_processRunner;
     RemoteLinux::GenericDirectUploadService *m_uploadService;
 
-    ProjectExplorer::IDevice::ConstPtr m_device;
+    ProjectExplorer::IDeviceConstPtr m_device;
 
     int m_progressCount;
 
diff --git a/src/plugins/qnx/qnxdeviceprocesslist.cpp b/src/plugins/qnx/qnxdeviceprocesslist.cpp
index 3316e0365ff..df45f9f8093 100644
--- a/src/plugins/qnx/qnxdeviceprocesslist.cpp
+++ b/src/plugins/qnx/qnxdeviceprocesslist.cpp
@@ -25,6 +25,7 @@
 
 #include "qnxdeviceprocesslist.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/processinfo.h>
diff --git a/src/plugins/qnx/qnxdeviceprocesslist.h b/src/plugins/qnx/qnxdeviceprocesslist.h
index 54fb005c392..1de7d3a7c06 100644
--- a/src/plugins/qnx/qnxdeviceprocesslist.h
+++ b/src/plugins/qnx/qnxdeviceprocesslist.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/sshdeviceprocesslist.h>
 
 namespace Qnx {
@@ -36,7 +35,7 @@ class QnxDeviceProcessList : public ProjectExplorer::SshDeviceProcessList
     Q_OBJECT
 public:
     explicit QnxDeviceProcessList(
-            const ProjectExplorer::IDevice::ConstPtr &device, QObject *parent = nullptr);
+            const ProjectExplorer::IDeviceConstPtr &device, QObject *parent = nullptr);
 
 private:
     QString listProcessesCommandLine() const override;
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
index 2649ebeeddc..fade327cffa 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.cpp
@@ -27,6 +27,7 @@
 #include "deploymenttimeinfo.h"
 
 #include <projectexplorer/deployablefile.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
index 3d63136fa74..2467d76d836 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
@@ -27,7 +27,7 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 
 #include <QObject>
 #include <QVariantMap>
@@ -69,7 +69,7 @@ public:
 
     void setTarget(ProjectExplorer::Target *bc);
     // Only use setDevice() as fallback if no target is available
-    void setDevice(const ProjectExplorer::IDevice::ConstPtr &device);
+    void setDevice(const ProjectExplorer::IDeviceConstPtr &device);
     void start();
     void stop();
 
@@ -89,7 +89,7 @@ signals:
 protected:
     const ProjectExplorer::Target *target() const;
     const ProjectExplorer::Kit *profile() const;
-    ProjectExplorer::IDevice::ConstPtr deviceConfiguration() const;
+    ProjectExplorer::IDeviceConstPtr deviceConfiguration() const;
     QSsh::SshConnection *connection() const;
 
     void saveDeploymentTimeStamp(const ProjectExplorer::DeployableFile &deployableFile,
diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
index 1fedd8686af..a15a640a228 100644
--- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
+++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h
@@ -28,6 +28,8 @@
 #include "abstractremotelinuxdeployservice.h"
 #include "remotelinux_export.h"
 
+namespace Utils { class FilePath; }
+
 namespace RemoteLinux {
 class AbstractRemoteLinuxPackageInstaller;
 
diff --git a/src/plugins/remotelinux/deploymenttimeinfo.cpp b/src/plugins/remotelinux/deploymenttimeinfo.cpp
index eef2b77cf4b..7244be149ae 100644
--- a/src/plugins/remotelinux/deploymenttimeinfo.cpp
+++ b/src/plugins/remotelinux/deploymenttimeinfo.cpp
@@ -26,6 +26,7 @@
 #include "deploymenttimeinfo.h"
 
 #include <projectexplorer/deployablefile.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/target.h>
 
diff --git a/src/plugins/remotelinux/deploymenttimeinfo.h b/src/plugins/remotelinux/deploymenttimeinfo.h
index 3c91be74c7f..01b64055038 100644
--- a/src/plugins/remotelinux/deploymenttimeinfo.h
+++ b/src/plugins/remotelinux/deploymenttimeinfo.h
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <QVariantMap>
-#include <projectexplorer/devicesupport/idevice.h>
 
 namespace ProjectExplorer {
 class DeployableFile;
diff --git a/src/plugins/remotelinux/filesystemaccess_test.h b/src/plugins/remotelinux/filesystemaccess_test.h
index c0a2d9aefb1..909146f673e 100644
--- a/src/plugins/remotelinux/filesystemaccess_test.h
+++ b/src/plugins/remotelinux/filesystemaccess_test.h
@@ -25,7 +25,6 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/devicesupport/idevicefactory.h>
 
 #include <utils/fileutils.h>
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index 7187799790f..91a073f4ca9 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -27,6 +27,7 @@
 #include "ui_genericlinuxdeviceconfigurationwidget.h"
 
 #include <coreplugin/coreconstants.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/portlist.h>
 #include <utils/fancylineedit.h>
 #include <utils/utilsicons.h>
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
index 20c8b2aecbf..fba1e2d4971 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h
@@ -29,6 +29,8 @@
 
 #include "remotelinux_export.h"
 
+namespace Utils { class FilePath; }
+
 namespace RemoteLinux {
 
 namespace Ui { class GenericLinuxDeviceConfigurationWidget; }
@@ -40,7 +42,7 @@ class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWidget
 
 public:
     explicit GenericLinuxDeviceConfigurationWidget(
-        const ProjectExplorer::IDevice::Ptr &deviceConfig);
+        const ProjectExplorer::IDevicePtr &deviceConfig);
     ~GenericLinuxDeviceConfigurationWidget() override;
 
 private:
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index 63596622e82..844515abfe7 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -29,6 +29,7 @@
 #include "linuxdevice.h"
 #include "remotelinux_constants.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/portlist.h>
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
index ff69a68113e..03d02380eb3 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
@@ -27,7 +27,7 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 #include <utils/wizard.h>
 
 namespace RemoteLinux {
@@ -41,7 +41,7 @@ public:
     GenericLinuxDeviceConfigurationWizard(QWidget *parent = nullptr);
     ~GenericLinuxDeviceConfigurationWizard() override;
 
-    ProjectExplorer::IDevice::Ptr device();
+    ProjectExplorer::IDevicePtr device();
 
 private:
     Internal::GenericLinuxDeviceConfigurationWizardPrivate * const d;
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
index fd43803a262..a5dc7aafdc6 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp
@@ -28,6 +28,7 @@
 #include "sshkeydeployer.h"
 
 #include <coreplugin/icore.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <ssh/sshconnection.h>
 #include <utils/theme/theme.h>
 
diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h
index e2792cc376f..e6955dd0204 100644
--- a/src/plugins/remotelinux/publickeydeploymentdialog.h
+++ b/src/plugins/remotelinux/publickeydeploymentdialog.h
@@ -27,10 +27,12 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 
 #include <QProgressDialog>
 
+namespace Utils { class FilePath; }
+
 namespace RemoteLinux {
 namespace Internal { class PublicKeyDeploymentDialogPrivate; }
 
@@ -39,10 +41,10 @@ class REMOTELINUX_EXPORT PublicKeyDeploymentDialog : public QProgressDialog
     Q_OBJECT
 public:
     // Asks for public key and returns null if the file dialog is canceled.
-    static PublicKeyDeploymentDialog *createDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
+    static PublicKeyDeploymentDialog *createDialog(const ProjectExplorer::IDeviceConstPtr &deviceConfig,
         QWidget *parent = nullptr);
 
-    PublicKeyDeploymentDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
+    PublicKeyDeploymentDialog(const ProjectExplorer::IDeviceConstPtr &deviceConfig,
                               const Utils::FilePath &publicKeyFileName, QWidget *parent = nullptr);
 
     ~PublicKeyDeploymentDialog() override;
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp
index bb1b67a746b..f0522739400 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.cpp
@@ -25,6 +25,7 @@
 
 #include "remotelinuxcheckforfreediskspaceservice.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <ssh/sshremoteprocessrunner.h>
 #include <utils/fileutils.h>
 
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
index 15b8d0fe7bd..d78efa28f60 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.cpp
@@ -25,9 +25,10 @@
 
 #include "remotelinuxcustomcommanddeployservice.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
+#include <ssh/sshremoteprocessrunner.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
-#include <ssh/sshremoteprocessrunner.h>
 
 using namespace QSsh;
 
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 9a54527eba7..8f311a6c424 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -33,6 +33,7 @@
 #include "rsyncdeploystep.h"
 
 #include <projectexplorer/abi.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
index 6f92dcff1a8..10d4b569459 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h
@@ -25,11 +25,13 @@
 
 #pragma once
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
 #include <utils/environment.h>
 
 #include <QObject>
 
+namespace Utils { class QtcProcess; }
+
 namespace RemoteLinux {
 namespace Internal {
 
@@ -38,7 +40,7 @@ class RemoteLinuxEnvironmentReader : public QObject
     Q_OBJECT
 
 public:
-    RemoteLinuxEnvironmentReader(const ProjectExplorer::IDevice::ConstPtr &device,
+    RemoteLinuxEnvironmentReader(const ProjectExplorer::IDeviceConstPtr &device,
                                  QObject *parent = nullptr);
     void start();
     void stop();
@@ -58,7 +60,7 @@ private:
 
     bool m_stop = false;
     Utils::Environment m_env;
-    ProjectExplorer::IDevice::ConstPtr m_device;
+    ProjectExplorer::IDeviceConstPtr m_device;
     Utils::QtcProcess *m_deviceProcess = nullptr;
 };
 
diff --git a/src/plugins/remotelinux/remotelinuxkillappservice.cpp b/src/plugins/remotelinux/remotelinuxkillappservice.cpp
index ddbe72b1f0d..a6c446d9c59 100644
--- a/src/plugins/remotelinux/remotelinuxkillappservice.cpp
+++ b/src/plugins/remotelinux/remotelinuxkillappservice.cpp
@@ -25,6 +25,7 @@
 
 #include "remotelinuxkillappservice.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/fileutils.h>
 
 namespace RemoteLinux {
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
index 75a36ea2012..af899518c37 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
@@ -25,9 +25,10 @@
 
 #include "remotelinuxpackageinstaller.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
+#include <ssh/sshremoteprocessrunner.h>
 #include <utils/qtcassert.h>
 #include <utils/fileutils.h>
-#include <ssh/sshremoteprocessrunner.h>
 
 using namespace ProjectExplorer;
 using namespace QSsh;
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
index 3f4ce9d7ccb..3521b4a46fa 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h
@@ -27,7 +27,9 @@
 
 #include "remotelinux_export.h"
 
-#include <projectexplorer/devicesupport/idevice.h>
+#include <projectexplorer/devicesupport/idevicefwd.h>
+
+#include <QObject>
 
 namespace RemoteLinux {
 
@@ -40,8 +42,8 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxPackageInstaller : public QObject
 public:
     ~AbstractRemoteLinuxPackageInstaller() override;
 
-    void installPackage(const ProjectExplorer::IDevice::ConstPtr &deviceConfig,
-        const QString &packageFilePath, bool removePackageFile);
+    void installPackage(const ProjectExplorer::IDeviceConstPtr &deviceConfig,
+                        const QString &packageFilePath, bool removePackageFile);
     void cancelInstallation();
 
 signals:
diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index d2b93001be1..b7d9ef51d61 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -27,6 +27,8 @@
 
 #include <utils/temporaryfile.h>
 
+#include <QDebug>
+
 #define CALLGRIND_CONTROL_DEBUG 0
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index bfa440c25fc..760209df094 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -51,6 +51,7 @@
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/deploymentdata.h>
+#include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index ccffd459106..0a54846a605 100644
--- a/src/plugins/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
@@ -28,6 +28,7 @@
 
 #include "xmlprotocol/threadedparser.h"
 
+#include <projectexplorer/devicesupport/idevice.h>
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index 1e2e83fd464..7ba28b1392c 100644
--- a/src/plugins/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
@@ -32,6 +32,10 @@
 
 #include <QProcess>
 
+QT_BEGIN_NAMESPACE
+class QHostAddress;
+QT_END_NAMESPACE
+
 namespace Valgrind {
 
 namespace XmlProtocol { class ThreadedParser; }
@@ -48,7 +52,7 @@ public:
     void setDebuggee(const ProjectExplorer::Runnable &debuggee);
     void setProcessChannelMode(QProcess::ProcessChannelMode mode);
     void setLocalServerAddress(const QHostAddress &localServerAddress);
-    void setDevice(const ProjectExplorer::IDevice::ConstPtr &device);
+    void setDevice(const ProjectExplorer::IDeviceConstPtr &device);
     void setUseTerminal(bool on);
 
     void waitForFinished() const;