diff --git a/src/plugins/axivion/axivionoutputpane.cpp b/src/plugins/axivion/axivionoutputpane.cpp
index 6e7836af8e5..9711dadb8ff 100644
--- a/src/plugins/axivion/axivionoutputpane.cpp
+++ b/src/plugins/axivion/axivionoutputpane.cpp
@@ -94,7 +94,7 @@ void DashboardWidget::updateUi()
         delete child->widget();
         delete child;
     }
-    std::shared_ptr<const DashboardClient::ProjectInfo> projectInfo = AxivionPlugin::projectInfo();
+    std::shared_ptr<const DashboardClient::ProjectInfo> projectInfo = Internal::projectInfo();
     if (!projectInfo)
         return;
     const Dto::ProjectInfoDto &info = projectInfo->data;
diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp
index df153e1503c..a5a5e8979b5 100644
--- a/src/plugins/axivion/axivionplugin.cpp
+++ b/src/plugins/axivion/axivionplugin.cpp
@@ -17,6 +17,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 
+#include <extensionsystem/iplugin.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <projectexplorer/buildsystem.h>
@@ -98,35 +99,13 @@ AxivionTextMark::AxivionTextMark(const Utils::FilePath &filePath, const ShortIss
     });
 }
 
-AxivionPlugin::~AxivionPlugin()
-{
-    AxivionProjectSettings::destroyProjectSettings();
-    delete dd;
-    dd = nullptr;
-}
-
-void AxivionPlugin::initialize()
-{
-    dd = new AxivionPluginPrivate;
-
-    AxivionProjectSettings::setupProjectPanel();
-
-    connect(ProjectExplorer::ProjectManager::instance(),
-            &ProjectExplorer::ProjectManager::startupProjectChanged,
-            dd, &AxivionPluginPrivate::onStartupProjectChanged);
-    connect(Core::EditorManager::instance(), &Core::EditorManager::documentOpened,
-            dd, &AxivionPluginPrivate::onDocumentOpened);
-    connect(Core::EditorManager::instance(), &Core::EditorManager::documentClosed,
-            dd, &AxivionPluginPrivate::onDocumentClosed);
-}
-
-void AxivionPlugin::fetchProjectInfo(const QString &projectName)
+void fetchProjectInfo(const QString &projectName)
 {
     QTC_ASSERT(dd, return);
     dd->fetchProjectInfo(projectName);
 }
 
-std::shared_ptr<const DashboardClient::ProjectInfo> AxivionPlugin::projectInfo()
+std::shared_ptr<const DashboardClient::ProjectInfo> projectInfo()
 {
     QTC_ASSERT(dd, return {});
     return dd->m_currentProjectInfo;
@@ -134,7 +113,7 @@ std::shared_ptr<const DashboardClient::ProjectInfo> AxivionPlugin::projectInfo()
 
 // FIXME: extend to give some details?
 // FIXME: move when curl is no more in use?
-bool AxivionPlugin::handleCertificateIssue()
+bool handleCertificateIssue()
 {
     QTC_ASSERT(dd, return false);
     const QString serverHost = QUrl(settings().server.dashboard).host();
@@ -170,7 +149,7 @@ void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSs
     };
     if (Utils::allOf(errors,
                      [&accepted](const QSslError &e) { return accepted.contains(e.error()); })) {
-        if (!settings().server.validateCert || AxivionPlugin::handleCertificateIssue())
+        if (!settings().server.validateCert || handleCertificateIssue())
             reply->ignoreSslErrors(errors);
     }
 #else // ssl
@@ -334,4 +313,34 @@ void AxivionPluginPrivate::handleIssuesForFile(const IssuesList &issues)
     }
 }
 
