diff --git a/src/plugins/cppcheck/CMakeLists.txt b/src/plugins/cppcheck/CMakeLists.txt
index fb1aea634cc..6404ee1087c 100644
--- a/src/plugins/cppcheck/CMakeLists.txt
+++ b/src/plugins/cppcheck/CMakeLists.txt
@@ -8,7 +8,7 @@ add_qtc_plugin(Cppcheck
     cppcheckdiagnosticsmodel.cpp cppcheckdiagnosticsmodel.h
     cppcheckdiagnosticview.cpp cppcheckdiagnosticview.h
     cppcheckmanualrundialog.cpp cppcheckmanualrundialog.h
-    cppcheckplugin.cpp cppcheckplugin.h
+    cppcheckplugin.cpp
     cppcheckrunner.cpp cppcheckrunner.h
     cppchecksettings.cpp cppchecksettings.h
     cppchecktextmark.cpp cppchecktextmark.h
diff --git a/src/plugins/cppcheck/cppcheck.qbs b/src/plugins/cppcheck/cppcheck.qbs
index f1a8026fedb..86510243bc0 100644
--- a/src/plugins/cppcheck/cppcheck.qbs
+++ b/src/plugins/cppcheck/cppcheck.qbs
@@ -24,7 +24,6 @@ QtcPlugin {
         "cppcheckmanualrundialog.cpp",
         "cppcheckmanualrundialog.h",
         "cppcheckplugin.cpp",
-        "cppcheckplugin.h",
         "cppcheckrunner.cpp",
         "cppcheckrunner.h",
         "cppchecksettings.cpp",
diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp
index 56e8bb1d1fe..496d9af6cd7 100644
--- a/src/plugins/cppcheck/cppcheckplugin.cpp
+++ b/src/plugins/cppcheck/cppcheckplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2018 Sergey Morozov
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "cppcheckplugin.h"
-
 #include "cppcheckconstants.h"
 #include "cppcheckdiagnosticview.h"
 #include "cppchecksettings.h"
@@ -13,6 +11,14 @@
 #include "cppcheckdiagnosticsmodel.h"
 #include "cppcheckmanualrundialog.h"
 
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+
+#include <debugger/analyzer/analyzerconstants.h>
+#include <debugger/debuggermainwindow.h>
+
+#include <extensionsystem/iplugin.h>
+
 #include <projectexplorer/kitaspects.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -20,12 +26,6 @@
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
 
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-
-#include <debugger/analyzer/analyzerconstants.h>
-#include <debugger/debuggermainwindow.h>
-
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
@@ -139,30 +139,36 @@ void CppcheckPluginPrivate::updateManualRunAction()
     manualRunAction->setEnabled(canRun);
 }
 
-CppcheckPlugin::CppcheckPlugin() = default;
-
-CppcheckPlugin::~CppcheckPlugin() = default;
-
-void CppcheckPlugin::initialize()
+class CppcheckPlugin final : public ExtensionSystem::IPlugin
 {
-    d.reset(new CppcheckPluginPrivate);
-
-    using namespace Core;
-    ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Cppcheck.json")
 
+    void initialize() final
     {
-        auto action = new QAction(Tr::tr("Cppcheck..."), this);
-        menu->addAction(ActionManager::registerAction(action, Constants::MANUAL_RUN_ACTION),
-                        Debugger::Constants::G_ANALYZER_TOOLS);
-        connect(action, &QAction::triggered,
-                d.get(), &CppcheckPluginPrivate::startManualRun);
-        d->manualRunAction = action;
+        d.reset(new CppcheckPluginPrivate);
+
+        using namespace Core;
+        ActionContainer *menu = ActionManager::actionContainer(Debugger::Constants::M_DEBUG_ANALYZER);
+
+        {
+            auto action = new QAction(Tr::tr("Cppcheck..."), this);
+            menu->addAction(ActionManager::registerAction(action, Constants::MANUAL_RUN_ACTION),
+                            Debugger::Constants::G_ANALYZER_TOOLS);
+            connect(action, &QAction::triggered,
+                    d.get(), &CppcheckPluginPrivate::startManualRun);
+            d->manualRunAction = action;
+        }
+
+        using ProjectExplorer::ProjectExplorerPlugin;
+        connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
+                d.get(), &CppcheckPluginPrivate::updateManualRunAction);
+        d->updateManualRunAction();
     }
 
-    using ProjectExplorer::ProjectExplorerPlugin;
-    connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::runActionsUpdated,
-            d.get(), &CppcheckPluginPrivate::updateManualRunAction);
-    d->updateManualRunAction();
-}
+    std::unique_ptr<CppcheckPluginPrivate> d;
+};
 
 } // Cppcheck::Internal
+
+#include "cppcheckplugin.moc"
diff --git a/src/plugins/cppcheck/cppcheckplugin.h b/src/plugins/cppcheck/cppcheckplugin.h
deleted file mode 100644
index d6911b56389..00000000000
--- a/src/plugins/cppcheck/cppcheckplugin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2018 Sergey Morozov
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-#include <memory>
-
-namespace Cppcheck::Internal {
-
-class CppcheckPluginPrivate;
-
-class CppcheckPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Cppcheck.json")
-
-public:
-    CppcheckPlugin();
-    ~CppcheckPlugin() override;
-
-private:
-    void initialize() final;
-
-    std::unique_ptr<CppcheckPluginPrivate> d;
-};
-
-} // Cppcheck