make src/tools/ compile without CamelCase headers

so the build works with syncqt -minimal

Change-Id: Ief5e8eb9a504dd6c84cff76cc3e5257450386a0f
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Thiago Macieira <[email protected]>

71 files changed, 197 insertions, 200 deletions

diff --git a/src/dbus/qdbusunixfiledescriptor.cpp b/src/dbus/qdbusunixfiledescriptor.cpp
index 33e839325d3..346aa7410c5 100644
--- a/src/dbus/qdbusunixfiledescriptor.cpp
+++ b/src/dbus/qdbusunixfiledescriptor.cpp
@@ -41,7 +41,6 @@
 
 
 #include "qdbusunixfiledescriptor.h"
-#include <QSharedData>
 
 #ifdef Q_OS_UNIX
 # include <private/qcore_unix_p.h>
diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h
index ce0a5a09865..fd6cf58360c 100644
--- a/src/dbus/qdbusunixfiledescriptor.h
+++ b/src/dbus/qdbusunixfiledescriptor.h
@@ -43,7 +43,7 @@
 #ifndef QDBUSUNIXFILEDESCRIPTOR_H
 #define QDBUSUNIXFILEDESCRIPTOR_H
 
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtDBus/qdbusmacros.h>
 
 #ifndef QT_NO_DBUS
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 97b7075bac0..28369b67ae6 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -43,9 +43,9 @@
 #include "moc.h"
 #include "outputrevision.h"
 #include <qconfig.cpp>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
+#include <qfile.h>
+#include <qfileinfo.h>
+#include <qdir.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 66cc942a9f6..7d7c718fa0a 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -43,10 +43,10 @@
 #define MOC_H
 
 #include "parser.h"
-#include <QStringList>
-#include <QMap>
-#include <QPair>
-#include <QJsonDocument>
+#include <qstringlist.h>
+#include <qmap.h>
+#include <qpair.h>
+#include <qjsondocument.h>
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/src/tools/moc/mwerks_mac.h b/src/tools/moc/mwerks_mac.h
index 4d7debd7dc6..227a7b5672f 100644
--- a/src/tools/moc/mwerks_mac.h
+++ b/src/tools/moc/mwerks_mac.h
@@ -42,7 +42,7 @@
 #ifndef MWERKS_MAC_H
 #define MWERKS_MAC_H
 
-#include <QtGlobal>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/moc/parser.h b/src/tools/moc/parser.h
index 654168fb082..1f25a1f1c69 100644
--- a/src/tools/moc/parser.h
+++ b/src/tools/moc/parser.h
@@ -42,7 +42,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <QStack>
+#include <qstack.h>
 #include "symbols.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index d88c9f29508..c3348847351 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -41,10 +41,10 @@
 
 #include "preprocessor.h"
 #include "utils.h"
-#include <QStringList>
-#include <QFile>
-#include <QDir>
-#include <QFileInfo>
+#include <qstringlist.h>
+#include <qfile.h>
+#include <qdir.h>
+#include <qfileinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h
index e5bc7d4a03d..721e64e6c56 100644
--- a/src/tools/moc/preprocessor.h
+++ b/src/tools/moc/preprocessor.h
@@ -43,8 +43,8 @@
 #define PREPROCESSOR_H
 
 #include "parser.h"
-#include <QList>
-#include <QSet>
+#include <qlist.h>
+#include <qset.h>
 #include <stdio.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index a53cc1802e3..7568891214a 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -43,10 +43,10 @@
 #define SYMBOLS_H
 
 #include "token.h"
