diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index bd5937352..66def25ce 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -57,10 +57,8 @@
 #ifdef QT_INCLUDE_COMPAT
 #include <QtGui/qevent.h>
 #else
-#include <QtCore/qobject.h>
 #include <QtGui/qkeysequence.h>
 #include <QtGui/qregion.h>
-#include <QtGui/qwindowdefs.h>
 #endif
 
 QT_BEGIN_HEADER
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 93d37dbcf..abedf290f 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -53,25 +53,11 @@
 // We mean it.
 //
 
-#include "QtCore/qglobal.h"
-#include "QtCore/qstring.h"
 #include "QtCore/qvarlengtharray.h"
-#include "QtCore/qnamespace.h"
-#include "QtGui/qtextlayout.h"
-#include "qtextformat_p.h"
 #include "qfont_p.h"
-#include "QtCore/qvector.h"
 #include "QtGui/qpaintengine.h"
-#include "QtGui/qtextobject.h"
-#include "QtGui/qtextoption.h"
-#include "QtGui/qtextcursor.h"
-#include "QtCore/qset.h"
-#include "QtCore/qdebug.h"
 #include "qtextdocument_p.h"
 #include "qharfbuzz_p.h"
-#include "qfixed_p.h"
-
-#include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index fbe3d0aa8..7e83fca4d 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -42,13 +42,10 @@
 #ifndef QTEXTFORMAT_H
 #define QTEXTFORMAT_H
 
-#include <QtGui/qcolor.h>
-#include <QtGui/qfont.h>
 #include <QtCore/qshareddata.h>
-#include <QtCore/qvector.h>
 #include <QtCore/qvariant.h>
+#include <QtGui/qfont.h>
 #include <QtGui/qpen.h>
-#include <QtGui/qbrush.h>
 #include <QtGui/qtextoption.h>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index a815d602e..6e787e939 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -53,14 +53,8 @@
 // We mean it.
 //
 
-#include "QtCore/qvector.h"
-#include "QtGui/qbrush.h"
-#include "QtGui/qcolor.h"
-#include "QtGui/qfont.h"
+#include "QtGui/qtextformat.h"
 #include "QtGui/qtextdocument.h"
-#include "QtGui/qtextcursor.h"
-#include "qtextformat_p.h"
-#include "qtextdocument_p.h"
 #include "qcssparser_p.h"
 
 #ifndef QT_NO_TEXTHTMLPARSER
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 465a0c932..fcf5e9ff6 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -41,14 +41,8 @@
 #ifndef QTEXTLAYOUT_H
 #define QTEXTLAYOUT_H
 
-#include <QtCore/qstring.h>
-#include <QtCore/qnamespace.h>
-#include <QtCore/qrect.h>
-#include <QtCore/qvector.h>
-#include <QtGui/qcolor.h>
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qtextformat.h>
 #include <QtGui/qglyphrun.h>
 #include <QtGui/qtextcursor.h>
 
diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h
index 4b70fce35..556630b96 100644
--- a/src/gui/text/qtextlist.h
+++ b/src/gui/text/qtextlist.h
@@ -43,7 +43,6 @@
 #define QTEXTLIST_H
 
 #include <QtGui/qtextobject.h>
-#include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h
index 538aa31f3..21b2ce52c 100644
--- a/src/gui/text/qtexttable.h
+++ b/src/gui/text/qtexttable.h
@@ -42,8 +42,6 @@
 #ifndef QTEXTTABLE_H
 #define QTEXTTABLE_H
 
-#include <QtCore/qglobal.h>
-#include <QtCore/qobject.h>
 #include <QtGui/qtextobject.h>
 
 QT_BEGIN_HEADER
diff --git a/src/gui/widgets/qtextedit.h b/src/gui/widgets/qtextedit.h
index 5de7862e6..95f1336fc 100644
--- a/src/gui/widgets/qtextedit.h
+++ b/src/gui/widgets/qtextedit.h
@@ -44,9 +44,7 @@
 
 #include <QtGui/qabstractscrollarea.h>
 #include <QtGui/qtextdocument.h>
-#include <QtGui/qtextoption.h>
 #include <QtGui/qtextcursor.h>
-#include <QtGui/qtextformat.h>
 
 #ifndef QT_NO_TEXTEDIT
 
diff --git a/src/gui/widgets/qtextedit_p.h b/src/gui/widgets/qtextedit_p.h
index fa0d461d8..5ccf7f13f 100644
--- a/src/gui/widgets/qtextedit_p.h
+++ b/src/gui/widgets/qtextedit_p.h
@@ -57,13 +57,11 @@
 #include "QtGui/qtextdocumentfragment.h"
 #include "QtGui/qscrollbar.h"
 #include "QtGui/qtextcursor.h"
-#include "QtGui/qtextformat.h"
 #include "QtGui/qmenu.h"
 #include "QtGui/qabstracttextdocumentlayout.h"
 #include "QtCore/qbasictimer.h"
 #include "QtCore/qurl.h"
 #include "qtextcontrol_p.h"
-#include "qtextedit.h"
 
 QT_BEGIN_NAMESPACE