diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 16375c0d6a4..9bdfc5dfbfa 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -478,7 +478,7 @@ ProjectWindow::ProjectWindow()
 {
     setBackgroundRole(QPalette::Base);
 
-    m_selectorModel = new SelectorModel(this, [this](QWidget *panel) { setPanel(panel); });
+    auto selectorModel = new SelectorModel(this, [this](QWidget *panel) { setPanel(panel); });
 
     auto styledBar = new StyledBar; // The black blob on top of the side bar
     styledBar->setObjectName("ProjectModeStyledBar");
@@ -491,16 +491,16 @@ ProjectWindow::ProjectWindow()
     auto innerLayout = new QVBoxLayout;
     innerLayout->setSpacing(10);
     innerLayout->setContentsMargins(14, innerLayout->spacing(), 14, 0);
-    innerLayout->addWidget(m_selectorModel->m_projectSelection);
-    innerLayout->addWidget(m_selectorModel->m_selectorTree);
+    innerLayout->addWidget(selectorModel->m_projectSelection);
+    innerLayout->addWidget(selectorModel->m_selectorTree);
 
     auto selectorLayout = new QVBoxLayout(selectorView);
     selectorLayout->setContentsMargins(0, 0, 0, 0);
     selectorLayout->addWidget(styledBar);
     selectorLayout->addLayout(innerLayout);
 
-    m_selectorDock = addDockForWidget(selectorView, true);
-    addDockWidget(Qt::LeftDockWidgetArea, m_selectorDock);
+    auto selectorDock = addDockForWidget(selectorView, true);
+    addDockWidget(Qt::LeftDockWidgetArea, selectorDock);
 }
 
 void ProjectWindow::contextMenuEvent(QContextMenuEvent *event)
@@ -550,6 +550,5 @@ void SelectorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
     QStyledItemDelegate::paint(painter, opt, index);
 }
 
-
 } // namespace Internal
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectwindow.h b/src/plugins/projectexplorer/projectwindow.h
index c6670d7da7c..a9918a093be 100644
--- a/src/plugins/projectexplorer/projectwindow.h
+++ b/src/plugins/projectexplorer/projectwindow.h
@@ -27,26 +27,11 @@
 
 #include "projectexplorer_export.h"
 
-#include <QPointer>
-#include <QWidget>
-
 #include <utils/fancymainwindow.h>
 
-QT_BEGIN_NAMESPACE
-class QComboBox;
-QT_END_NAMESPACE
-
 namespace ProjectExplorer {
-
-class Project;
-class Target;
-
 namespace Internal {
 
-class SelectorModel;
-class SelectorTree;
-class ProjectItem;
-
 enum {
     ContextMenuItemAdderRole // To augment a context menu, data has a QMenu*
         = Qt::UserRole + 1,
@@ -70,11 +55,7 @@ public:
 
 private:
     void contextMenuEvent(QContextMenuEvent *event) override;
-    void openContextMenu(const QPoint &pos);
     void setPanel(QWidget *panel);
-
-    SelectorModel *m_selectorModel;
-    QDockWidget *m_selectorDock;
 };
 
 } // namespace Internal
diff --git a/src/plugins/projectexplorer/targetsettingspanel.h b/src/plugins/projectexplorer/targetsettingspanel.h
index 96a24c3a853..120f112a09f 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.h
+++ b/src/plugins/projectexplorer/targetsettingspanel.h
@@ -32,6 +32,9 @@
 #include <QCoreApplication>
 
 namespace ProjectExplorer {
+
+class Target;
+
 namespace Internal {
 
 class TargetItem;