-#include <QString>
-#include <QHash>
-#include <QVector>
-#include <QDebug>
+#include <qstring.h>
+#include <qhash.h>
+#include <qvector.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
index ff5f4357dfd..7383362f402 100644
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QByteArray>
-#include <QString>
-#include <QVarLengthArray>
-#include <QFile>
-#include <QList>
-#include <QBuffer>
-#include <QRegExp>
-#include <QVector>
+#include <qbytearray.h>
+#include <qstring.h>
+#include <qvarlengtharray.h>
+#include <qfile.h>
+#include <qlist.h>
+#include <qbuffer.h>
+#include <qregexp.h>
+#include <qvector.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
index 6ddd095e8e9..27ed7dbfda7 100644
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qbytearray.h>
-#include <QtCore/qdatetime.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qstringlist.h>
-#include <QtCore/qtextstream.h>
-#include <QtCore/qset.h>
+#include <qbytearray.h>
+#include <qdatetime.h>
+#include <qdebug.h>
+#include <qfile.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextstream.h>
+#include <qset.h>
 
 #include "qdbusmetatype.h"
-#include "private/qdbusintrospection_p.h"
+#include <qdbusintrospection_p.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/tools/qdoc/atom.cpp b/src/tools/qdoc/atom.cpp
index 03638d2d907..e201bc0c4de 100644
--- a/src/tools/qdoc/atom.cpp
+++ b/src/tools/qdoc/atom.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QRegExp>
+#include <qregexp.h>
 #include "atom.h"
 #include "location.h"
 #include <stdio.h>
diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp
index 4a9305de9ed..bb6676c7350 100644
--- a/src/tools/qdoc/codemarker.cpp
+++ b/src/tools/qdoc/codemarker.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QMetaObject>
+#include <qobjectdefs.h>
 #include "codemarker.h"
 #include "config.h"
 #include "node.h"
diff --git a/src/tools/qdoc/codeparser.h b/src/tools/qdoc/codeparser.h
index 7bca9e0c9bf..61a86a256e9 100644
--- a/src/tools/qdoc/codeparser.h
+++ b/src/tools/qdoc/codeparser.h
@@ -42,7 +42,7 @@
 #ifndef CODEPARSER_H
 #define CODEPARSER_H
 
-#include <QSet>
+#include <qset.h>
 #include "node.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp
index 38596e1bcd6..4cbcd284942 100644
--- a/src/tools/qdoc/config.cpp
+++ b/src/tools/qdoc/config.cpp
@@ -43,11 +43,11 @@
   config.cpp
 */
 
-#include <QDir>
-#include <QVariant>
-#include <QFile>
-#include <QTemporaryFile>
-#include <QTextStream>
+#include <qdir.h>
+#include <qvariant.h>
+#include <qfile.h>
+#include <qtemporaryfile.h>
+#include <qtextstream.h>
 #include <qdebug.h>
 #include "config.h"
 #include <stdlib.h>
diff --git a/src/tools/qdoc/config.h b/src/tools/qdoc/config.h
index 4eb851282ee..b0929961a2c 100644
--- a/src/tools/qdoc/config.h
+++ b/src/tools/qdoc/config.h
@@ -46,9 +46,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <QMap>
-#include <QSet>
-#include <QStringList>
+#include <qmap.h>
+#include <qset.h>
+#include <qstringlist.h>
 
 #include "location.h"
 
diff --git a/src/tools/qdoc/ditaxmlgenerator.cpp b/src/tools/qdoc/ditaxmlgenerator.cpp
index fa09cd3657c..8ece10915cc 100644
--- a/src/tools/qdoc/ditaxmlgenerator.cpp
+++ b/src/tools/qdoc/ditaxmlgenerator.cpp
@@ -43,11 +43,11 @@
   ditaxmlgenerator.cpp
 */
 
-#include <QDebug>
-#include <QList>
+#include <qdebug.h>
+#include <qlist.h>
 #include <qiterator.h>
-#include <QTextCodec>
-#include <QUuid>
+#include <qtextcodec.h>
+#include <quuid.h>
 #include "codemarker.h"
 #include "codeparser.h"
 #include "ditaxmlgenerator.h"
diff --git a/src/tools/qdoc/ditaxmlgenerator.h b/src/tools/qdoc/ditaxmlgenerator.h
index 9f82726ba80..2471b2a65da 100644
--- a/src/tools/qdoc/ditaxmlgenerator.h
+++ b/src/tools/qdoc/ditaxmlgenerator.h
@@ -44,7 +44,7 @@
 
 #include <qmap.h>
 #include <qregexp.h>
