diff --git a/src/plugins/mcusupport/mcupackage.h b/src/plugins/mcusupport/mcupackage.h
index 2b8b1a89b9f..7316fbea151 100644
--- a/src/plugins/mcusupport/mcupackage.h
+++ b/src/plugins/mcusupport/mcupackage.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include "mcuabstractpackage.h"
+#include "mcusupportversiondetection.h"
 #include "settingshandler.h"
 
 #include <utils/filepath.h>
@@ -102,7 +103,7 @@ private:
     const Utils::FilePath m_defaultPath;
     const Utils::FilePath m_detectionPath;
     const QString m_settingsKey;
-    const McuPackageVersionDetector *m_versionDetector;
+    QScopedPointer<const McuPackageVersionDetector> m_versionDetector;
 
     Utils::FilePath m_path;
     Utils::FilePath m_relativePathModifier; // relative path to m_path to be returned by path()
diff --git a/src/plugins/mcusupport/mcusupportversiondetection.h b/src/plugins/mcusupport/mcusupportversiondetection.h
index 53aaad1e931..76e88718dbb 100644
--- a/src/plugins/mcusupport/mcusupportversiondetection.h
+++ b/src/plugins/mcusupport/mcusupportversiondetection.h
@@ -26,14 +26,12 @@
 #pragma once
 
 #include <utils/filepath.h>
-#include <QObject>
+#include <QString>
 
-namespace McuSupport {
-namespace Internal {
+namespace McuSupport::Internal {
 
-class McuPackageVersionDetector : public QObject
+class McuPackageVersionDetector
 {
-    Q_OBJECT
 public:
     McuPackageVersionDetector();
     virtual ~McuPackageVersionDetector() = default;
@@ -98,5 +96,4 @@ private:
     const QString m_versionRegExp;
 };
 
-} // namespace Internal
-} // namespace McuSupport
+} // namespace McuSupport::Internal
diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp
index b2e13c71fbd..b1d5cc4be62 100644
--- a/src/plugins/mcusupport/mcutargetfactory.cpp
+++ b/src/plugins/mcusupport/mcutargetfactory.cpp
@@ -27,6 +27,7 @@
 #include "mcuhelpers.h"
 #include "mcupackage.h"
 #include "mcusupportconstants.h"
+#include "mcusupportversiondetection.h"
 #include "mcutarget.h"
 #include "mcutargetdescription.h"
 
diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp
index e723d3cf0a0..818183de1b0 100644
--- a/src/plugins/mcusupport/test/unittest.cpp
+++ b/src/plugins/mcusupport/test/unittest.cpp
@@ -40,6 +40,7 @@
 #include "mcusupportconstants.h"
 #include "mcusupportoptions.h"
 #include "mcusupportsdk.h"
+#include "mcusupportversiondetection.h"
 #include "mcutargetdescription.h"
 #include "mcutargetfactorylegacy.h"