diff --git a/src/plugins/bazaar/CMakeLists.txt b/src/plugins/bazaar/CMakeLists.txt
index c6341d71937..b81816ce14a 100644
--- a/src/plugins/bazaar/CMakeLists.txt
+++ b/src/plugins/bazaar/CMakeLists.txt
@@ -5,7 +5,7 @@ add_qtc_plugin(Bazaar
     bazaarclient.cpp bazaarclient.h
     bazaarcommitwidget.cpp bazaarcommitwidget.h
     bazaareditor.cpp bazaareditor.h
-    bazaarplugin.cpp bazaarplugin.h
+    bazaarplugin.cpp
     bazaarsettings.cpp bazaarsettings.h
     bazaartr.h
     branchinfo.cpp branchinfo.h
diff --git a/src/plugins/bazaar/bazaar.qbs b/src/plugins/bazaar/bazaar.qbs
index 2bbfbf84742..156550be9fe 100644
--- a/src/plugins/bazaar/bazaar.qbs
+++ b/src/plugins/bazaar/bazaar.qbs
@@ -20,7 +20,6 @@ QtcPlugin {
         "bazaareditor.cpp",
         "bazaareditor.h",
         "bazaarplugin.cpp",
-        "bazaarplugin.h",
         "bazaarsettings.cpp",
         "bazaarsettings.h",
         "bazaartr.h",
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 1c12f5ff56b..e2928ab0f53 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 Hugues Delorme
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "bazaarplugin.h"
-
 #include "bazaarclient.h"
 #include "bazaarcommitwidget.h"
 #include "bazaareditor.h"
@@ -22,6 +20,8 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/locator/commandlocator.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <utils/commandline.h>
 #include <utils/environment.h>
 #include <utils/layoutbuilder.h>
@@ -320,22 +320,6 @@ private:
     QLineEdit *revisionLineEdit;
 };
 
-BazaarPlugin::~BazaarPlugin()
-{
-    delete d;
-    d = nullptr;
-}
-
-void BazaarPlugin::initialize()
-{
-    d = new BazaarPluginPrivate;
-}
-
-void BazaarPlugin::extensionsInitialized()
-{
-    d->extensionsInitialized();
-}
-
 BazaarPluginPrivate::BazaarPluginPrivate()
     : VcsBasePluginPrivate(Context(Constants::BAZAAR_CONTEXT))
 {
@@ -728,6 +712,38 @@ void BazaarPluginPrivate::diffFromEditorSelected(const QStringList &files)
     m_client.diff(m_submitRepository, files);
 }
 
+class BazaarPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Bazaar.json")
+
+    ~BazaarPlugin() final
+    {
+        delete d;
+        d = nullptr;
+    }
+
+    void initialize() final
+    {
+        d = new BazaarPluginPrivate;
+    }
+
+    void extensionsInitialized() final
+    {
+        d->extensionsInitialized();
+    }
+
+#ifdef WITH_TESTS
+private slots:
+    void testDiffFileResolving_data();
+    void testDiffFileResolving();
+    void testLogResolving();
+#endif
+
+private:
+    BazaarPluginPrivate *d = nullptr;
+};
+
 #ifdef WITH_TESTS
 
 void BazaarPlugin::testDiffFileResolving_data()
@@ -975,3 +991,5 @@ void BazaarPluginPrivate::changed(const QVariant &v)
 }
 
 } // Bazaar::Internal
+
+#include "bazaarplugin.moc"
diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h
deleted file mode 100644
index 34a42ca9ae3..00000000000
--- a/src/plugins/bazaar/bazaarplugin.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2016 Hugues Delorme
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace Bazaar::Internal {
-
-class BazaarPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Bazaar.json")
-
-    ~BazaarPlugin() final;
-
-    void initialize() final;
-    void extensionsInitialized() final;
-
-#ifdef WITH_TESTS
-private slots:
-    void testDiffFileResolving_data();
-    void testDiffFileResolving();
-    void testLogResolving();
-#endif
-
-private:
-    class BazaarPluginPrivate *d = nullptr;
-};
-
-} // Bazaar::Internal