diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 3fcdc9ea738..3d1ce112697 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -31,25 +31,24 @@
 #include "projectexplorericons.h"
 
 #include <coreplugin/icore.h>
-#include <coreplugin/coreicons.h>
 
-#include <utils/qtcassert.h>
 #include <utils/detailswidget.h>
 #include <utils/hostosinfo.h>
-#include <utils/theme/theme.h>
+#include <utils/qtcassert.h>
 
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QToolButton>
+#include <QLabel>
+#include <QMenu>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QToolButton>
+#include <QVBoxLayout>
 
-using namespace ProjectExplorer;
-using namespace ProjectExplorer::Internal;
 using namespace Utils;
 
+namespace ProjectExplorer {
+namespace Internal {
+
 ToolWidget::ToolWidget(QWidget *parent) : FadingPanel(parent)
 {
     auto layout = new QHBoxLayout;
@@ -394,3 +393,6 @@ void BuildStepListWidget::updateBuildStepButtonsState()
         s->toolWidget->setUpVisible(m_buildStepList->count() != 1);
     }
 }
+
+} // Internal
+} // ProjectExplorer
diff --git a/src/plugins/projectexplorer/buildstepspage.h b/src/plugins/projectexplorer/buildstepspage.h
index 9fef567a1f7..2a94895176c 100644
--- a/src/plugins/projectexplorer/buildstepspage.h
+++ b/src/plugins/projectexplorer/buildstepspage.h
@@ -34,16 +34,11 @@ class QPushButton;
 class QToolButton;
 class QLabel;
 class QVBoxLayout;
-class QGraphicsOpacityEffect;
 QT_END_NAMESPACE
 
 namespace Utils { class DetailsWidget; }
 
 namespace ProjectExplorer {
-
-class Target;
-class BuildConfiguration;
-
 namespace Internal {
 
 class ToolWidget : public Utils::FadingPanel