-#include <QXmlStreamWriter>
+#include <qxmlstream.h>
 #include "codemarker.h"
 #include "config.h"
 #include "generator.h"
diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h
index dc781f48568..354feba55d9 100644
--- a/src/tools/qdoc/doc.h
+++ b/src/tools/qdoc/doc.h
@@ -46,9 +46,9 @@
 #ifndef DOC_H
 #define DOC_H
 
-#include <QSet>
-#include <QString>
-#include <QMap>
+#include <qset.h>
+#include <qstring.h>
+#include <qmap.h>
 
 #include "location.h"
 
diff --git a/src/tools/qdoc/editdistance.h b/src/tools/qdoc/editdistance.h
index d8e8fe29aad..6a6144f8147 100644
--- a/src/tools/qdoc/editdistance.h
+++ b/src/tools/qdoc/editdistance.h
@@ -46,8 +46,8 @@
 #ifndef EDITDISTANCE_H
 #define EDITDISTANCE_H
 
-#include <QSet>
-#include <QString>
+#include <qset.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 23003de8066..2c42467ca57 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -42,8 +42,8 @@
 /*
   generator.cpp
 */
-#include <QDir>
-#include <QDebug>
+#include <qdir.h>
+#include <qdebug.h>
 #include "codemarker.h"
 #include "config.h"
 #include "ditaxmlgenerator.h"
diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index 11e842a7c79..86bc8cd1b7f 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -42,14 +42,14 @@
 #ifndef GENERATOR_H
 #define GENERATOR_H
 
-#include <QFile>
-#include <QFileInfo>
-#include <QList>
-#include <QMap>
-#include <QRegExp>
-#include <QString>
-#include <QStringList>
-#include <QTextStream>
+#include <qfile.h>
+#include <qfileinfo.h>
+#include <qlist.h>
+#include <qmap.h>
+#include <qregexp.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextstream.h>
 
 #include "node.h"
 #include "text.h"
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp
index 0a61bd62e4a..fa06c1e6f67 100644
--- a/src/tools/qdoc/helpprojectwriter.cpp
+++ b/src/tools/qdoc/helpprojectwriter.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QCryptographicHash>
-#include <QDebug>
-#include <QHash>
-#include <QMap>
+#include <qcryptographichash.h>
+#include <qdebug.h>
+#include <qhash.h>
+#include <qmap.h>
 
 #include "atom.h"
 #include "helpprojectwriter.h"
diff --git a/src/tools/qdoc/helpprojectwriter.h b/src/tools/qdoc/helpprojectwriter.h
index c6c3871b2dc..066412f145a 100644
--- a/src/tools/qdoc/helpprojectwriter.h
+++ b/src/tools/qdoc/helpprojectwriter.h
@@ -42,9 +42,8 @@
 #ifndef HELPPROJECTWRITER_H
 #define HELPPROJECTWRITER_H
 
-#include <QString>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
+#include <qstring.h>
+#include <qxmlstream.h>
 
 #include "config.h"
 #include "node.h"
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 558b0c62486..53eea2a0019 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -56,7 +56,7 @@
 #include <qlist.h>
 #include <qiterator.h>
 #include <qtextcodec.h>
-#include <QUuid>
+#include <quuid.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index 18a2d396d08..1fffd2301bd 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -46,9 +46,9 @@
 #ifndef HTMLGENERATOR_H
 #define HTMLGENERATOR_H
 
-#include <QMap>
-#include <QRegExp>
-#include <QXmlStreamWriter>
+#include <qmap.h>
+#include <qregexp.h>
+#include <qxmlstream.h>
 #include "codemarker.h"
 #include "config.h"
 #include "generator.h"
