diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index cac0ebfb856..4e029fda6b2 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -28,13 +28,14 @@
 #include "androidconstants.h"
 #include "androidmanager.h"
 
-#include <projectexplorer/buildsteplist.h>
-#include <projectexplorer/target.h>
+#include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildconfiguration.h>
+#include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/gnumakeparser.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/processparameters.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/target.h>
 #include <projectexplorer/toolchain.h>
 
 #include <utils/hostosinfo.h>
@@ -44,9 +45,38 @@
 
 using namespace ProjectExplorer;
 using namespace Utils;
-using namespace Android::Internal;
 
 namespace Android {
+namespace Internal {
+
+class AndroidPackageInstallationStep final : public AbstractProcessStep
+{
+    Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStep)
+
+public:
+    AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id);
+
+    BuildStepConfigWidget *createConfigWidget() final;
+
+private:
+    bool init() final;
+    void doRun() final;
+
+    QStringList m_androidDirsToClean;
+};
+
+class AndroidPackageInstallationStepWidget final : public BuildStepConfigWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(Android::AndroidPackageInstallationStepWidget)
+
+public:
+    AndroidPackageInstallationStepWidget(BuildStep *step)
+        : BuildStepConfigWidget(step)
+    {
+        setDisplayName(tr("Make install"));
+        setSummaryText("<b>" + tr("Make install") + "</b>");
+    }
+};
 
 AndroidPackageInstallationStep::AndroidPackageInstallationStep(BuildStepList *bsl, Core::Id id)
     : AbstractProcessStep(bsl, id)
@@ -117,20 +147,6 @@ BuildStepConfigWidget *AndroidPackageInstallationStep::createConfigWidget()
     return new AndroidPackageInstallationStepWidget(this);
 }
 
-
-//
-// AndroidPackageInstallationStepWidget
-//
-
-namespace Internal {
-
-AndroidPackageInstallationStepWidget::AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step)
-    : BuildStepConfigWidget(step)
-{
-    setDisplayName(tr("Make install"));
-    setSummaryText("<b>" + tr("Make install") + "</b>");
-}
-
 //
 // AndroidPackageInstallationStepFactory
 //
diff --git a/src/plugins/android/androidpackageinstallationstep.h b/src/plugins/android/androidpackageinstallationstep.h
index f9e2c7d493b..80300f2997b 100644
--- a/src/plugins/android/androidpackageinstallationstep.h
+++ b/src/plugins/android/androidpackageinstallationstep.h
@@ -25,39 +25,12 @@
 
 #pragma once
 
-#include "android_global.h"
-
 #include <projectexplorer/buildstep.h>
-#include <projectexplorer/abstractprocessstep.h>
 
 namespace Android {
-
-class ANDROID_EXPORT AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessStep
-{
-    Q_OBJECT
-
-public:
-    AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
-
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
-
-private:
-    bool init() override;
-    void doRun() override;
-
-    QStringList m_androidDirsToClean;
-};
-
 namespace Internal {
 
-class AndroidPackageInstallationStepWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-    Q_OBJECT
-public:
-    AndroidPackageInstallationStepWidget(AndroidPackageInstallationStep *step);
-};
-
-class AndroidPackageInstallationFactory: public ProjectExplorer::BuildStepFactory
+class AndroidPackageInstallationFactory final : public ProjectExplorer::BuildStepFactory
 {
 public:
     AndroidPackageInstallationFactory();