diff --git a/src/plugins/boot2qt/CMakeLists.txt b/src/plugins/boot2qt/CMakeLists.txt
index 156150422b6..26002e6fee7 100644
--- a/src/plugins/boot2qt/CMakeLists.txt
+++ b/src/plugins/boot2qt/CMakeLists.txt
@@ -9,7 +9,7 @@ add_qtc_plugin(Boot2Qt
     qdbdevice.cpp qdbdevice.h
     qdbdevicedebugsupport.cpp qdbdevicedebugsupport.h
     qdbmakedefaultappstep.cpp qdbmakedefaultappstep.h
-    qdbplugin.cpp qdbplugin.h
+    qdbplugin.cpp
     qdbqtversion.cpp qdbqtversion.h
     qdbrunconfiguration.cpp qdbrunconfiguration.h
     qdbstopapplicationstep.cpp qdbstopapplicationstep.h
diff --git a/src/plugins/boot2qt/boot2qt.qbs b/src/plugins/boot2qt/boot2qt.qbs
index 6be777e17c1..77aa8a0296b 100644
--- a/src/plugins/boot2qt/boot2qt.qbs
+++ b/src/plugins/boot2qt/boot2qt.qbs
@@ -28,7 +28,6 @@ QtcPlugin {
             "qdbmakedefaultappstep.cpp",
             "qdbmakedefaultappstep.h",
             "qdbplugin.cpp",
-            "qdbplugin.h",
             "qdbstopapplicationstep.cpp",
             "qdbstopapplicationstep.h",
             "qdbtr.h",
diff --git a/src/plugins/boot2qt/qdbplugin.cpp b/src/plugins/boot2qt/qdbplugin.cpp
index ec61e7c33a7..df1b5458f32 100644
--- a/src/plugins/boot2qt/qdbplugin.cpp
+++ b/src/plugins/boot2qt/qdbplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2019 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "qdbplugin.h"
-
 #include "device-detection/devicedetector.h"
 #include "qdbconstants.h"
 #include "qdbdevice.h"
@@ -18,10 +16,10 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/icore.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/devicesupport/devicemanager.h>
-#include <projectexplorer/kitaspects.h>
-#include <projectexplorer/kitmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
@@ -30,12 +28,9 @@
 
 #include <remotelinux/remotelinux_constants.h>
 
-#include <utils/fileutils.h>
 #include <utils/hostosinfo.h>
 #include <utils/process.h>
 
-#include <QAction>
-
 using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
@@ -124,10 +119,10 @@ public:
     }
 };
 
-class QdbPluginPrivate : public QObject
+class QdbPluginPrivate final : public QObject
 {
 public:
-    void setupDeviceDetection();
+    void setupDeviceDetection() { m_deviceDetector.start(); }
 
     QdbLinuxDeviceFactory m_qdbDeviceFactory;
     QdbQtVersionFactory m_qtVersionFactory;
@@ -153,39 +148,43 @@ public:
     DeviceDetector m_deviceDetector;
 };
 
-QdbPlugin::~QdbPlugin()
+class QdbPlugin final : public ExtensionSystem::IPlugin
 {
-    delete d;
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Boot2Qt.json")
 
-void QdbPlugin::initialize()
-{
-    d = new QdbPluginPrivate;
+public:
+    ~QdbPlugin() final { delete d; }
 
-    registerFlashAction(this);
-}
+private:
+    void initialize() final
+    {
+        d = new QdbPluginPrivate;
 
-void QdbPlugin::extensionsInitialized()
-{
-    DeviceManager * const dm = DeviceManager::instance();
-    if (dm->isLoaded()) {
-        d->setupDeviceDetection();
-    } else {
-        connect(dm, &DeviceManager::devicesLoaded,
-                d, &QdbPluginPrivate::setupDeviceDetection);
+        registerFlashAction(this);
     }
-}
 
-ExtensionSystem::IPlugin::ShutdownFlag QdbPlugin::aboutToShutdown()
-{
-    d->m_deviceDetector.stop();
+    void extensionsInitialized() final
+    {
+        DeviceManager * const dm = DeviceManager::instance();
+        if (dm->isLoaded()) {
+            d->setupDeviceDetection();
+        } else {
+            connect(dm, &DeviceManager::devicesLoaded,
+                    d, &QdbPluginPrivate::setupDeviceDetection);
+        }
+    }
 
-    return SynchronousShutdown;
-}
+    ShutdownFlag aboutToShutdown() final
+    {
+        d->m_deviceDetector.stop();
 
-void QdbPluginPrivate::setupDeviceDetection()
-{
-    m_deviceDetector.start();
-}
+        return SynchronousShutdown;
+    }
+
+    class QdbPluginPrivate *d = nullptr;
+};
 
 } // Qdb::Internal
+
+#include "qdbplugin.moc"
diff --git a/src/plugins/boot2qt/qdbplugin.h b/src/plugins/boot2qt/qdbplugin.h
deleted file mode 100644
index 0f2b75a8ac3..00000000000
--- a/src/plugins/boot2qt/qdbplugin.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace Qdb::Internal {
-
-class QdbPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Boot2Qt.json")
-
-public:
-    QdbPlugin() = default;
-    ~QdbPlugin() final;
-
-private:
-    void initialize() final;
-    void extensionsInitialized() final;
-    ShutdownFlag aboutToShutdown() final;
-
-    class QdbPluginPrivate *d = nullptr;
-};
-
-} // Qdb::Internal