diff --git a/src/tools/qdoc/location.cpp b/src/tools/qdoc/location.cpp
index 2d7457d61f8..91b0e2b7a8b 100644
--- a/src/tools/qdoc/location.cpp
+++ b/src/tools/qdoc/location.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtDebug>
+#include <qdebug.h>
 #include "config.h"
 #include "location.h"
 
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 2e0c1c99335..c7392d1f7e4 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -43,7 +43,7 @@
 #include "tree.h"
 #include "codemarker.h"
 #include "codeparser.h"
-#include <QUuid>
+#include <quuid.h>
 #include "qdocdatabase.h"
 #include <qdebug.h>
 
diff --git a/src/tools/qdoc/puredocparser.h b/src/tools/qdoc/puredocparser.h
index 8ca7c2f1f07..134ef752cfc 100644
--- a/src/tools/qdoc/puredocparser.h
+++ b/src/tools/qdoc/puredocparser.h
@@ -46,7 +46,7 @@
 #ifndef PUREDOCPARSER_H
 #define PUREDOCPARSER_H
 
-#include <QSet>
+#include <qset.h>
 
 #include "cppcodeparser.h"
 #include "location.h"
diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h
index 3fed961c33c..e907486919c 100644
--- a/src/tools/qdoc/qdocdatabase.h
+++ b/src/tools/qdoc/qdocdatabase.h
@@ -42,8 +42,8 @@
 #ifndef QDOCDATABASE_H
 #define QDOCDATABASE_H
 
-#include <QString>
-#include <QMultiMap>
+#include <qstring.h>
+#include <qmap.h>
 #include "tree.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/tools/qdoc/qmlcodeparser.h b/src/tools/qdoc/qmlcodeparser.h
index 1ee6560e8e3..c36a3b5f2bc 100644
--- a/src/tools/qdoc/qmlcodeparser.h
+++ b/src/tools/qdoc/qmlcodeparser.h
@@ -46,7 +46,7 @@
 #ifndef QMLCODEPARSER_H
 #define QMLCODEPARSER_H
 
-#include <QSet>
+#include <qset.h>
 #include "qqmljsengine_p.h"
 #include "qqmljslexer_p.h"
 #include "qqmljsparser_p.h"
diff --git a/src/tools/qdoc/qmlmarkupvisitor.cpp b/src/tools/qdoc/qmlmarkupvisitor.cpp
index 0b1883723f4..87eb08cd141 100644
--- a/src/tools/qdoc/qmlmarkupvisitor.cpp
+++ b/src/tools/qdoc/qmlmarkupvisitor.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QStringList>
-#include <QtGlobal>
+#include <qstringlist.h>
+#include <qglobal.h>
 #include "qqmljsast_p.h"
 #include "qqmljsastfwd_p.h"
 #include "qqmljsengine_p.h"
diff --git a/src/tools/qdoc/qmlmarkupvisitor.h b/src/tools/qdoc/qmlmarkupvisitor.h
index 81c6e609fa1..118fa7069a7 100644
--- a/src/tools/qdoc/qmlmarkupvisitor.h
+++ b/src/tools/qdoc/qmlmarkupvisitor.h
@@ -42,7 +42,7 @@
 #ifndef QMLMARKUPVISITOR_H
 #define QMLMARKUPVISITOR_H
 
-#include <QString>
+#include <qstring.h>
 #include "qqmljsastvisitor_p.h"
 #include "node.h"
 #include "tree.h"
diff --git a/src/tools/qdoc/qmlparser/qqmljs.g b/src/tools/qdoc/qmlparser/qqmljs.g
index 746fcb24df2..5e63bff6885 100644
--- a/src/tools/qdoc/qmlparser/qqmljs.g
+++ b/src/tools/qdoc/qmlparser/qqmljs.g
@@ -124,8 +124,8 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
-#include <QtCore/QCoreApplication>
+#include <qdebug.h>
+#include <qcoreapplication.h>
 
 #include <string.h>
 
@@ -202,8 +202,8 @@
 #include "qqmljsast_p.h"
 #include "qqmljsengine_p.h"
 
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <qlist.h>
+#include <qstring.h>
 
 QT_QML_BEGIN_NAMESPACE
 
