diff --git a/src/gui/src/DeskflowApplication.cpp b/src/gui/src/DeskflowApplication.cpp
index 3cda45dac..4a272e06a 100644
--- a/src/gui/src/DeskflowApplication.cpp
+++ b/src/gui/src/DeskflowApplication.cpp
@@ -20,9 +20,6 @@
 
 #include "MainWindow.h"
 
-#include <QtCore>
-#include <QtGui>
-
 DeskflowApplication::DeskflowApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
 
diff --git a/src/gui/src/HotkeyDialog.cpp b/src/gui/src/HotkeyDialog.cpp
index 5df00cc8e..5c7fb5436 100644
--- a/src/gui/src/HotkeyDialog.cpp
+++ b/src/gui/src/HotkeyDialog.cpp
@@ -19,9 +19,6 @@
 #include "HotkeyDialog.h"
 #include "ui_HotkeyDialog.h"
 
-#include <QtCore>
-#include <QtGui>
-
 HotkeyDialog::HotkeyDialog(QWidget *parent, Hotkey &hotkey)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
       ui{std::make_unique<Ui::HotkeyDialog>()},
diff --git a/src/gui/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp
index 2e0e3035f..81285f488 100644
--- a/src/gui/src/KeySequence.cpp
+++ b/src/gui/src/KeySequence.cpp
@@ -17,9 +17,7 @@
  */
 
 #include "KeySequence.h"
-
-#include <QtCore>
-#include <QtGui>
+#include <QSettings>
 
 // this table originally comes from Qt sources (gui/kernel/qkeysequence.cpp)
 // and is heavily modified for Deskflow
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 0f9e704fb..d1c83ec9c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -48,12 +48,11 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
+#include <QNetworkInterface>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QScrollBar>
-#include <QtCore>
-#include <QtGui>
-#include <QtNetwork>
+
 #include <memory>
 
 #if defined(Q_OS_MAC)
diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp
index 766165cbd..2efb9f80d 100644
--- a/src/gui/src/ScreenSettingsDialog.cpp
+++ b/src/gui/src/ScreenSettingsDialog.cpp
@@ -26,8 +26,6 @@
 #include "gui/validators/ValidationError.h"
 
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using namespace deskflow::gui;
 using enum ScreenConfig::Modifier;
diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp
index 39a343924..5fc20f162 100644
--- a/src/gui/src/ScreenSetupModel.cpp
+++ b/src/gui/src/ScreenSetupModel.cpp
@@ -18,10 +18,11 @@
 
 #include "ScreenSetupModel.h"
 
-#include "gui/config/Screen.h"
+#include <QIODevice>
+#include <QIcon>
+#include <QMimeData>
 
-#include <QtCore>
-#include <QtGui>
+#include "gui/config/Screen.h"
 
 const QString ScreenSetupModel::m_MimeType = "application/x-" DESKFLOW_APP_ID "-screen";
 
diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
index d7a283202..8deece23f 100644
--- a/src/gui/src/ScreenSetupView.cpp
+++ b/src/gui/src/ScreenSetupView.cpp
@@ -21,9 +21,13 @@
 #include "ScreenSettingsDialog.h"
 #include "ScreenSetupModel.h"
 
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
 #include <QHeaderView>
-#include <QtCore>
-#include <QtGui>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QResizeEvent>
 
 ScreenSetupView::ScreenSetupView(QWidget *parent) : QTableView(parent)
 {
@@ -151,4 +155,4 @@ void ScreenSetupView::initViewItemOption(QStyleOptionViewItem *option) const
   option->decorationPosition = QStyleOptionViewItem::Top;
   option->displayAlignment = Qt::AlignCenter;
   option->textElideMode = Qt::ElideMiddle;
-}
\ No newline at end of file
+}
diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index 46689b6f1..e866aed34 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -25,7 +25,6 @@
 #include <QAbstractButton>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QtCore>
 
 using namespace deskflow::gui::proxy;
 using enum ScreenConfig::Modifier;
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index 33f8228a2..a36313517 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -26,8 +26,6 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using enum ScreenConfig::SwitchCorner;
 using ServerProtocol = synergy::gui::ServerProtocol;
