diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,8 @@
 set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}")
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml Archive Crash WindowSystem Init IconThemes DBusAddons)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS KDELibs4Support)
 
 find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -105,10 +105,12 @@
    KF5::Konq
    KF5::Parts
    KF5::DBusAddons
-   KF5::KDELibs4Support
    KF5::Crash
+   KF5::WindowSystem
 )
 
+target_link_libraries(kdeinit_konqueror KF5::KDELibs4Support)
+
 if (X11_FOUND)
   target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
 endif ()
diff --git a/src/konqextensionmanager.cpp b/src/konqextensionmanager.cpp
--- a/src/konqextensionmanager.cpp
+++ b/src/konqextensionmanager.cpp
@@ -27,8 +27,8 @@
 #include <kxmlguifactory.h>
 #include <kconfig.h>
 #include "konqdebug.h"
+#include <KAboutData>
 #include <KLocalizedString>
-#include <kcomponentdata.h>
 #include <kparts/plugin.h>
 #include <kplugininfo.h>
 #include <kpluginselector.h>
diff --git a/src/konqfactory.cpp b/src/konqfactory.cpp
--- a/src/konqfactory.cpp
+++ b/src/konqfactory.cpp
@@ -36,7 +36,6 @@
 #include <kmessagebox.h>
 #include <kmimetypetrader.h>
 #include <kservicetypetrader.h>
-#include <kdeversion.h>
 #include <KParts/ReadOnlyPart>
 
 // Local
diff --git a/src/konqframecontainer.cpp b/src/konqframecontainer.cpp
--- a/src/konqframecontainer.cpp
+++ b/src/konqframecontainer.cpp
@@ -19,7 +19,6 @@
 
 #include "konqframecontainer.h"
 #include "konqdebug.h"
-#include <kglobalsettings.h>
 #include <kconfig.h>
 #include <math.h> // pow()
 #include <kconfiggroup.h>
@@ -51,7 +50,6 @@
     m_pFirstChild = nullptr;
     m_pSecondChild = nullptr;
     m_pActiveChild = nullptr;
-    setOpaqueResize(KGlobalSettings::opaqueResize());
     connect(this, &KonqFrameContainer::splitterMoved, this, &KonqFrameContainer::setRubberbandCalled);
 //### CHECKME
 }
diff --git a/src/konqmainwindow.cpp b/src/konqmainwindow.cpp
--- a/src/konqmainwindow.cpp
+++ b/src/konqmainwindow.cpp
@@ -55,8 +55,6 @@
 #include <konq_events.h>
 #include <konqpixmapprovider.h>
 #include <kbookmarkmanager.h>
-#include <kinputdialog.h>
-#include <kcomponentdata.h>
 #include <klineedit.h>
 #include <kzip.h>
 #include <pwd.h>
@@ -73,7 +71,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <time.h>
-#include <kde_file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -101,7 +98,6 @@
 #include <kedittoolbar.h>
 #include <klocalizedstring.h>
 #include <kmessagebox.h>
-#include <kmessagebox_queued.h>
 #include <knewfilemenu.h>
 #include <konq_popupmenu.h>
 #include "konqsettings.h"
@@ -118,16 +114,13 @@
 #include <kurlrequesterdialog.h>
 #include <kurlrequester.h>
 #include <kmimetypetrader.h>
-#include <kwindowsystem.h>
 #include <KJobWidgets>
-#include <kfiledialog.h>
 #include <KLocalizedString>
 #include <QIcon>
 #include <kiconloader.h>
 #include <QMenu>
 #include <kprocess.h>
 #include <kio/scheduler.h>
-#include <kio/netaccess.h>
 #include <KIO/JobUiDelegate>
 #include <KIO/CopyJob>
 #include <KIO/Job>
@@ -139,14 +132,14 @@
 #include <kacceleratormanager.h>
 #include <kuser.h>
 #include <kxmlguifactory.h>
-#include <netwm.h>
 #include <sonnet/configdialog.h>
+#include <kwindowsystem.h>
+#include <netwm.h>
 
 #include <kauthorized.h>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <kconfiggroup.h>
-#include <kglobalsettings.h>
 #include <kurlauthorized.h>
 #include <QFontDatabase>
 #include <QMenuBar>
@@ -218,7 +211,7 @@
             Qt::QueuedConnection); // Queued so that we don't delete the action from the code that triggered it.
 
     // This has to be called before any action is created for this mainwindow