@@ -380,7 +380,7 @@ protected:
 /.
 
 #include "qqmljsparser_p.h"
-#include <QVarLengthArray>
+#include <qvarlengtharray.h>
 
 //
 // This file is automatically generated from qmljs.g.
diff --git a/src/tools/qdoc/qmlparser/qqmljsast_p.h b/src/tools/qdoc/qmlparser/qqmljsast_p.h
index 5de94d2ee29..d1014263a0d 100644
--- a/src/tools/qdoc/qmlparser/qqmljsast_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsast_p.h
@@ -57,7 +57,7 @@
 #include "qqmljsglobal_p.h"
 #include "qqmljsmemorypool_p.h"
 
-#include <QtCore/QString>
+#include <qstring.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h
index 602cbeb6cd9..8ecf75081b2 100644
--- a/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsastfwd_p.h
@@ -44,7 +44,7 @@
 
 #include "qqmljsglobal_p.h"
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 //
 //  W A R N I N G
diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp
index 459ba8d7dcf..29bac8f5211 100644
--- a/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.cpp
@@ -43,8 +43,8 @@
 #include "qqmljsglobal_p.h"
 
 #include <qnumeric.h>
-#include <QHash>
-#include <QDebug>
+#include <qhash.h>
+#include <qdebug.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qmlparser/qqmljsengine_p.h b/src/tools/qdoc/qmlparser/qqmljsengine_p.h
index 3cb78de4eb1..b633f00fbcd 100644
--- a/src/tools/qdoc/qmlparser/qqmljsengine_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsengine_p.h
@@ -57,8 +57,8 @@
 #include "qqmljsastfwd_p.h"
 #include "qqmljsmemorypool_p.h"
 
-#include <QString>
-#include <QSet>
+#include <qstring.h>
+#include <qset.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qmlparser/qqmljslexer.cpp b/src/tools/qdoc/qmlparser/qqmljslexer.cpp
index 537e4297e02..fd6247bf36a 100644
--- a/src/tools/qdoc/qmlparser/qqmljslexer.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljslexer.cpp
@@ -46,11 +46,11 @@
 #ifdef QT_BOOTSTRAPPED
 #define tr(x, y) QString(QLatin1String(y))
 #else
-#include <QtCore/QCoreApplication>
+#include <qcoreapplication.h>
 #define tr(x, y) QCoreApplication::translate(x, y)
 #endif
-#include <QtCore/QVarLengthArray>
-#include <QtCore/QDebug>
+#include <qvarlengtharray.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
diff --git a/src/tools/qdoc/qmlparser/qqmljslexer_p.h b/src/tools/qdoc/qmlparser/qqmljslexer_p.h
index 6b51852f5f7..827da4aa4fb 100644
--- a/src/tools/qdoc/qmlparser/qqmljslexer_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljslexer_p.h
@@ -55,7 +55,7 @@
 
 #include "qqmljsglobal_p.h"
 #include "qqmljsgrammar_p.h"
-#include <QtCore/QString>
+#include <qstring.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qmlparser/qqmljsparser.cpp b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
index 431351b8b21..961441a8e75 100644
--- a/src/tools/qdoc/qmlparser/qqmljsparser.cpp
+++ b/src/tools/qdoc/qmlparser/qqmljsparser.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QtDebug>
+#include <qdebug.h>
 #ifdef QT_BOOTSTRAPPED
 #define tr(x, y) QString(QLatin1String(y))
 #else
-#include <QtCore/QCoreApplication>
+#include <qcoreapplication.h>
 #define tr(x, y) QCoreApplication::translate(x, y)
 #endif
 
@@ -57,7 +57,7 @@
 
 
 #include "qqmljsparser_p.h"
-#include <QVarLengthArray>
+#include <qvarlengtharray.h>
 
 //
 // This file is automatically generated from qmljs.g.
