diff --git a/qmake/generators/win32/cesdkhandler.cpp b/qmake/generators/win32/cesdkhandler.cpp
index de6a55112b5..7b9ac0cf8fb 100644
--- a/qmake/generators/win32/cesdkhandler.cpp
+++ b/qmake/generators/win32/cesdkhandler.cpp
@@ -41,9 +41,9 @@
 
 #include "cesdkhandler.h"
 
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-#include <QtCore/QXmlStreamReader>
+#include <qfile.h>
+#include <qdebug.h>
+#include <qxmlstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/qmake/generators/win32/cesdkhandler.h b/qmake/generators/win32/cesdkhandler.h
index 8d35694e5d7..061963f1b32 100644
--- a/qmake/generators/win32/cesdkhandler.h
+++ b/qmake/generators/win32/cesdkhandler.h
@@ -42,8 +42,8 @@
 #ifndef CE_SDK_HANDLER_INCL
 #define CE_SDK_HANDLER_INCL
 
-#include <QStringList>
-#include <QDir>
+#include <qstringlist.h>
+#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 1b7ff2bfa3e..c04358f6b9b 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -43,7 +43,7 @@
 #define QLIBRARYINFO_H
 
 #include <QtCore/qstring.h>
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h
index 7339927065e..54fc5ce8fb1 100644
--- a/src/corelib/tools/qcollator_p.h
+++ b/src/corelib/tools/qcollator_p.h
@@ -42,8 +42,8 @@
 #ifndef QCOLLATOR_P_H
 #define QCOLLATOR_P_H
 
-#include <QString>
-#include <QLocale>
+#include <QtCore/qstring.h>
+#include <QtCore/qlocale.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index e52fb9a1be2..1cf6a169c0e 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -787,8 +787,7 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector)
 
 #ifdef Q_CC_MSVC
 QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtCore/QPointF>
-#include <QtCore/QPoint>
+#include <QtCore/qpoint.h>
 QT_END_INCLUDE_NAMESPACE
 
 #if defined(QT_BUILD_CORE_LIB)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ac2d56d768e..79abf2fd401 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -45,7 +45,7 @@
 #  include "tools.h"
 #endif
 
-#include <QDate>
+#include <qdatetime.h>
 #include <qdir.h>
 #include <qdiriterator.h>
 #include <qtemporaryfile.h>
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index cf8ed9611b1..d40e883e2fa 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -41,15 +41,16 @@
 
 #include "environment.h"
 
+#include <qdebug.h>
+#include <qstringlist.h>
+#include <qmap.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+
 #include <process.h>
 #include <errno.h>
 #include <iostream>
-#include <qdebug.h>
-#include <QDir>
-#include <QStringList>
-#include <QMap>
-#include <QFile>
-#include <QFileInfo>
 
 //#define CONFIGURE_DEBUG_EXECUTE
 //#define CONFIGURE_DEBUG_CP_DIR
diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp
index b3b21d83495..c3f54937daf 100644
--- a/tools/configure/tools.cpp
+++ b/tools/configure/tools.cpp
@@ -41,9 +41,9 @@
 
 #include "tools.h"
 
-#include <QDir>
-#include <QFile>
-#include <QByteArray>
+#include <qdir.h>
+#include <qfile.h>
+#include <qbytearray.h>
 
 
 // std stuff ------------------------------------
diff --git a/tools/configure/tools.h b/tools/configure/tools.h
index e8829537338..76912eedc80 100644
--- a/tools/configure/tools.h
+++ b/tools/configure/tools.h
@@ -42,9 +42,9 @@
 #ifndef _TOOLS_H_
 #define _TOOLS_H_
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qmap.h>
 
 
 class Tools