diff --git a/src/plugins/effectmakernew/CMakeLists.txt b/src/plugins/effectmakernew/CMakeLists.txt
index 4c1474d8eb7..bd7b0f723f4 100644
--- a/src/plugins/effectmakernew/CMakeLists.txt
+++ b/src/plugins/effectmakernew/CMakeLists.txt
@@ -6,7 +6,7 @@ add_qtc_plugin(EffectMakerNew
     Qt::Core Qt::CorePrivate Qt::Widgets Qt::Qml Qt::QmlPrivate Qt::Quick
     QtCreator::Utils
   SOURCES
-    effectmakerplugin.cpp effectmakerplugin.h
+    effectmakerplugin.cpp
     effectmakerwidget.cpp effectmakerwidget.h
     effectmakerview.cpp effectmakerview.h
     effectmakermodel.cpp effectmakermodel.h
diff --git a/src/plugins/effectmakernew/effectmakerplugin.cpp b/src/plugins/effectmakernew/effectmakerplugin.cpp
index 3890d3c9d65..7c8cc08ad2f 100644
--- a/src/plugins/effectmakernew/effectmakerplugin.cpp
+++ b/src/plugins/effectmakernew/effectmakerplugin.cpp
@@ -1,46 +1,31 @@
 // Copyright (C) 2023 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "effectmakerplugin.h"
-
 #include "effectmakerview.h"
 
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icore.h>
-#include <coreplugin/imode.h>
-#include <coreplugin/modemanager.h>
-#include <coreplugin/messagemanager.h>
-#include <coreplugin/externaltool.h>
-#include <coreplugin/externaltoolmanager.h>
+#include <extensionsystem/iplugin.h>
 
-#include <componentcore_constants.h>
-#include <designeractionmanager.h>
 #include <viewmanager.h>
-#include <qmldesigner/dynamiclicensecheck.h>
 #include <qmldesignerplugin.h>
-#include <modelnodeoperations.h>
-
-#include <QJsonDocument>
-#include <QMap>
 
 namespace EffectMaker {
 
-bool EffectMakerPlugin::delayedInitialize()
+class EffectMakerPlugin final : public ExtensionSystem::IPlugin
 {
-    if (m_delayedInitialized)
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "EffectMakerNew.json")
+
+    bool delayedInitialize() final
+    {
+        auto designerPlugin = QmlDesigner::QmlDesignerPlugin::instance();
+        auto &viewManager = designerPlugin->viewManager();
+        viewManager.registerView(std::make_unique<EffectMakerView>(
+            QmlDesigner::QmlDesignerPlugin::externalDependenciesForPluginInitializationOnly()));
+
         return true;
-
-    auto *designerPlugin = QmlDesigner::QmlDesignerPlugin::instance();
-    auto &viewManager = designerPlugin->viewManager();
-    viewManager.registerView(std::make_unique<EffectMakerView>(
-        QmlDesigner::QmlDesignerPlugin::externalDependenciesForPluginInitializationOnly()));
-
-    m_delayedInitialized = true;
-
-    return true;
-}
+    }
+};
 
 } // namespace EffectMaker
 
+#include "effectmakerplugin.moc"
diff --git a/src/plugins/effectmakernew/effectmakerplugin.h b/src/plugins/effectmakernew/effectmakerplugin.h
deleted file mode 100644
index 116115629e5..00000000000
--- a/src/plugins/effectmakernew/effectmakerplugin.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) 2023 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 <utils/process.h>
-
-namespace Core {
-class ActionContainer;
-class ExternalTool;
-}
-
-namespace EffectMaker {
-
-class EffectMakerPlugin : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "EffectMakerNew.json")
-
-public:
-    EffectMakerPlugin() {}
-    ~EffectMakerPlugin() override {}
-
-    bool delayedInitialize() override;
-
-private:
-    bool m_delayedInitialized = false;
-};
-
-} // namespace EffectMaker
-