diff --git a/kcms/hotspot/hotspotsettings.cpp b/kcms/hotspot/hotspotsettings.cpp
index 0ac7b9a4..f00ec7ef 100644
--- a/kcms/hotspot/hotspotsettings.cpp
+++ b/kcms/hotspot/hotspotsettings.cpp
@@ -4,16 +4,21 @@
     SPDX-License-Identifier: LGPL-2.0-or-later
 */
 
-#include "hotspotsettings.h"
-
 #include <KLocalizedString>
 #include <KPluginFactory>
 
+#include <KQuickConfigModule>
+
+class HotspotSettings : public KQuickConfigModule
+{
+    Q_OBJECT
+public:
+    HotspotSettings(QObject *parent, const KPluginMetaData &metaData)
+        : KQuickConfigModule(parent, metaData)
+    {
+    }
+};
+
 K_PLUGIN_CLASS_WITH_JSON(HotspotSettings, "kcm_mobile_hotspot.json")
 
-HotspotSettings::HotspotSettings(QObject *parent, const KPluginMetaData &metaData)
-    : KQuickConfigModule(parent, metaData)
-{
-}
-
 #include "hotspotsettings.moc"
diff --git a/kcms/hotspot/hotspotsettings.h b/kcms/hotspot/hotspotsettings.h
deleted file mode 100644
index f2ee5f8b..00000000
--- a/kcms/hotspot/hotspotsettings.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
-
-    SPDX-License-Identifier: LGPL-2.0-or-later
-*/
-
-#ifndef HOTSPOTSETTINGS_H
-#define HOTSPOTSETTINGS_H
-
-#include <KQuickConfigModule>
-
-class HotspotSettings : public KQuickConfigModule
-{
-    Q_OBJECT
-public:
-    HotspotSettings(QObject *parent, const KPluginMetaData &metaData);
-};
-
-#endif // HOTSPOTSETTINGS_H
diff --git a/kcms/mobileshell/kcm.cpp b/kcms/mobileshell/kcm.cpp
index 004461d8..003835a2 100644
--- a/kcms/mobileshell/kcm.cpp
+++ b/kcms/mobileshell/kcm.cpp
@@ -3,16 +3,30 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#include "kcm.h"
-
 #include <KPluginFactory>
 
+#include <KConfigGroup>
+#include <KQuickManagedConfigModule>
+#include <KSharedConfig>
+
+class KCMMobileShell : public KQuickManagedConfigModule
+{
+    Q_OBJECT
+
+public:
+    KCMMobileShell(QObject *parent, const KPluginMetaData &data)
+        : KQuickManagedConfigModule(parent, data)
+    {
+        setButtons({});
+    }
+
+Q_SIGNALS:
+    void navigationPanelEnabledChanged();
+
+private:
+    KSharedConfig::Ptr m_config;
+};
+
 K_PLUGIN_CLASS_WITH_JSON(KCMMobileShell, "kcm_mobileshell.json")
 
-KCMMobileShell::KCMMobileShell(QObject *parent, const KPluginMetaData &data)
-    : KQuickManagedConfigModule(parent, data)
-{
-    setButtons({});
-}
-
 #include "kcm.moc"
diff --git a/kcms/mobileshell/kcm.h b/kcms/mobileshell/kcm.h
deleted file mode 100644
index 8c444bb3..00000000
--- a/kcms/mobileshell/kcm.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#pragma once
-
-#include <KConfigGroup>
-#include <KQuickManagedConfigModule>
-#include <KSharedConfig>
-
-class KCMMobileShell : public KQuickManagedConfigModule
-{
-    Q_OBJECT
-
-public:
-    KCMMobileShell(QObject *parent, const KPluginMetaData &data);
-
-Q_SIGNALS:
-    void navigationPanelEnabledChanged();
-
-private:
-    KSharedConfig::Ptr m_config;
-};