diff --git a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp b/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp
index 1dd4dfced68..451f3dfb78b 100644
--- a/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeinstallstep.cpp
@@ -3,6 +3,7 @@
 
 #include "cmakeinstallstep.h"
 
+#include "cmakeabstractprocessstep.h"
 #include "cmakebuildsystem.h"
 #include "cmakekitinformation.h"
 #include "cmakeparser.h"
@@ -27,7 +28,23 @@ const char CMAKE_ARGUMENTS_KEY[] = "CMakeProjectManager.InstallStep.CMakeArgumen
 
 // CMakeInstallStep
 
-CMakeInstallStep::CMakeInstallStep(BuildStepList *bsl, Utils::Id id)
+class CMakeInstallStep : public CMakeAbstractProcessStep
+{
+public:
+    CMakeInstallStep(ProjectExplorer::BuildStepList *bsl, Id id);
+
+private:
+    CommandLine cmakeCommand() const;
+
+    void processFinished(bool success) override;
+
+    void setupOutputFormatter(OutputFormatter *formatter) override;
+    QWidget *createConfigWidget() override;
+
+    StringAspect *m_cmakeArguments = nullptr;
+};
+
+CMakeInstallStep::CMakeInstallStep(BuildStepList *bsl, Id id)
     : CMakeAbstractProcessStep(bsl, id)
 {
     m_cmakeArguments = addAspect<StringAspect>();
@@ -38,7 +55,7 @@ CMakeInstallStep::CMakeInstallStep(BuildStepList *bsl, Utils::Id id)
     setCommandLineProvider([this] { return cmakeCommand(); });
 }
 
-void CMakeInstallStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
+void CMakeInstallStep::setupOutputFormatter(OutputFormatter *formatter)
 {
     CMakeParser *cmakeParser = new CMakeParser;
     cmakeParser->setSourceDirectory(project()->projectDirectory());
@@ -119,5 +136,5 @@ CMakeInstallStepFactory::CMakeInstallStepFactory()
     setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_DEPLOY});
 }
 
-} // namespace CMakeProjectManager::Internal
+} // CMakeProjectManager::Internal
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeinstallstep.h b/src/plugins/cmakeprojectmanager/cmakeinstallstep.h
index 247a8892889..0d6a0da96b2 100644
--- a/src/plugins/cmakeprojectmanager/cmakeinstallstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakeinstallstep.h
@@ -3,38 +3,14 @@
 
 #pragma once
 
-#include "cmakeabstractprocessstep.h"
-
-namespace Utils {
-class CommandLine;
-class StringAspect;
-} // namespace Utils
+#include <projectexplorer/buildstep.h>
 
 namespace CMakeProjectManager::Internal {
 
-class CMakeInstallStep : public CMakeAbstractProcessStep
-{
-    Q_OBJECT
-
-public:
-    CMakeInstallStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
-
-private:
-    Utils::CommandLine cmakeCommand() const;
-
-    void processFinished(bool success) override;
-
-    void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
-    QWidget *createConfigWidget() override;
-
-    friend class CMakeInstallStepConfigWidget;
-    Utils::StringAspect *m_cmakeArguments = nullptr;
-};
-
 class CMakeInstallStepFactory : public ProjectExplorer::BuildStepFactory
 {
 public:
     CMakeInstallStepFactory();
 };
 
-} // namespace CMakeProjectManager::Internal
+} // CMakeProjectManager::Internal