diff --git a/src/plugins/qnx/CMakeLists.txt b/src/plugins/qnx/CMakeLists.txt
index 56acc26a3a0..66dd7058770 100644
--- a/src/plugins/qnx/CMakeLists.txt
+++ b/src/plugins/qnx/CMakeLists.txt
@@ -3,7 +3,6 @@ add_qtc_plugin(Qnx
   PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport RemoteLinux
   SOURCES
     qnx.qrc
-    qnx_export.h
     qnxanalyzesupport.cpp qnxanalyzesupport.h
     qnxconfiguration.cpp qnxconfiguration.h
     qnxconfigurationmanager.cpp qnxconfigurationmanager.h
@@ -15,7 +14,7 @@ add_qtc_plugin(Qnx
     qnxdeviceprocesssignaloperation.cpp qnxdeviceprocesssignaloperation.h
     qnxdevicetester.cpp qnxdevicetester.h
     qnxdevicewizard.cpp qnxdevicewizard.h
-    qnxplugin.cpp qnxplugin.h
+    qnxplugin.cpp
     qnxqtversion.cpp qnxqtversion.h
     qnxrunconfiguration.cpp qnxrunconfiguration.h
     qnxsettingspage.cpp qnxsettingspage.h
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 22cee3158b7..0389f542a65 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -44,14 +44,12 @@ QtcPlugin {
         "qnxversionnumber.cpp",
         "qnxversionnumber.h",
         "qnxplugin.cpp",
-        "qnxplugin.h",
         "qnxqtversion.cpp",
         "qnxqtversion.h",
         "qnxrunconfiguration.cpp",
         "qnxrunconfiguration.h",
         "qnxutils.cpp",
         "qnxutils.h",
-        "qnx_export.h",
         "slog2inforunner.cpp",
         "slog2inforunner.h",
     ]
diff --git a/src/plugins/qnx/qnx_export.h b/src/plugins/qnx/qnx_export.h
deleted file mode 100644
index 7b9993fa71f..00000000000
--- a/src/plugins/qnx/qnx_export.h
+++ /dev/null
@@ -1,12 +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 <qglobal.h>
-
-#if defined(QNX_LIBRARY)
-#  define QNX_EXPORT Q_DECL_EXPORT
-#else
-#  define QNX_EXPORT Q_DECL_IMPORT
-#endif
diff --git a/src/plugins/qnx/qnxdevice.h b/src/plugins/qnx/qnxdevice.h
index 1749fa2d67f..f4efa3e1f25 100644
--- a/src/plugins/qnx/qnxdevice.h
+++ b/src/plugins/qnx/qnxdevice.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "qnx_export.h"
-
 #include <remotelinux/linuxdevice.h>
 
 namespace Qnx::Internal {
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index 5b5f8890320..e29b248bcaf 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -1,8 +1,6 @@
 // Copyright (C) 2016 BlackBerry Limited. All rights reserved.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
-#include "qnxplugin.h"
-
 #include "qnxanalyzesupport.h"
 #include "qnxconfigurationmanager.h"
 #include "qnxconstants.h"
@@ -20,6 +18,8 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
 
+#include <extensionsystem/iplugin.h>
+
 #include <projectexplorer/devicesupport/devicecheckbuildstep.h>
 #include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/kitinformation.h>
@@ -36,8 +36,6 @@
 #include <remotelinux/makeinstallstep.h>
 #include <remotelinux/remotelinux_constants.h>
 
-#include <qtsupport/qtkitinformation.h>
-
 #include <QAction>
 
 using namespace ProjectExplorer;
@@ -107,36 +105,39 @@ public:
     QnxQmlProfilerWorkerFactory qmlProfilerWorkerFactory;
 };
 
-static QnxPluginPrivate *dd = nullptr;
-
-QnxPlugin::~QnxPlugin()
+class QnxPlugin final : public ExtensionSystem::IPlugin
 {
-    delete dd;
-}
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json")
 
-void QnxPlugin::initialize()
-{
-    dd = new QnxPluginPrivate;
-}
+public:
+    ~QnxPlugin() final { delete d; }
+
+private:
+    void initialize() final { d = new QnxPluginPrivate; }
+    void extensionsInitialized() final;
+
+    QnxPluginPrivate *d = nullptr;
+};
 
 void QnxPlugin::extensionsInitialized()
 {
     // Attach support
-    connect(&dd->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog);
+    connect(&d->m_attachToQnxApplication, &QAction::triggered, this, &showAttachToProcessDialog);
 
     const char QNX_DEBUGGING_GROUP[] = "Debugger.Group.Qnx";
 
     Core::ActionContainer *mstart = Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_DEBUG_STARTDEBUGGING);
     mstart->appendGroup(QNX_DEBUGGING_GROUP);
     mstart->addSeparator(Core::Context(Core::Constants::C_GLOBAL), QNX_DEBUGGING_GROUP,
-                         &dd->m_debugSeparator);
+                         &d->m_debugSeparator);
 
     Core::Command *cmd = Core::ActionManager::registerAction
-            (&dd->m_attachToQnxApplication, "Debugger.AttachToQnxApplication");
+            (&d->m_attachToQnxApplication, "Debugger.AttachToQnxApplication");
     mstart->addAction(cmd, QNX_DEBUGGING_GROUP);
 
     connect(KitManager::instance(), &KitManager::kitsChanged,
-            this, [] { dd->updateDebuggerActions(); });
+            this, [this] { d->updateDebuggerActions(); });
 }
 
 void QnxPluginPrivate::updateDebuggerActions()
@@ -153,3 +154,5 @@ void QnxPluginPrivate::updateDebuggerActions()
 }
 
 } // Qnx::Internal
+
+#include "qnxplugin.moc"
diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h
deleted file mode 100644
index 2eed97319f3..00000000000
--- a/src/plugins/qnx/qnxplugin.h
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (C) 2016 BlackBerry Limited. All rights reserved.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <extensionsystem/iplugin.h>
-
-namespace Qnx::Internal {
-
-class QnxPlugin final : public ExtensionSystem::IPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json")
-
-public:
-    ~QnxPlugin() final;
-
-private:
-    void initialize() final;
-    void extensionsInitialized() final;
-};
-
-} // Qnx::Internal