diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index f0dfbf6409e..76f751b7340 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -32,7 +32,6 @@
 #include "qmakenodes.h"
 #include "qmakesettings.h"
 #include "qmakestep.h"
-#include "qmakemakestep.h"
 #include "makefileparse.h"
 #include "qmakebuildconfiguration.h"
 
@@ -47,6 +46,7 @@
 #include <projectexplorer/buildpropertiessettings.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/kit.h>
+#include <projectexplorer/makestep.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/projectmacroexpander.h>
@@ -491,12 +491,12 @@ QMakeStep *QmakeBuildConfiguration::qmakeStep() const
     return nullptr;
 }
 
-QmakeMakeStep *QmakeBuildConfiguration::makeStep() const
+MakeStep *QmakeBuildConfiguration::makeStep() const
 {
-    QmakeMakeStep *ms = nullptr;
+    MakeStep *ms = nullptr;
     BuildStepList *bsl = buildSteps();
     for (int i = 0; i < bsl->count(); ++i)
-        if ((ms = qobject_cast<QmakeMakeStep *>(bsl->at(i))) != nullptr)
+        if ((ms = qobject_cast<MakeStep *>(bsl->at(i))) != nullptr)
             return ms;
     return nullptr;
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
index 4a452ee6d48..92b2bc13def 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h
@@ -32,13 +32,15 @@
 
 #include <utils/aspects.h>
 
-namespace ProjectExplorer { class FileNode; }
+namespace ProjectExplorer {
+class FileNode;
+class MakeStep;
+} // ProjectExplorer
 
 namespace QmakeProjectManager {
 
 class QMakeStep;
 class QmakeBuildSystem;
-class QmakeMakeStep;
 class QmakeProFileNode;
 
 class QMAKEPROJECTMANAGER_EXPORT QmakeBuildConfiguration : public ProjectExplorer::BuildConfiguration
@@ -68,13 +70,12 @@ public:
 
     QStringList configCommandLineArguments() const;
 
-    // Those functions are used in a few places.
+    // This function is used in a few places.
     // The drawback is that we shouldn't actually depend on them being always there
     // That is generally the stuff that is asked should normally be transferred to
     // QmakeProject *
     // So that we can later enable people to build qmake the way they would like
     QMakeStep *qmakeStep() const;
-    QmakeMakeStep *makeStep() const;
 
     QmakeBuildSystem *qmakeBuildSystem() const;
 
@@ -128,6 +129,8 @@ private:
     void qtVersionsChanged(const QList<int> &, const QList<int> &, const QList<int> &changed);
     void updateProblemLabel();
 
+    ProjectExplorer::MakeStep *makeStep() const;
+
     class LastKitState
     {
     public:
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index ebfebe0288b..418587b36c5 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -53,6 +53,27 @@ using namespace ProjectExplorer;
 using namespace Utils;
 
 namespace QmakeProjectManager {
+namespace Internal {
+
+class QmakeMakeStep : public MakeStep
+{
+    Q_DECLARE_TR_FUNCTIONS(QmakeProjectManager::QmakeMakeStep)
+
+public:
+    QmakeMakeStep(BuildStepList *bsl, Id id);
+
+private:
+    void finish(bool success) override;
+    bool init() override;
+    void setupOutputFormatter(OutputFormatter *formatter) override;
+    void doRun() override;
+    QStringList displayArguments() const override;
+
+    bool m_scriptTarget = false;
+    QString m_makeFileToCheck;
+    bool m_unalignedBuildDir;
+    bool m_ignoredNonTopLevelBuild = false;
+};
 
 QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Id id)
     : MakeStep(bsl, id)
@@ -225,7 +246,7 @@ void QmakeMakeStep::doRun()
 void QmakeMakeStep::finish(bool success)
 {
     if (!success && !isCanceled() && m_unalignedBuildDir
-            && Internal::QmakeSettings::warnAgainstUnalignedBuildDir()) {
+            && QmakeSettings::warnAgainstUnalignedBuildDir()) {
         const QString msg = tr("The build directory is not at the same level as the source "
                                "directory, which could be the reason for the build failure.");
         emit addTask(BuildSystemTask(Task::Warning, msg));
@@ -241,8 +262,6 @@ QStringList QmakeMakeStep::displayArguments() const
     return {};
 }
 
-namespace Internal {
-
 ///
 // QmakeMakeStepFactory
 ///
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.h b/src/plugins/qmakeprojectmanager/qmakemakestep.h
index 7c9be487fd9..798f615022e 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.h
@@ -30,27 +30,6 @@
 #include <projectexplorer/makestep.h>
 
 namespace QmakeProjectManager {
-
-class QMAKEPROJECTMANAGER_EXPORT QmakeMakeStep : public ProjectExplorer::MakeStep
-{
-    Q_OBJECT
-
-public:
-    QmakeMakeStep(ProjectExplorer::BuildStepList *bsl, Utils::Id id);
-
-private:
-    void finish(bool success) override;
-    bool init() override;
-    void setupOutputFormatter(Utils::OutputFormatter *formatter) override;
-    void doRun() override;
-    QStringList displayArguments() const override;
-
-    bool m_scriptTarget = false;
-    QString m_makeFileToCheck;
-    bool m_unalignedBuildDir;
-    bool m_ignoredNonTopLevelBuild = false;
-};
-
 namespace Internal {
 
 class QmakeMakeStepFactory : public ProjectExplorer::BuildStepFactory