diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 263f3feb565..ec28581b041 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -3,20 +3,10 @@
 
 #include "qlayout.h"
 
-#include "qapplication.h"
 #include "qlayoutengine_p.h"
-#if QT_CONFIG(menubar)
-#include "qmenubar.h"
-#endif
-#if QT_CONFIG(toolbar)
-#include "qtoolbar.h"
-#endif
-#if QT_CONFIG(sizegrip)
-#include "qsizegrip.h"
-#endif
+#include "qguiapplication.h"
 #include "qevent.h"
 #include "qstyle.h"
-#include "qvariant.h"
 #include "qwidget_p.h"
 #include "qlayout_p.h"
 
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 246d090828e..08cf7962e7d 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -5,12 +5,6 @@
 
 #include "qapplication.h"
 #include "qlayoutengine_p.h"
-#if QT_CONFIG(menubar)
-#include "qmenubar.h"
-#endif
-#if QT_CONFIG(toolbar)
-#include "qtoolbar.h"
-#endif
 #include "qevent.h"
 #include "qstyle.h"
 #include "qvariant.h"
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index b4452a096c7..1b7a6daab0e 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -30,9 +30,6 @@
 #include "qmenubar_p.h"
 #endif
 #include "qwidgetaction.h"
-#if QT_CONFIG(toolbutton)
-#include "qtoolbutton.h"
-#endif
 #include "qpushbutton.h"
 #if QT_CONFIG(tooltip)
 #include "qtooltip.h"
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index c9c9191c173..fcf0759462c 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -15,9 +15,6 @@
 #if QT_CONFIG(mainwindow)
 #include <qmainwindow.h>
 #endif
-#if QT_CONFIG(toolbar)
-#include <qtoolbar.h>
-#endif
 #if QT_CONFIG(toolbutton)
 #include <qtoolbutton.h>
 #endif
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index 66fdcf20d78..69d87c2da37 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -4,9 +4,6 @@
 #include "qtoolbar.h"
 
 #include <qapplication.h>
-#if QT_CONFIG(combobox)
-#include <qcombobox.h>
-#endif
 #if QT_CONFIG(draganddrop)
 #include <qdrag.h>
 #endif
@@ -14,13 +11,7 @@
 #include <qlayout.h>
 #include <qmainwindow.h>
 #include <qmenu.h>
-#if QT_CONFIG(menubar)
-#include <qmenubar.h>
-#endif
 #include <qmimedata.h>
-#if QT_CONFIG(rubberband)
-#include <qrubberband.h>
-#endif
 #include <qstylepainter.h>
 #include <qstyleoption.h>
 #include <qtoolbutton.h>