diff --git a/src/core/codecs/qtextcodec.h b/src/core/codecs/qtextcodec.h
index 360157abb..4d31f57da 100644
--- a/src/core/codecs/qtextcodec.h
+++ b/src/core/codecs/qtextcodec.h
@@ -43,7 +43,6 @@
 #define QTEXTCODEC_H
 
 #include <QtCore/qstring.h>
-#include <QtCore/qlist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/core/codecs/qtextcodecplugin.h b/src/core/codecs/qtextcodecplugin.h
index ee82ed0c9..df3c52b23 100644
--- a/src/core/codecs/qtextcodecplugin.h
+++ b/src/core/codecs/qtextcodecplugin.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
-#include <QtCore/qlist.h>
 #include <QtCore/qbytearray.h>
 
 QT_BEGIN_HEADER
diff --git a/src/core/io/qdebug.h b/src/core/io/qdebug.h
index 631a74d63..804a517a7 100644
--- a/src/core/io/qdebug.h
+++ b/src/core/io/qdebug.h
@@ -42,13 +42,7 @@
 #ifndef QDEBUG_H
 #define QDEBUG_H
 
-#include <QtCore/qalgorithms.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qpair.h>
 #include <QtCore/qtextstream.h>
-#include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
 #include <QtCore/qset.h>
 #include <QtCore/qcontiguouscache.h>
diff --git a/src/core/io/qfile.h b/src/core/io/qfile.h
index bbcb7b419..f9df94792 100644
--- a/src/core/io/qfile.h
+++ b/src/core/io/qfile.h
@@ -43,7 +43,6 @@
 #define QFILE_H
 
 #include <QtCore/qiodevice.h>
-#include <QtCore/qstring.h>
 #include <stdio.h>
 
 #ifdef open
diff --git a/src/core/io/qfileinfo.h b/src/core/io/qfileinfo.h
index 4eefd83f6..8cd6c6c83 100644
--- a/src/core/io/qfileinfo.h
+++ b/src/core/io/qfileinfo.h
@@ -43,7 +43,6 @@
 #define QFILEINFO_H
 
 #include <QtCore/qfile.h>
-#include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
 
 QT_BEGIN_HEADER
diff --git a/src/core/io/qresource.h b/src/core/io/qresource.h
index 34588f805..5d0a4977b 100644
--- a/src/core/io/qresource.h
+++ b/src/core/io/qresource.h
@@ -42,10 +42,8 @@
 #ifndef QRESOURCE_H
 #define QRESOURCE_H
 
-#include <QtCore/qstring.h>
 #include <QtCore/qlocale.h>
 #include <QtCore/qstringlist.h>
-#include <QtCore/qlist.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/core/io/qsettings.h b/src/core/io/qsettings.h
index e8bf22c75..1a92580ac 100644
--- a/src/core/io/qsettings.h
+++ b/src/core/io/qsettings.h
@@ -42,9 +42,7 @@
 #ifndef QSETTINGS_H
 #define QSETTINGS_H
 
-#include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qstring.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/core/io/qtextstream.h b/src/core/io/qtextstream.h
index 2f503e484..c8f97405f 100644
--- a/src/core/io/qtextstream.h
+++ b/src/core/io/qtextstream.h
@@ -42,14 +42,7 @@
 #ifndef QTEXTSTREAM_H
 #define QTEXTSTREAM_H
 
-#include <QtCore/qiodevice.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qchar.h>
 #include <QtCore/qlocale.h>
-#include <QtCore/qscopedpointer.h>
-
-#ifndef QT_NO_TEXTCODEC
-#endif
 
 #include <stdio.h>
 
diff --git a/src/core/io/qurl.h b/src/core/io/qurl.h
index c08418ff2..ddc68ad5d 100644
--- a/src/core/io/qurl.h
+++ b/src/core/io/qurl.h
@@ -42,10 +42,6 @@
 #ifndef QURL_H
 #define QURL_H
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qobjectdefs.h>
-#include <QtCore/qpair.h>
-#include <QtCore/qstring.h>
 #include <QtCore/qhash.h>
 
 QT_BEGIN_HEADER
diff --git a/src/core/kernel/qtranslator.h b/src/core/kernel/qtranslator.h
index e2d57bba0..bebe47471 100644
--- a/src/core/kernel/qtranslator.h
+++ b/src/core/kernel/qtranslator.h
@@ -43,7 +43,6 @@
 #define QTRANSLATOR_H
 
 #include <QtCore/qobject.h>
-#include <QtCore/qbytearray.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/core/kernel/qvariant.h b/src/core/kernel/qvariant.h
index 00784954f..d551aaa6c 100644
--- a/src/core/kernel/qvariant.h
+++ b/src/core/kernel/qvariant.h
@@ -42,13 +42,10 @@
 #ifndef QVARIANT_H
 #define QVARIANT_H
 
-#include <QtCore/qatomic.h>
-#include <QtCore/qbytearray.h>
-#include <QtCore/qlist.h>
 #include <QtCore/qmetatype.h>
-#include <QtCore/qmap.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qstring.h>
+#include <QtCore/qmap.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/core/tools/qhash.h b/src/core/tools/qhash.h
index 7dea0f8ee..8b159ccfb 100644
--- a/src/core/tools/qhash.h
+++ b/src/core/tools/qhash.h
@@ -42,10 +42,7 @@
 #ifndef QHASH_H
 #define QHASH_H
 
-#include <QtCore/qatomic.h>
-#include <QtCore/qchar.h>
 #include <QtCore/qiterator.h>
-#include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 
 QT_BEGIN_HEADER
diff --git a/src/core/tools/qvector.h b/src/core/tools/qvector.h
index 2aa11613d..28b8466aa 100644
--- a/src/core/tools/qvector.h
+++ b/src/core/tools/qvector.h
@@ -42,9 +42,6 @@
 #ifndef QVECTOR_H
 #define QVECTOR_H
 
-#include <QtCore/qiterator.h>
-#include <QtCore/qatomic.h>
-#include <QtCore/qalgorithms.h>
 #include <QtCore/qlist.h>
 
 #ifndef QT_NO_STL
diff --git a/src/core/xml/qxmlstream.h b/src/core/xml/qxmlstream.h
index 18d2e25b7..af31f2f83 100644
--- a/src/core/xml/qxmlstream.h
+++ b/src/core/xml/qxmlstream.h
@@ -46,9 +46,7 @@
 
 #ifndef QT_NO_XMLSTREAM
 
-#include <QtCore/qstring.h>
 #include <QtCore/qvector.h>
-#include <QtCore/qscopedpointer.h>
 
 QT_BEGIN_HEADER