diff --git a/kcms/baloo/filteredfoldermodel.cpp b/kcms/baloo/filteredfoldermodel.cpp
--- a/kcms/baloo/filteredfoldermodel.cpp
+++ b/kcms/baloo/filteredfoldermodel.cpp
@@ -191,7 +191,7 @@
         // Check Mount allMountPointsExcluded
         for (QString mountPoint : m_mountPoints) {
             if (url.startsWith(mountPoint)) {
-                name = QLatin1Char('[') + QDir(mountPoint).dirName() + QLatin1String("]/") + url.mid(mountPoint.length());
+                name = QLatin1Char('[') + mountPoint+ QLatin1String("]/") + url.mid(mountPoint.length());
                 break;
             }
         }
diff --git a/kcms/componentchooser/componentchooserbrowser.cpp b/kcms/componentchooser/componentchooserbrowser.cpp
--- a/kcms/componentchooser/componentchooserbrowser.cpp
+++ b/kcms/componentchooser/componentchooserbrowser.cpp
@@ -21,8 +21,6 @@
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
 
-#include "../migrationlib/kdelibs4config.h"
-
 #include <QUrl>
 #include <QDBusConnection>
 #include <QDBusMessage>
@@ -158,8 +156,6 @@
         KBuildSycocaProgressDialog::rebuildKSycoca(this);
     }
 
-    Kdelibs4SharedConfig::syncConfigGroup(QLatin1String("General"), "kdeglobals");
-
     QDBusMessage message  = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
                                                            QStringLiteral("/KLauncher"),
                                                            QStringLiteral("org.kde.KLauncher"),
diff --git a/kcms/componentchooser/componentchooserterminal.cpp b/kcms/componentchooser/componentchooserterminal.cpp
--- a/kcms/componentchooser/componentchooserterminal.cpp
+++ b/kcms/componentchooser/componentchooserterminal.cpp
@@ -32,8 +32,6 @@
 
 #include <QUrl>
 
-#include "../migrationlib/kdelibs4config.h"
-
 CfgTerminalEmulator::CfgTerminalEmulator(QWidget *parent)
     : QWidget(parent), Ui::TerminalEmulatorConfig_UI(), CfgPlugin()
 {