diff --git a/src/gui/src/TrashScreenWidget.cpp b/src/gui/src/TrashScreenWidget.cpp
index a3ff49816..5bb1cb109 100644
--- a/src/gui/src/TrashScreenWidget.cpp
+++ b/src/gui/src/TrashScreenWidget.cpp
@@ -17,10 +17,12 @@
  */
 
 #include "TrashScreenWidget.h"
-#include "ScreenSetupModel.h"
 
-#include <QtCore>
-#include <QtGui>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QMimeData>
+
+#include "ScreenSetupModel.h"
 
 void TrashScreenWidget::dragEnterEvent(QDragEnterEvent *event)
 {
diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
index e610abe16..30113434e 100644
--- a/src/gui/src/main.cpp
+++ b/src/gui/src/main.cpp
@@ -40,9 +40,7 @@
 #include <QGuiApplication>
 #include <QMessageBox>
 #include <QObject>
-#include <QtCore>
 #include <QtGlobal>
-#include <QtGui>
 
 #if defined(Q_OS_MAC)
 #include <Carbon/Carbon.h>
diff --git a/src/lib/arch/unix/ArchSystemUnix.cpp b/src/lib/arch/unix/ArchSystemUnix.cpp
index 2d7a2e80e..bb607866a 100644
--- a/src/lib/arch/unix/ArchSystemUnix.cpp
+++ b/src/lib/arch/unix/ArchSystemUnix.cpp
@@ -20,8 +20,12 @@
 #include <array>
 
 #include <sys/utsname.h>
+
 #ifndef __APPLE__
-#include <QtDBus>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QDBusInterface>
+#include <QDBusReply>
 #endif
 
 //
diff --git a/src/lib/gui/config/AppConfig.cpp b/src/lib/gui/config/AppConfig.cpp
index 99fc081b9..7622a618f 100644
--- a/src/lib/gui/config/AppConfig.cpp
+++ b/src/lib/gui/config/AppConfig.cpp
@@ -24,8 +24,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QVariant>
-#include <QtCore>
-#include <QtNetwork>
 #include <functional>
 
 using namespace deskflow::gui;
diff --git a/src/lib/gui/config/Screen.cpp b/src/lib/gui/config/Screen.cpp
index 204040421..707bd613f 100644
--- a/src/lib/gui/config/Screen.cpp
+++ b/src/lib/gui/config/Screen.cpp
@@ -19,9 +19,6 @@
 #include "Screen.h"
 #include "config/ScreenConfig.h"
 
-#include <QtCore>
-#include <QtGui>
-
 using namespace deskflow::gui::proxy;
 using enum ScreenConfig::Modifier;
 using enum ScreenConfig::SwitchCorner;
diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp
index e876fb790..362cf4b09 100644
--- a/src/lib/gui/dialogs/AboutDialog.cpp
+++ b/src/lib/gui/dialogs/AboutDialog.cpp
@@ -24,7 +24,6 @@
 
 #include <QDateTime>
 #include <QGuiApplication>
-#include <QtCore>
 
 using namespace deskflow::gui;
 
diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp
index 6c2d74091..9dcbacb5a 100644
--- a/src/lib/gui/dialogs/SettingsDialog.cpp
+++ b/src/lib/gui/dialogs/SettingsDialog.cpp
@@ -33,8 +33,6 @@
 #include <QDir>
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QtCore>
-#include <QtGui>
 
 using namespace deskflow::gui;
 
diff --git a/src/lib/gui/env_vars.h b/src/lib/gui/env_vars.h
index 77b3d212f..1bf6df3dd 100644
--- a/src/lib/gui/env_vars.h
+++ b/src/lib/gui/env_vars.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <QString>
-#include <QtCore>
 
 namespace deskflow::gui::env_vars {
 
diff --git a/src/lib/platform/XWindowsKeyState.cpp b/src/lib/platform/XWindowsKeyState.cpp
index 5044e9a87..a8da7e428 100644
--- a/src/lib/platform/XWindowsKeyState.cpp
+++ b/src/lib/platform/XWindowsKeyState.cpp
@@ -16,8 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QString>
 #ifndef __APPLE__
-#include <QtDBus>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusPendingReply>
 #endif
 
 #include "platform/XWindowsKeyState.h"