diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h
index 5f71e3886c8..7042491b869 100644
--- a/src/plugins/android/androidplugin.h
+++ b/src/plugins/android/androidplugin.h
@@ -29,16 +29,12 @@
 
 namespace Android {
 namespace Internal {
-class AndroidPluginPrivate;
+
 class AndroidPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Android.json")
 
-public:
-    AndroidPlugin() = default;
-
-private:
     ~AndroidPlugin() final;
 
     bool initialize(const QStringList &arguments, QString *errorMessage) final;
@@ -46,7 +42,7 @@ private:
 
     void kitsRestored();
 
-    AndroidPluginPrivate *d = nullptr;
+    class AndroidPluginPrivate *d = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
index b18e2767306..5b3643dcd33 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp
@@ -39,7 +39,7 @@
 namespace AutotoolsProjectManager {
 namespace Internal {
 
-class AutotoolsProjectPluginRunData
+class AutotoolsProjectPluginPrivate
 {
 public:
     AutotoolsBuildConfigurationFactory buildConfigurationFactory;
@@ -51,7 +51,7 @@ public:
 
 AutotoolsProjectPlugin::~AutotoolsProjectPlugin()
 {
-    delete m_runData;
+    delete d;
 }
 
 void AutotoolsProjectPlugin::extensionsInitialized()
@@ -63,7 +63,7 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments,
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    m_runData = new AutotoolsProjectPluginRunData;
+    d = new AutotoolsProjectPluginPrivate;
     ProjectExplorer::ProjectManager::registerProjectType<AutotoolsProject>(Constants::MAKEFILE_MIMETYPE);
 
     return true;
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
index 5e710ff0506..dd08cbd1c82 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.h
@@ -60,8 +60,6 @@ namespace Internal {
  *   be executed in the build process)
  */
 
-class AutotoolsProjectPluginRunData;
-
 class AutotoolsProjectPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
@@ -72,7 +70,7 @@ class AutotoolsProjectPlugin : public ExtensionSystem::IPlugin
     void extensionsInitialized() final;
     bool initialize(const QStringList &arguments, QString *errorString) final;
 
-    AutotoolsProjectPluginRunData *m_runData;
+    class AutotoolsProjectPluginPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp
index 302e71ede4f..60afa6f911a 100644
--- a/src/plugins/baremetal/baremetalplugin.cpp
+++ b/src/plugins/baremetal/baremetalplugin.cpp
@@ -46,7 +46,7 @@ using namespace ProjectExplorer;
 namespace BareMetal {
 namespace Internal {
 
-class BareMetalPluginRunData
+class BareMetalPluginPrivate
 {
 public:
     BareMetalDeviceFactory deviceFactory;
@@ -56,14 +56,9 @@ public:
     GdbServerProviderManager gdbServerProviderManager;
 };
 
-BareMetalPlugin::BareMetalPlugin()
-{
-    setObjectName(QLatin1String("BareMetalPlugin"));
-}
-
 BareMetalPlugin::~BareMetalPlugin()
 {
-    delete m_runData;
+    delete d;
 }
 
 bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorString)
@@ -71,7 +66,7 @@ bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorStr
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    m_runData = new BareMetalPluginRunData;
+    d = new BareMetalPluginPrivate;
 
     auto constraint = [](RunConfiguration *runConfig) {
         const QByteArray idStr = runConfig->id().name();
diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h
index 17ecbcc85d9..7824b43a10c 100644
--- a/src/plugins/baremetal/baremetalplugin.h
+++ b/src/plugins/baremetal/baremetalplugin.h
@@ -31,23 +31,17 @@
 namespace BareMetal {
 namespace Internal {
 
-class BareMetalPluginRunData;
-
 class BareMetalPlugin : public ExtensionSystem::IPlugin
 {
    Q_OBJECT
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "BareMetal.json")
 
-public:
-   BareMetalPlugin();
-
-private:
    ~BareMetalPlugin() final;
 
    bool initialize(const QStringList &arguments, QString *errorString) final;
    void extensionsInitialized() final;
 
-   BareMetalPluginRunData *m_runData;
+   class BareMetalPluginPrivate *d;
 };
 
 } // namespace Internal
diff --git a/src/plugins/baremetal/gdbserverprovidermanager.h b/src/plugins/baremetal/gdbserverprovidermanager.h
index 8a6ed109bac..a7a38a6c44d 100644
--- a/src/plugins/baremetal/gdbserverprovidermanager.h
+++ b/src/plugins/baremetal/gdbserverprovidermanager.h
@@ -36,7 +36,7 @@ namespace BareMetal {
 namespace Internal {
 
 class BareMetalPlugin;
-class BareMetalPluginRunData;
+class BareMetalPluginPrivate;
 class GdbServerProvider;
 class GdbServerProviderFactory;
 
@@ -75,7 +75,7 @@ private:
     const QList<GdbServerProviderFactory *> m_factories;
 
     friend class BareMetalPlugin; // for restoreProviders
-    friend class BareMetalPluginRunData; // for constructor
+    friend class BareMetalPluginPrivate; // for constructor
     friend class GdbServerProvider;
 };
 
diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h
index 8db7761c2cb..14460d8287d 100644
--- a/src/plugins/bineditor/bineditorplugin.h
+++ b/src/plugins/bineditor/bineditorplugin.h
@@ -38,8 +38,6 @@ class BinEditorPlugin : public ExtensionSystem::IPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "BinEditor.json")
 
-public:
-    BinEditorPlugin() = default;
     ~BinEditorPlugin() override;
 
     bool initialize(const QStringList &arguments, QString *errorMessage) final;
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 344313d8f0b..dcba2a66d16 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -54,10 +54,10 @@ using namespace Bookmarks::Constants;
 namespace Bookmarks {
 namespace Internal {
 
-class BookmarksPluginRunData : public QObject
+class BookmarksPluginPrivate : public QObject
 {
 public:
-    BookmarksPluginRunData();
+    BookmarksPluginPrivate();
 
     void updateActions(bool enableToggle, int stateMask);
     void editorOpened(Core::IEditor *editor);
@@ -84,16 +84,16 @@ public:
 
 BookmarksPlugin::~BookmarksPlugin()
 {
-    delete m_runData;
+    delete d;
 }
 
 bool BookmarksPlugin::initialize(const QStringList &, QString *)
 {
-    m_runData = new BookmarksPluginRunData;
+    d = new BookmarksPluginPrivate;
     return true;
 }
 
-BookmarksPluginRunData::BookmarksPluginRunData()
+BookmarksPluginPrivate::BookmarksPluginPrivate()
     : m_bookmarkFilter(&m_bookmarkManager)
     , m_bookmarkViewFactory(&m_bookmarkManager)
 {
@@ -162,7 +162,7 @@ BookmarksPluginRunData::BookmarksPluginRunData()
     });
 
     connect(&m_bookmarkManager, &BookmarkManager::updateActions,
-            this, &BookmarksPluginRunData::updateActions);
+            this, &BookmarksPluginPrivate::updateActions);
     updateActions(false, m_bookmarkManager.state());
 
     connect(&m_bookmarkMarginAction, &QAction::triggered, this, [this] {
@@ -171,12 +171,12 @@ BookmarksPluginRunData::BookmarksPluginRunData()
 
     // EditorManager
     connect(EditorManager::instance(), &EditorManager::editorAboutToClose,
-        this, &BookmarksPluginRunData::editorAboutToClose);
+        this, &BookmarksPluginPrivate::editorAboutToClose);
     connect(EditorManager::instance(), &EditorManager::editorOpened,
-        this, &BookmarksPluginRunData::editorOpened);
+        this, &BookmarksPluginPrivate::editorOpened);
 }
 
-void BookmarksPluginRunData::updateActions(bool enableToggle, int state)
+void BookmarksPluginPrivate::updateActions(bool enableToggle, int state)
 {
     const bool hasbm    = state >= BookmarkManager::HasBookMarks;
     const bool hasdocbm = state == BookmarkManager::HasBookmarksInDocument;
@@ -188,7 +188,7 @@ void BookmarksPluginRunData::updateActions(bool enableToggle, int state)
     m_docNextAction.setEnabled(hasdocbm);
 }
 
-void BookmarksPluginRunData::editorOpened(IEditor *editor)
+void BookmarksPluginPrivate::editorOpened(IEditor *editor)
 {
     if (auto widget = qobject_cast<TextEditorWidget *>(editor->widget())) {
         connect(widget, &TextEditorWidget::markRequested,
@@ -198,19 +198,19 @@ void BookmarksPluginRunData::editorOpened(IEditor *editor)
                 });
 
         connect(widget, &TextEditorWidget::markContextMenuRequested,
-                this, &BookmarksPluginRunData::requestContextMenu);
+                this, &BookmarksPluginPrivate::requestContextMenu);
     }
 }
 
-void BookmarksPluginRunData::editorAboutToClose(IEditor *editor)
+void BookmarksPluginPrivate::editorAboutToClose(IEditor *editor)
 {
     if (auto widget = qobject_cast<TextEditorWidget *>(editor->widget())) {
         disconnect(widget, &TextEditorWidget::markContextMenuRequested,
-                   this, &BookmarksPluginRunData::requestContextMenu);
+                   this, &BookmarksPluginPrivate::requestContextMenu);
     }
 }
 
-void BookmarksPluginRunData::requestContextMenu(TextEditorWidget *widget,
+void BookmarksPluginPrivate::requestContextMenu(TextEditorWidget *widget,
     int lineNumber, QMenu *menu)
 {
     if (widget->textDocument()->isTemporary())
diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h
index 348bbd2328b..2d97e823fff 100644
--- a/src/plugins/bookmarks/bookmarksplugin.h
+++ b/src/plugins/bookmarks/bookmarksplugin.h
@@ -30,22 +30,17 @@
 namespace Bookmarks {
 namespace Internal {
 
-class BookmarksPluginRunData;
-
 class BookmarksPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Bookmarks.json")
 
-public:
-    BookmarksPlugin() = default;
     ~BookmarksPlugin() final;
 
-private:
     bool initialize(const QStringList &arguments, QString *errorMessage) final;
     void extensionsInitialized() final {}
 
-    BookmarksPluginRunData *m_runData = nullptr;
+    class BookmarksPluginPrivate *d = nullptr;
 };
 
 } // namespace Internal
diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp
index d1251c75f22..932234f9822 100644
--- a/src/plugins/clangformat/clangformatplugin.cpp
+++ b/src/plugins/clangformat/clangformatplugin.cpp
@@ -65,9 +65,6 @@ using namespace ProjectExplorer;
 
 namespace ClangFormat {
 
-ClangFormatPlugin::ClangFormatPlugin() = default;
-ClangFormatPlugin::~ClangFormatPlugin() = default;
-
 #ifdef KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED
 class ClangFormatStyleFactory : public CppTools::CppCodeStylePreferencesFactory
 {
diff --git a/src/plugins/clangformat/clangformatplugin.h b/src/plugins/clangformat/clangformatplugin.h
index e8c81179a00..c453f7c6f61 100644
--- a/src/plugins/clangformat/clangformatplugin.h
+++ b/src/plugins/clangformat/clangformatplugin.h
@@ -34,11 +34,6 @@ class ClangFormatPlugin : public ExtensionSystem::IPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "ClangFormat.json")
 
-public:
-    ClangFormatPlugin();
-    ~ClangFormatPlugin();
-
-private:
     bool initialize(const QStringList &arguments, QString *errorString) final;
     void extensionsInitialized() final {}
 };
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
index 4652078d746..c8a50219f41 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.h
@@ -26,8 +26,9 @@
 #pragma once
 
 #include "cmakespecificsettingspage.h"
+
 #include <extensionsystem/iplugin.h>
-#include <memory>
+
 namespace CMakeProjectManager {
 namespace Internal {