-    setComponentData(KComponentData::mainComponent(), false /*don't load plugins yet*/);
+    setComponentData(KAboutData::applicationData(), false /*don't load plugins yet*/);
 
     m_pViewManager = new KonqViewManager(this);
 
@@ -266,16 +259,13 @@
     initCombo();
     initActions();
 
-    connect(KGlobalSettings::self(), &KGlobalSettings::kdisplayFontChanged, this, &KonqMainWindow::slotReconfigure);
-
     setXMLFile(QStringLiteral("konqueror.rc"));
 
     setStandardToolBarMenuEnabled(true);
 
     createGUI(nullptr);
 
     m_combo->setParent(toolBar(QStringLiteral("locationToolBar")));
-    m_combo->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
     m_combo->show();
 
     checkDisableClearButton();
@@ -436,9 +426,17 @@
         QString fileName = path.mid(lastSlash + 1);
         if (fileName.indexOf('*') != -1 || fileName.indexOf('[') != -1 || fileName.indexOf('?') != -1) {
             // Check that a file or dir with all the special chars in the filename doesn't exist
-            // (NetAccess::exists has a fast path for local files)
-            if (!KIO::NetAccess::exists(url, KIO::NetAccess::DestinationSide, this)) {
-                nameFilter = fileName;
+            if (url.isLocalFile()) {
+                if (!QFile(url.toLocalFile()).exists()) {
+                    nameFilter = fileName;
+                }
+            } else { // not a local file
+                KIO::StatJob *job = KIO::stat(url, KIO::StatJob::DestinationSide, 0, KIO::HideProgressInfo);
+                // if there's an error stat'ing url, then assume it doesn't exist
+                nameFilter = !job->exec() ? fileName : QString();
+            }
+
+            if (!nameFilter.isEmpty()) {
                 url = url.adjusted(QUrl::RemoveFilename | QUrl::RemoveQuery);
                 qCDebug(KONQUEROR_LOG) << "Found wildcard. nameFilter=" << nameFilter << "  New url=" << url;
             }
@@ -1520,7 +1518,7 @@
         currentUrl = QUrl::fromLocalFile(QDir::homePath());
     }
 
-    QUrl url = KFileDialog::getOpenUrl(currentUrl, QString(), this);
+    QUrl url = QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QString());
     if (!url.isEmpty()) {
         openFilteredUrl(url.url().trimmed());
     }
@@ -4677,10 +4675,6 @@
     m_pViewManager->applyConfiguration();
     KonqMouseEventFilter::self()->reparseConfiguration();
 
-    if (m_combo) {
-        m_combo->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
-    }
-
     MapViews::ConstIterator it = m_mapViews.constBegin();
     MapViews::ConstIterator end = m_mapViews.constEnd();
     for (; it != end; ++it) {
diff --git a/src/konqpixmapprovider.cpp b/src/konqpixmapprovider.cpp
--- a/src/konqpixmapprovider.cpp
+++ b/src/konqpixmapprovider.cpp
@@ -28,7 +28,7 @@
 #include <kio/global.h>
 #include <kprotocolinfo.h>
 #include <kconfiggroup.h>
-#include <kiconloader.h>
+#include <KIconLoader>
 
 class KonqPixmapProviderSingleton
 {
diff --git a/src/konqsessiondlg.cpp b/src/konqsessiondlg.cpp
--- a/src/konqsessiondlg.cpp
+++ b/src/konqsessiondlg.cpp
@@ -45,7 +45,6 @@
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <QDialog>
-#include <klistwidget.h>
 #include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <KGuiItem>
diff --git a/src/konqview.cpp b/src/konqview.cpp
--- a/src/konqview.cpp
+++ b/src/konqview.cpp
@@ -41,7 +41,6 @@
 #include <ktoggleaction.h>
 #include <kjobuidelegate.h>
 #include <KUrlMimeData>
-#include <KComponentData>
 
 #include <QApplication>
 #include <QArgument>
diff --git a/src/konqviewmanager.cpp b/src/konqviewmanager.cpp
--- a/src/konqviewmanager.cpp
+++ b/src/konqviewmanager.cpp
@@ -36,7 +36,6 @@
 
 #include <KParts/PartActivateEvent>
 
-#include <kaccelgen.h>
 #include <kactionmenu.h>
 
 #include <kstringhandler.h>