+class AxivionPlugin final : public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Axivion.json")
+
+    ~AxivionPlugin() final
+    {
+        AxivionProjectSettings::destroyProjectSettings();
+        delete dd;
+        dd = nullptr;
+    }
+
+    void initialize() final
+    {
+        dd = new AxivionPluginPrivate;
+
+        AxivionProjectSettings::setupProjectPanel();
+
+        connect(ProjectExplorer::ProjectManager::instance(),
+                &ProjectExplorer::ProjectManager::startupProjectChanged,
+                dd, &AxivionPluginPrivate::onStartupProjectChanged);
+        connect(Core::EditorManager::instance(), &Core::EditorManager::documentOpened,
+                dd, &AxivionPluginPrivate::onDocumentOpened);
+        connect(Core::EditorManager::instance(), &Core::EditorManager::documentClosed,
+                dd, &AxivionPluginPrivate::onDocumentClosed);
+    }
+};
+
 } // Axivion::Internal
+
+#include "axivionplugin.moc"
diff --git a/src/plugins/axivion/axivionplugin.h b/src/plugins/axivion/axivionplugin.h
index 380b8630f61..52c2062367a 100644
--- a/src/plugins/axivion/axivionplugin.h
+++ b/src/plugins/axivion/axivionplugin.h
@@ -5,34 +5,15 @@
 
 #include "dashboard/dashboardclient.h"
 
-#include <extensionsystem/iplugin.h>
-
 #include <memory>
 
 namespace ProjectExplorer { class Project; }
 
 namespace Axivion::Internal {
 
-class AxivionProjectSettings;
-class ProjectInfo;
-
-class AxivionPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Axivion.json")
-
-public:
-    AxivionPlugin() {}
-    ~AxivionPlugin() final;
-
-    static void fetchProjectInfo(const QString &projectName);
-    static std::shared_ptr<const DashboardClient::ProjectInfo> projectInfo();
-    static bool handleCertificateIssue();
-
-private:
-    void initialize() final;
-    void extensionsInitialized() final {}
-};
+void fetchProjectInfo(const QString &projectName);
+std::shared_ptr<const DashboardClient::ProjectInfo> projectInfo();
+bool handleCertificateIssue();
 
 } // Axivion::Internal
 
diff --git a/src/plugins/axivion/axivionprojectsettings.cpp b/src/plugins/axivion/axivionprojectsettings.cpp
index a06a411aad8..706da8023e1 100644
--- a/src/plugins/axivion/axivionprojectsettings.cpp
+++ b/src/plugins/axivion/axivionprojectsettings.cpp
@@ -207,7 +207,7 @@ void AxivionProjectSettingsWidget::linkProject()
     const QString projectName = selected.first()->text(0);
     m_projectSettings->setDashboardProjectName(projectName);
     updateUi();
-    AxivionPlugin::fetchProjectInfo(projectName);
+    fetchProjectInfo(projectName);
 }
 
 void AxivionProjectSettingsWidget::unlinkProject()
@@ -216,7 +216,7 @@ void AxivionProjectSettingsWidget::unlinkProject()
 
     m_projectSettings->setDashboardProjectName({});
     updateUi();
-    AxivionPlugin::fetchProjectInfo({});
+    fetchProjectInfo({});
 }
 
 void AxivionProjectSettingsWidget::updateUi()
diff --git a/src/plugins/axivion/axivionquery.cpp b/src/plugins/axivion/axivionquery.cpp
index 13f18229087..59dc73c71b4 100644
--- a/src/plugins/axivion/axivionquery.cpp
+++ b/src/plugins/axivion/axivionquery.cpp
@@ -70,7 +70,7 @@ AxivionQueryRunner::AxivionQueryRunner(const AxivionQuery &query, QObject *paren
             const int exitCode = m_process.exitCode();
             if (m_process.exitStatus() == QProcess::NormalExit
                     && (exitCode == 35 || exitCode == 60)
-                    && AxivionPlugin::handleCertificateIssue()) {
+                    && handleCertificateIssue()) {
                 // prepend -k for re-requesting same query
                 CommandLine cmdline = m_process.commandLine();
                 cmdline.prependArgs({"-k"});