diff --git a/src/private/Utils_p.h b/src/private/Utils_p.h
index 6969d75f..e046527f 100644
--- a/src/private/Utils_p.h
+++ b/src/private/Utils_p.h
@@ -18,10 +18,7 @@
 #include <QScreen>
 #include <QWindow>
 #include <QMouseEvent>
-
-#include <QApplication>
-#include <QAbstractButton>
-#include <QLineEdit>
+#include <QGuiApplication>
 
 #ifdef QT_X11EXTRAS_LIB
 #include <QtX11Extras/QX11Info>
diff --git a/src/qtquick/TestHelpers_qtquick.cpp b/src/qtquick/TestHelpers_qtquick.cpp
index b873c04b..1c4bb904 100644
--- a/src/qtquick/TestHelpers_qtquick.cpp
+++ b/src/qtquick/TestHelpers_qtquick.cpp
@@ -15,7 +15,7 @@
 #include "qtquick/views/MainWindow_qtquick.h"
 #include "controllers/MainWindow.h"
 
-#include <QApplication> // TODO: Make it QGuiApplication
+#include <QGuiApplication>
 #include <QQmlEngine>
 #include <QQuickStyle>
 #include <QQuickItem>
diff --git a/src/qtwidgets/Platform_qtwidgets.cpp b/src/qtwidgets/Platform_qtwidgets.cpp
index cc2353cc..f9a537e6 100644
--- a/src/qtwidgets/Platform_qtwidgets.cpp
+++ b/src/qtwidgets/Platform_qtwidgets.cpp
@@ -20,6 +20,9 @@
 #include "ViewFactory_qtwidgets.h"
 
 #include <QScreen>
+#include <QApplication>
+#include <QLineEdit>
+#include <QAbstractButton>
 
 #include <memory.h>
 
diff --git a/src/qtwidgets/TestHelpers_qtwidgets.cpp b/src/qtwidgets/TestHelpers_qtwidgets.cpp
index 4e5a37a9..13e1ad90 100644
--- a/src/qtwidgets/TestHelpers_qtwidgets.cpp
+++ b/src/qtwidgets/TestHelpers_qtwidgets.cpp
@@ -18,6 +18,7 @@
 
 #include <QStyleFactory>
 #include <QApplication>
+#include <QLineEdit>
 #include <QWidget>
 
 using namespace KDDockWidgets;