diff --git a/src/tools/qdoc/qmlparser/qqmljsparser_p.h b/src/tools/qdoc/qmlparser/qqmljsparser_p.h
index ad532c32c79..6d385688bbe 100644
--- a/src/tools/qdoc/qmlparser/qqmljsparser_p.h
+++ b/src/tools/qdoc/qmlparser/qqmljsparser_p.h
@@ -64,8 +64,8 @@
 #include "qqmljsast_p.h"
 #include "qqmljsengine_p.h"
 
-#include <QtCore/QList>
-#include <QtCore/QString>
+#include <qlist.h>
+#include <qstring.h>
 
 QT_QML_BEGIN_NAMESPACE
 
diff --git a/src/tools/qdoc/qmlvisitor.cpp b/src/tools/qdoc/qmlvisitor.cpp
index d985e33ba20..e43bf348291 100644
--- a/src/tools/qdoc/qmlvisitor.cpp
+++ b/src/tools/qdoc/qmlvisitor.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QFileInfo>
-#include <QStringList>
-#include <QtGlobal>
+#include <qfileinfo.h>
+#include <qstringlist.h>
+#include <qglobal.h>
 #include "qqmljsast_p.h"
 #include "qqmljsastfwd_p.h"
 #include "qqmljsengine_p.h"
diff --git a/src/tools/qdoc/qmlvisitor.h b/src/tools/qdoc/qmlvisitor.h
index 3b45af68506..863dfabfeaf 100644
--- a/src/tools/qdoc/qmlvisitor.h
+++ b/src/tools/qdoc/qmlvisitor.h
@@ -42,7 +42,7 @@
 #ifndef QMLVISITOR_H
 #define QMLVISITOR_H
 
-#include <QString>
+#include <qstring.h>
 #include "qqmljsastvisitor_p.h"
 #include "node.h"
 #include "tree.h"
diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp
index 81458163978..53f2c47e1cf 100644
--- a/src/tools/qdoc/tree.cpp
+++ b/src/tools/qdoc/tree.cpp
@@ -43,7 +43,7 @@
   tree.cpp
 */
 
-#include <QDomDocument>
+#include <qdom.h>
 #include "atom.h"
 #include "doc.h"
 #include "htmlgenerator.h"
diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h
index c201a31cd52..e893cd04b68 100644
--- a/src/tools/qdoc/tree.h
+++ b/src/tools/qdoc/tree.h
@@ -47,8 +47,8 @@
 #define TREE_H
 
 #include "node.h"
-#include <QDomElement>
-#include <QXmlStreamWriter>
+#include <qdom.h>
+#include <qxmlstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp
index 03c6976eec9..14db094f6d4 100644
--- a/src/tools/rcc/main.cpp
+++ b/src/tools/rcc/main.cpp
@@ -42,13 +42,13 @@
 #include <rcc.h>
 #include "../../corelib/kernel/qcorecmdlineargs_p.h"
 
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QTextStream>
-#include <QAtomicInt>
-#include <QtGlobal>
+#include <qdebug.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
+#include <qatomic.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 32aba07b37f..3b8100590c4 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -41,16 +41,16 @@
 
 #include "rcc.h"
 
-#include <QtCore/QByteArray>
-#include <QtCore/QDateTime>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFile>
-#include <QtCore/QIODevice>
-#include <QtCore/QLocale>
-#include <QtCore/QStack>
-#include <QtCore/QXmlStreamReader>
+#include <qbytearray.h>
+#include <qdatetime.h>
+#include <qdebug.h>
+#include <qdir.h>
+#include <qdiriterator.h>
+#include <qfile.h>
+#include <qiodevice.h>
+#include <qlocale.h>
+#include <qstack.h>
+#include <qxmlstream.h>
 
 // Note: A copy of this file is used in Qt Designer (qttools/src/designer/src/lib/shared/rcc.cpp)
 
