diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index a1a3666c504..2877a027f7e 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -26,7 +26,6 @@
 #include "qmlprojectplugin.h"
 #include "qmlproject.h"
 #include "qmlprojectrunconfigurationfactory.h"
-#include "fileformat/qmlprojectfileformat.h"
 
 #include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
@@ -35,18 +34,10 @@
 
 #include <qmljstools/qmljstoolsconstants.h>
 
-#include <QtPlugin>
-
-#include <QApplication>
-#include <QMessageBox>
-#include <QPushButton>
-
 using namespace ProjectExplorer;
 
 namespace QmlProjectManager {
-
-QmlProjectPlugin::QmlProjectPlugin()
-{ }
+namespace Internal {
 
 QmlProjectPlugin::~QmlProjectPlugin()
 {
@@ -56,15 +47,12 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 {
     Q_UNUSED(errorMessage)
 
-    addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
+    new Internal::QmlProjectRunConfigurationFactory(this);
 
     ProjectManager::registerProjectType<QmlProject>(QmlJSTools::Constants::QMLPROJECT_MIMETYPE);
     Core::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject");
     return true;
 }
 
-void QmlProjectPlugin::extensionsInitialized()
-{
-}
-
+} // namespace Internal
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.h b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
index 52065a3b86f..521840c3a62 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.h
@@ -25,23 +25,24 @@
 
 #pragma once
 
-#include "qmlprojectmanager_global.h"
-
 #include <extensionsystem/iplugin.h>
 
 namespace QmlProjectManager {
+namespace Internal {
 
-class QMLPROJECTMANAGER_EXPORT QmlProjectPlugin: public ExtensionSystem::IPlugin
+class QmlProjectPlugin: public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "QmlProjectManager.json")
 
 public:
-    QmlProjectPlugin();
-    ~QmlProjectPlugin();
+    QmlProjectPlugin() = default;
+    ~QmlProjectPlugin() final;
 
-    virtual bool initialize(const QStringList &arguments, QString *errorString);
-    virtual void extensionsInitialized();
+private:
+    bool initialize(const QStringList &arguments, QString *errorString) final;
+    void extensionsInitialized() final {}
 };
 
+} // namespace Internal
 } // namespace QmlProject