diff --git a/src/plugins/valgrind/CMakeLists.txt b/src/plugins/valgrind/CMakeLists.txt
index 192304e5795..dfe2620cae9 100644
--- a/src/plugins/valgrind/CMakeLists.txt
+++ b/src/plugins/valgrind/CMakeLists.txt
@@ -28,7 +28,7 @@ add_qtc_plugin(Valgrind
     valgrind.qrc
     valgrindconfigwidget.cpp valgrindconfigwidget.h
     valgrindengine.cpp valgrindengine.h
-    valgrindplugin.cpp valgrindplugin.h
+    valgrindplugin.cpp
     valgrindrunner.cpp valgrindrunner.h
     valgrindsettings.cpp valgrindsettings.h
     xmlprotocol/announcethread.cpp xmlprotocol/announcethread.h
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 76edbbbbb3f..fc50b2ecf09 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -19,7 +19,6 @@
 #include <valgrind/callgrind/callgrindparser.h>
 #include <valgrind/callgrind/callgrindproxymodel.h>
 #include <valgrind/callgrind/callgrindstackbrowser.h>
-#include <valgrind/valgrindplugin.h>
 #include <valgrind/valgrindsettings.h>
 
 #include <debugger/debuggerconstants.h>
diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs
index e28b42fec0d..f0e117ce98a 100644
--- a/src/plugins/valgrind/valgrind.qbs
+++ b/src/plugins/valgrind/valgrind.qbs
@@ -32,7 +32,7 @@ QtcPlugin {
             "valgrind.qrc",
             "valgrindconfigwidget.cpp", "valgrindconfigwidget.h",
             "valgrindengine.cpp", "valgrindengine.h",
-            "valgrindplugin.cpp", "valgrindplugin.h",
+            "valgrindplugin.cpp",
             "valgrindrunner.cpp", "valgrindrunner.h",
             "valgrindsettings.cpp", "valgrindsettings.h",
             "valgrindtr.h",
diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp
index c6825a4ce9e..fad8db5c980 100644
--- a/src/plugins/valgrind/valgrindplugin.cpp
+++ b/src/plugins/valgrind/valgrindplugin.cpp
@@ -1,35 +1,32 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "valgrindplugin.h"
-
 #include "callgrindtool.h"
 #include "memchecktool.h"
 #include "valgrindconfigwidget.h"
 #include "valgrindsettings.h"
 #include "valgrindtr.h"
 
+#include <coreplugin/dialogs/ioptionspage.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/icore.h>
+
+#include <debugger/analyzer/analyzerrunconfigwidget.h>
+#include <debugger/analyzer/analyzericons.h>
+
+#include <extensionsystem/iplugin.h>
+
+#include <projectexplorer/projectexplorer.h>
+
 #ifdef WITH_TESTS
 #   include "valgrindmemcheckparsertest.h"
 #   include "valgrindtestrunnertest.h"
 #endif
 
-#include <coreplugin/dialogs/ioptionspage.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
-#include <debugger/analyzer/analyzerrunconfigwidget.h>
-#include <debugger/analyzer/analyzericons.h>
-
-#include <projectexplorer/projectexplorer.h>
-
-#include <QCoreApplication>
-#include <QPointer>
-
 using namespace Core;
 using namespace ProjectExplorer;
 
-namespace Valgrind {
-namespace Internal {
+namespace Valgrind::Internal {
 
 class ValgrindRunConfigurationAspect : public GlobalOrProjectAspect
 {
@@ -55,26 +52,30 @@ public:
     ValgrindOptionsPage valgrindOptionsPage;
 };
 
-ValgrindPlugin::~ValgrindPlugin()
+class ValgrindPlugin final : public ExtensionSystem::IPlugin
 {
-    delete d;
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Valgrind.json")
 
-void ValgrindPlugin::initialize()
-{
-    d = new ValgrindPluginPrivate;
+public:
+    ValgrindPlugin() = default;
+    ~ValgrindPlugin() final { delete d; }
 
-    RunConfiguration::registerAspect<ValgrindRunConfigurationAspect>();
-}
+    void initialize() final
+    {
+        d = new ValgrindPluginPrivate;
 
-QVector<QObject *> ValgrindPlugin::createTestObjects() const
-{
-    QVector<QObject *> tests;
+        RunConfiguration::registerAspect<ValgrindRunConfigurationAspect>();
 #ifdef WITH_TESTS
-    tests << new Test::ValgrindMemcheckParserTest << new Test::ValgrindTestRunnerTest;
+        addTest<Test::ValgrindMemcheckParserTest>();
+        addTest<Test::ValgrindTestRunnerTest>();
 #endif
-    return tests;
-}
+    }
 
-} // namespace Internal
-} // namespace Valgrind
+private:
+    class ValgrindPluginPrivate *d = nullptr;
+};
+
+} // Valgrind::Internal
+
+#include "valgrindplugin.moc"
diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h
deleted file mode 100644
index 9c8afda19f0..00000000000
--- a/src/plugins/valgrind/valgrindplugin.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2016 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>
-#include <projectexplorer/projectexplorer.h>
-
-namespace Valgrind::Internal {
-
-class ValgrindPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Valgrind.json")
-
-public:
-    ValgrindPlugin() = default;
-    ~ValgrindPlugin() final;
-
-    void initialize() final;
-
-private:
-    QVector<QObject *> createTestObjects() const override;
-
-    class ValgrindPluginPrivate *d = nullptr;
-};
-
-} // Valgrind::Internal