diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
index 914cbc0acd5..4d95f485d0e 100644
--- a/src/plugins/android/androidpotentialkit.cpp
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -8,23 +8,35 @@
 
 #include <app/app_version.h>
 
-#include <utils/detailswidget.h>
-#include <utils/utilsicons.h>
-
 #include <coreplugin/coreicons.h>
 #include <coreplugin/icore.h>
+
 #include <projectexplorer/kitmanager.h>
 #include <projectexplorer/kit.h>
 #include <projectexplorer/kitinformation.h>
+
 #include <qtsupport/qtversionmanager.h>
 #include <qtsupport/baseqtversion.h>
 
+#include <utils/detailswidget.h>
+#include <utils/utilsicons.h>
+
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
 
-using namespace Android;
-using namespace Android::Internal;
+
+namespace Android::Internal {
+
+class AndroidPotentialKitWidget : public Utils::DetailsWidget
+{
+public:
+    AndroidPotentialKitWidget(QWidget *parent);
+
+private:
+    void openOptions();
+    void recheck();
+};
 
 QString AndroidPotentialKit::displayName() const
 {
@@ -102,3 +114,5 @@ void AndroidPotentialKitWidget::recheck()
         }
     }
 }
+
+} // Android::Internal
diff --git a/src/plugins/android/androidpotentialkit.h b/src/plugins/android/androidpotentialkit.h
index 9e1ed417423..d1110294756 100644
--- a/src/plugins/android/androidpotentialkit.h
+++ b/src/plugins/android/androidpotentialkit.h
@@ -4,14 +4,11 @@
 #pragma once
 
 #include <projectexplorer/ipotentialkit.h>
-#include <utils/detailswidget.h>
 
-namespace Android {
-namespace Internal {
+namespace Android::Internal {
 
 class AndroidPotentialKit : public ProjectExplorer::IPotentialKit
 {
-    Q_OBJECT
 public:
     QString displayName() const override;
     void executeFromMenu() override;
@@ -19,15 +16,4 @@ public:
     bool isEnabled() const override;
 };
 
-class AndroidPotentialKitWidget : public Utils::DetailsWidget
-{
-    Q_OBJECT
-public:
-    AndroidPotentialKitWidget(QWidget *parent);
-private:
-    void openOptions();
-    void recheck();
-};
-
-}
-}
+} // Android::Internal
diff --git a/src/plugins/projectexplorer/ipotentialkit.h b/src/plugins/projectexplorer/ipotentialkit.h
index ae032fb9e33..038a3a9fac8 100644
--- a/src/plugins/projectexplorer/ipotentialkit.h
+++ b/src/plugins/projectexplorer/ipotentialkit.h
@@ -4,18 +4,16 @@
 #pragma once
 
 #include <QObject>
-#include <QMetaType>
+
 #include "projectexplorer_export.h"
 
 namespace ProjectExplorer {
 
-class PROJECTEXPLORER_EXPORT IPotentialKit : public QObject
+class PROJECTEXPLORER_EXPORT IPotentialKit
 {
-    Q_OBJECT
-
 public:
     IPotentialKit();
-    ~IPotentialKit() override;
+    virtual ~IPotentialKit();
 
     virtual QString displayName() const = 0;
     virtual void executeFromMenu() = 0;
@@ -23,4 +21,4 @@ public:
     virtual bool isEnabled() const = 0;
 };
 
-}
+} // ProjectExplorer