diff --git a/src/tools/rcc/rcc.h b/src/tools/rcc/rcc.h
index a808f576c58..7d0fb4dd76b 100644
--- a/src/tools/rcc/rcc.h
+++ b/src/tools/rcc/rcc.h
@@ -44,9 +44,9 @@
 #ifndef RCC_H
 #define RCC_H
 
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QString>
+#include <qstringlist.h>
+#include <qhash.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppextractimages.cpp b/src/tools/uic/cpp/cppextractimages.cpp
index 7dca6320d73..6bc33b10c8f 100644
--- a/src/tools/uic/cpp/cppextractimages.cpp
+++ b/src/tools/uic/cpp/cppextractimages.cpp
@@ -46,12 +46,12 @@
 #include "utils.h"
 #include "uic.h"
 
-#include <QtCore/QDataStream>
-#include <QtCore/QTextStream>
-#include <QtCore/QTextCodec>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
+#include <qdatastream.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
+#include <qdir.h>
+#include <qfile.h>
+#include <qfileinfo.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h
index 5b08d01e94e..93c0580a644 100644
--- a/src/tools/uic/cpp/cppextractimages.h
+++ b/src/tools/uic/cpp/cppextractimages.h
@@ -43,7 +43,7 @@
 #define CPPEXTRACTIMAGES_H
 
 #include "treewalker.h"
-#include <QtCore/QDir>
+#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwritedeclaration.cpp b/src/tools/uic/cpp/cppwritedeclaration.cpp
index 9b97000a067..4426ec22b47 100644
--- a/src/tools/uic/cpp/cppwritedeclaration.cpp
+++ b/src/tools/uic/cpp/cppwritedeclaration.cpp
@@ -50,8 +50,8 @@
 #include "databaseinfo.h"
 #include "customwidgetsinfo.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <qtextstream.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp
index 082961cfe63..e262b9f18f6 100644
--- a/src/tools/uic/cpp/cppwriteicondata.cpp
+++ b/src/tools/uic/cpp/cppwriteicondata.cpp
@@ -44,7 +44,7 @@
 #include "ui4.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.cpp b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
index 91822b0e92f..9f063b5d10d 100644
--- a/src/tools/uic/cpp/cppwriteicondeclaration.cpp
+++ b/src/tools/uic/cpp/cppwriteicondeclaration.cpp
@@ -44,7 +44,7 @@
 #include "ui4.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.cpp b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
index a026d277989..2bef93050e9 100644
--- a/src/tools/uic/cpp/cppwriteiconinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteiconinitialization.cpp
@@ -46,8 +46,8 @@
 #include "utils.h"
 #include "uic.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QString>
+#include <qtextstream.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp
index 4c5edf7190d..9b2c872b108 100644
--- a/src/tools/uic/cpp/cppwriteincludes.cpp
+++ b/src/tools/uic/cpp/cppwriteincludes.cpp
@@ -45,9 +45,9 @@
 #include "uic.h"
 #include "databaseinfo.h"
 
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <qdebug.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
 
 #include <stdio.h>
 
diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h
index 9ad4008b080..61a055dd44d 100644
--- a/src/tools/uic/cpp/cppwriteincludes.h
+++ b/src/tools/uic/cpp/cppwriteincludes.h
@@ -44,10 +44,10 @@
 
 #include "treewalker.h"
 
-#include <QtCore/QHash>
-#include <QtCore/QMap>
-#include <QtCore/QSet>
-#include <QtCore/QString>
+#include <qhash.h>
+#include <qmap.h>
+#include <qset.h>
+#include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 402295d2a88..80ca5ce5dd1 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -48,8 +48,8 @@
 #include "databaseinfo.h"
 #include "globaldefs.h"
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <qtextstream.h>
+#include <qdebug.h>
 
 #include <ctype.h>
 
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index e82998ec3c2..27979349b7b 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -43,12 +43,12 @@
 #define CPPWRITEINITIALIZATION_H
 
 #include "treewalker.h"
