diff --git a/src/kcms/screenedges/main.cpp b/src/kcms/screenedges/main.cpp
index c8443a4e80..8bbe33867a 100644
--- a/src/kcms/screenedges/main.cpp
+++ b/src/kcms/screenedges/main.cpp
@@ -17,8 +17,8 @@
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 #include <KPluginFactory>
+#include <QDBusConnection>
 #include <QVBoxLayout>
-#include <QtDBus>
 
 #include "kwinscreenedgeconfigform.h"
 #include "kwinscreenedgedata.h"
diff --git a/src/kcms/screenedges/touch.cpp b/src/kcms/screenedges/touch.cpp
index 22771bb003..e266b17bee 100644
--- a/src/kcms/screenedges/touch.cpp
+++ b/src/kcms/screenedges/touch.cpp
@@ -17,8 +17,9 @@
 #include <KPackage/Package>
 #include <KPackage/PackageLoader>
 #include <KPluginFactory>
+#include <QDBusConnection>
+#include <QDBusMessage>
 #include <QVBoxLayout>
-#include <QtDBus>
 
 #include "kwintouchscreendata.h"
 #include "kwintouchscreenedgeconfigform.h"
diff --git a/src/kcms/tabbox/main.cpp b/src/kcms/tabbox/main.cpp
index 93ba30a273..8beb5972e8 100644
--- a/src/kcms/tabbox/main.cpp
+++ b/src/kcms/tabbox/main.cpp
@@ -12,6 +12,8 @@
 #include <kwin_effects_interface.h>
 
 // Qt
+#include <QDBusConnection>
+#include <QDBusMessage>
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
@@ -22,7 +24,6 @@
 #include <QStandardPaths>
 #include <QTabWidget>
 #include <QVBoxLayout>
-#include <QtDBus>
 
 // KDE
 #include <KLocalizedString>
diff --git a/src/plugins/kdecorations/aurorae/src/decorationplugin.cpp b/src/plugins/kdecorations/aurorae/src/decorationplugin.cpp
index 5cb3e6830c..a8ca361891 100644
--- a/src/plugins/kdecorations/aurorae/src/decorationplugin.cpp
+++ b/src/plugins/kdecorations/aurorae/src/decorationplugin.cpp
@@ -6,7 +6,7 @@
 #include "decorationplugin.h"
 #include "colorhelper.h"
 #include "decorationoptions.h"
-#include <QtQml>
+#include <QQmlEngine>
 
 void DecorationPlugin::registerTypes(const char *uri)
 {
diff --git a/src/plugins/nightcolor/nightcolordbusinterface.h b/src/plugins/nightcolor/nightcolordbusinterface.h
index 76c7f42fc9..954648951c 100644
--- a/src/plugins/nightcolor/nightcolordbusinterface.h
+++ b/src/plugins/nightcolor/nightcolordbusinterface.h
@@ -9,8 +9,9 @@
 
 #pragma once
 
+#include <QDBusContext>
+#include <QDBusServiceWatcher>
 #include <QObject>
-#include <QtDBus>
 
 namespace KWin
 {
diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp
index b74b09fdca..00aa67c29a 100644
--- a/src/plugins/nightcolor/nightcolormanager.cpp
+++ b/src/plugins/nightcolor/nightcolormanager.cpp
@@ -26,6 +26,9 @@
 
 #include <QAction>
 #include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusPendingReply>
+#include <QDBusReply>
 #include <QTimer>
 
 namespace KWin