diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index a4097c0dc95..41955ce0516 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -1145,6 +1145,8 @@ AndroidConfigurations::AndroidConfigurations()
 
     connect(SessionManager::instance(), &SessionManager::projectRemoved,
             this, &AndroidConfigurations::clearDefaultDevices);
+    connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
+            this, &AndroidConfigurations::updateAndroidDevice);
 
     m_force32bit = is32BitUserSpace();
 
diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h
index 23d4f4ea146..a28a360e269 100644
--- a/src/plugins/android/androidconfigurations.h
+++ b/src/plugins/android/androidconfigurations.h
@@ -52,9 +52,11 @@ class Project;
 
 namespace Android {
 
-class AndroidPluginRunData;
 
-namespace Internal { class AndroidSdkManager; }
+namespace Internal {
+class AndroidSdkManager;
+class AndroidPluginPrivate;
+}
 
 class AndroidDeviceInfo
 {
@@ -195,7 +197,6 @@ public:
     static void setConfig(const AndroidConfig &config);
     static AndroidConfigurations *instance();
 
-    static void updateAndroidDevice();
     static AndroidDeviceInfo showDeviceDialog(ProjectExplorer::Project *project, int apiLevel, const QString &abi);
     static void setDefaultDevice(ProjectExplorer::Project *project, const QString &abi, const QString &serialNumber); // serial number or avd name
     static QString defaultDevice(ProjectExplorer::Project *project, const QString &abi); // serial number or avd name
@@ -210,12 +211,13 @@ signals:
     void updated();
 
 private:
-    friend class Android::AndroidPluginRunData;
+    friend class Android::Internal::AndroidPluginPrivate;
     AndroidConfigurations();
     ~AndroidConfigurations();
     void load();
     void save();
 
+    static void updateAndroidDevice();
     static AndroidConfigurations *m_instance;
     AndroidConfig m_config;
     std::unique_ptr<Internal::AndroidSdkManager> m_sdkManager;
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 7e1b88d754d..a52e67292de 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -56,11 +56,11 @@
 
 using namespace ProjectExplorer;
 using namespace ProjectExplorer::Constants;
-using namespace Android::Internal;
 
 namespace Android {
+namespace Internal {
 
-class AndroidPluginRunData
+class AndroidPluginPrivate
 {
 public:
     AndroidConfigurations androidConfiguration;
@@ -76,12 +76,9 @@ public:
     AndroidManifestEditorFactory manifestEditorFactory;
 };
 
-AndroidPlugin::AndroidPlugin()
-{ }
-
 AndroidPlugin::~AndroidPlugin()
 {
-    delete m_runData;
+    delete d;
 }
 
 bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessage)
@@ -96,15 +93,13 @@ bool AndroidPlugin::initialize(const QStringList &arguments, QString *errorMessa
     RunControl::registerWorker<AndroidRunConfiguration, AndroidQmlToolingSupport>(
                 QML_PREVIEW_RUN_MODE);
 
-    m_runData = new AndroidPluginRunData;
+    d = new AndroidPluginPrivate;
 
     KitManager::registerKitInformation(new Internal::AndroidGdbServerKitInformation);
 
     connect(KitManager::instance(), &KitManager::kitsLoaded,
             this, &AndroidPlugin::kitsRestored);
 
-    connect(DeviceManager::instance(), &DeviceManager::devicesLoaded,
-            this, &AndroidPlugin::updateDevice);
     return true;
 }
 
@@ -117,9 +112,5 @@ void AndroidPlugin::kitsRestored()
                this, &AndroidPlugin::kitsRestored);
 }
 
-void AndroidPlugin::updateDevice()
-{
-    AndroidConfigurations::updateAndroidDevice();
-}
-
+} // namespace Internal
 } // namespace Android
diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index 3c539b0c4e2..5f71e3886c8 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -28,16 +28,15 @@
 #include <extensionsystem/iplugin.h>
 
 namespace Android {
-
-class AndroidPluginRunData;
-
+namespace Internal {
+class AndroidPluginPrivate;
 class AndroidPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Android.json")
 
 public:
-    AndroidPlugin();
+    AndroidPlugin() = default;
 
 private:
     ~AndroidPlugin() final;
@@ -45,10 +44,10 @@ private:
     bool initialize(const QStringList &arguments, QString *errorMessage) final;
     void extensionsInitialized() final { }
 
-    void updateDevice();
     void kitsRestored();
 
-    AndroidPluginRunData *m_runData = nullptr;
+    AndroidPluginPrivate *d = nullptr;
 };
 
+} // namespace Internal
 } // namespace Android