-#include <QtCore/QPair>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QMap>
-#include <QtCore/QStack>
-#include <QtCore/QTextStream>
+#include <qpair.h>
+#include <qhash.h>
+#include <qset.h>
+#include <qmap.h>
+#include <qstack.h>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h
index 7cc0e28642f..002a2cef783 100644
--- a/src/tools/uic/customwidgetsinfo.h
+++ b/src/tools/uic/customwidgetsinfo.h
@@ -43,8 +43,8 @@
 #define CUSTOMWIDGETSINFO_H
 
 #include "treewalker.h"
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
+#include <qstringlist.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h
index 8dd2bae1cdc..51ecff76122 100644
--- a/src/tools/uic/databaseinfo.h
+++ b/src/tools/uic/databaseinfo.h
@@ -43,8 +43,8 @@
 #define DATABASEINFO_H
 
 #include "treewalker.h"
-#include <QtCore/QStringList>
-#include <QtCore/QMap>
+#include <qstringlist.h>
+#include <qmap.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index 9ef6fcb3873..9ef2c79f826 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -43,8 +43,8 @@
 #include "uic.h"
 #include "ui4.h"
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
+#include <qfileinfo.h>
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/driver.h b/src/tools/uic/driver.h
index 07f330471ef..603c502a516 100644
--- a/src/tools/uic/driver.h
+++ b/src/tools/uic/driver.h
@@ -43,10 +43,10 @@
 #define DRIVER_H
 
 #include "option.h"
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QTextStream>
+#include <qhash.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/globaldefs.h b/src/tools/uic/globaldefs.h
index e43a2e946ee..832c5f26329 100644
--- a/src/tools/uic/globaldefs.h
+++ b/src/tools/uic/globaldefs.h
@@ -42,7 +42,7 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <QtCore/qglobal.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 7a5b9e684f2..5e73b58a1dc 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -43,10 +43,10 @@
 #include "option.h"
 #include "driver.h"
 #include "../../corelib/global/qconfig.cpp"
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QTextStream>
-#include <QtCore/QTextCodec>
+#include <qfile.h>
+#include <qdir.h>
+#include <qtextstream.h>
+#include <qtextcodec.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h
index c5fd48267c2..18ceeded3d3 100644
--- a/src/tools/uic/option.h
+++ b/src/tools/uic/option.h
@@ -42,8 +42,8 @@
 #ifndef OPTION_H
 #define OPTION_H
 
-#include <QtCore/QString>
-#include <QtCore/QDir>
+#include <qstring.h>
+#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h
index 1507ac2c948..3a04a261b9c 100644
--- a/src/tools/uic/treewalker.h
+++ b/src/tools/uic/treewalker.h
@@ -42,7 +42,7 @@
 #ifndef TREEWALKER_H
 #define TREEWALKER_H
 
-#include <QtCore/QList>
+#include <qlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index c1458b49834..2575a72a98e 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -55,12 +55,11 @@
 #ifndef UI4_H
 #define UI4_H
 
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QXmlStreamWriter>
-#include <QtCore/qglobal.h>
+#include <qlist.h>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qxmlstream.h>
+#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 4ae04149e8d..d3572d98735 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -56,10 +56,10 @@
 #include "javawritedeclaration.h"
 #endif
 
-#include <QtCore/QXmlStreamReader>
-#include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
-#include <QtCore/QDateTime>
+#include <qxmlstream.h>
+#include <qfileinfo.h>
+#include <qtextstream.h>
+#include <qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index 431f3d1f07d..7e68ea6ae21 100644
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -44,11 +44,11 @@
 
 #include "databaseinfo.h"
 #include "customwidgetsinfo.h"
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QHash>
-#include <QtCore/QStack>
-#include <QtCore/QXmlStreamReader>
+#include <qstring.h>
+#include <qstringlist.h>
+#include <qhash.h>
+#include <qstack.h>
+#include <qxmlstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h
index b2214d9c386..e2e24a4fa8a 100644
--- a/src/tools/uic/utils.h
+++ b/src/tools/uic/utils.h
@@ -43,9 +43,9 @@
 #define UTILS_H
 
 #include "ui4.h"
-#include <QtCore/QString>
-#include <QtCore/QList>
-#include <QtCore/QHash>
+#include <qstring.h>
+#include <qlist.h>
+#include <qhash.h>
 
 QT_BEGIN_NAMESPACE