diff --git a/src/3rdparty/javascriptcore/wtf/Platform.h b/src/3rdparty/javascriptcore/wtf/Platform.h
index 82286944c..34c77219b 100644
--- a/src/3rdparty/javascriptcore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/wtf/Platform.h
@@ -27,7 +27,7 @@
 #ifndef WTF_Platform_h
 #define WTF_Platform_h
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/core/codecs/qiconvcodec.cpp b/src/core/codecs/qiconvcodec.cpp
index 57614cb7e..904dc6612 100644
--- a/src/core/codecs/qiconvcodec.cpp
+++ b/src/core/codecs/qiconvcodec.cpp
@@ -33,8 +33,8 @@
 
 #include "qiconvcodec_p.h"
 #include "qtextcodec_p.h"
-#include <qlibrary.h>
-#include <qdebug.h>
+#include "qlibrary.h"
+#include "qdebug.h"
 
 #include <errno.h>
 #include <locale.h>
diff --git a/src/core/concurrent/qfuturewatcher_p.h b/src/core/concurrent/qfuturewatcher_p.h
index 895f893b1..12a0f269f 100644
--- a/src/core/concurrent/qfuturewatcher_p.h
+++ b/src/core/concurrent/qfuturewatcher_p.h
@@ -46,7 +46,7 @@
 //
 
 #include "qfutureinterface_p.h"
-#include <qlist.h>
+#include "qlist.h"
 
 #ifndef QT_NO_QFUTURE
 
diff --git a/src/core/io/qdatastream_p.h b/src/core/io/qdatastream_p.h
index 8d7d9ad46..69d4cbb71 100644
--- a/src/core/io/qdatastream_p.h
+++ b/src/core/io/qdatastream_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdatastream.h>
+#include "qdatastream.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/io/qfilesystemwatcher.cpp b/src/core/io/qfilesystemwatcher.cpp
index 408d8da28..d0592e6fe 100644
--- a/src/core/io/qfilesystemwatcher.cpp
+++ b/src/core/io/qfilesystemwatcher.cpp
@@ -36,12 +36,12 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qdatetime.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qset.h>
-#include <qtimer.h>
+#include "qdatetime.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qfileinfo.h"
+#include "qset.h"
+#include "qtimer.h"
 
 #if defined(Q_OS_LINUX)
 #  include "qfilesystemwatcher_inotify_p.h"
diff --git a/src/core/io/qfilesystemwatcher_dnotify.cpp b/src/core/io/qfilesystemwatcher_dnotify.cpp
index 516004b53..80771f03a 100644
--- a/src/core/io/qfilesystemwatcher_dnotify.cpp
+++ b/src/core/io/qfilesystemwatcher_dnotify.cpp
@@ -37,14 +37,14 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qsocketnotifier.h>
-#include <qcoreapplication.h>
-#include <qfileinfo.h>
-#include <qthread.h>
-#include <qtimer.h>
-#include <qwaitcondition.h>
-#include <qmutex.h>
-#include <qdir.h>
+#include "qsocketnotifier.h"
+#include "qcoreapplication.h"
+#include "qfileinfo.h"
+#include "qthread.h"
+#include "qtimer.h"
+#include "qwaitcondition.h"
+#include "qmutex.h"
+#include "qdir.h"
 
 #include <dirent.h>
 #include <sys/types.h>
diff --git a/src/core/io/qfilesystemwatcher_dnotify_p.h b/src/core/io/qfilesystemwatcher_dnotify_p.h
index 16dbdac0d..9ff1844bd 100644
--- a/src/core/io/qfilesystemwatcher_dnotify_p.h
+++ b/src/core/io/qfilesystemwatcher_dnotify_p.h
@@ -49,10 +49,10 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qmutex.h>
-#include <qhash.h>
-#include <qdatetime.h>
-#include <qfile.h>
+#include "qmutex.h"
+#include "qhash.h"
+#include "qdatetime.h"
+#include "qfile.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/io/qfilesystemwatcher_inotify.cpp b/src/core/io/qfilesystemwatcher_inotify.cpp
index 8b7d83b5a..f56682217 100644
--- a/src/core/io/qfilesystemwatcher_inotify.cpp
+++ b/src/core/io/qfilesystemwatcher_inotify.cpp
@@ -38,11 +38,11 @@
 
 #include "qcore_unix_p.h"
 
-#include <qdebug.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qsocketnotifier.h>
-#include <qvarlengtharray.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qsocketnotifier.h"
+#include "qvarlengtharray.h"
 
 #include <sys/syscall.h>
 #include <sys/ioctl.h>
diff --git a/src/core/io/qfilesystemwatcher_kqueue.cpp b/src/core/io/qfilesystemwatcher_kqueue.cpp
index 949fec9d5..8215b7817 100644
--- a/src/core/io/qfilesystemwatcher_kqueue.cpp
+++ b/src/core/io/qfilesystemwatcher_kqueue.cpp
@@ -39,9 +39,9 @@
 
 #ifndef QT_NO_FILESYSTEMWATCHER
 
-#include <qdebug.h>
-#include <qfile.h>
-#include <qsocketnotifier.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qsocketnotifier.h"
 
 #include <sys/types.h>
 #include <sys/event.h>
diff --git a/src/core/io/qfsfileengine_p.h b/src/core/io/qfsfileengine_p.h
index 0b2f9f8e2..bb05d8579 100644
--- a/src/core/io/qfsfileengine_p.h
+++ b/src/core/io/qfsfileengine_p.h
@@ -46,12 +46,11 @@
 //
 
 #include "qplatformdefs.h"
-#include "QtCore/qfsfileengine.h"
+#include "qfsfileengine.h"
 #include "qabstractfileengine_p.h"
-#include <qfilesystementry_p.h>
-#include <qfilesystemmetadata_p.h>
-#include <qhash.h>
-
+#include "qfilesystementry_p.h"
+#include "qfilesystemmetadata_p.h"
+#include "qhash.h"
 
 #ifndef QT_NO_FSFILEENGINE
 
diff --git a/src/core/io/qnoncontiguousbytedevice.cpp b/src/core/io/qnoncontiguousbytedevice.cpp
index 4d757c060..a1627941c 100644
--- a/src/core/io/qnoncontiguousbytedevice.cpp
+++ b/src/core/io/qnoncontiguousbytedevice.cpp
@@ -32,9 +32,9 @@
 ****************************************************************************/
 
 #include "qnoncontiguousbytedevice_p.h"
-#include <qbuffer.h>
-#include <qdebug.h>
-#include <qfile.h>
+#include "qbuffer.h"
+#include "qdebug.h"
+#include "qfile.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/io/qprocess.cpp b/src/core/io/qprocess.cpp
index 50c3d1fcc..04e5f4735 100644
--- a/src/core/io/qprocess.cpp
+++ b/src/core/io/qprocess.cpp
@@ -34,13 +34,13 @@
 
 #include "qprocess.h"
 #include "qprocess_p.h"
-#include <qdebug.h>
-#include <qstring.h>
-#include <qbytearray.h>
-#include <qelapsedtimer.h>
-#include <qcoreapplication.h>
-#include <qsocketnotifier.h>
-#include <qtimer.h>
+#include "qdebug.h"
+#include "qstring.h"
+#include "qbytearray.h"
+#include "qelapsedtimer.h"
+#include "qcoreapplication.h"
+#include "qsocketnotifier.h"
+#include "qtimer.h"
 #include <qcore_unix_p.h>
 
 //#define QPROCESS_DEBUG
diff --git a/src/core/io/qprocess_unix.cpp b/src/core/io/qprocess_unix.cpp
index 3c7c4a312..d54a1717a 100644
--- a/src/core/io/qprocess_unix.cpp
+++ b/src/core/io/qprocess_unix.cpp
@@ -41,15 +41,15 @@
 #include "qcore_unix_p.h"
 #include <qcoreapplication_p.h>
 #include <qthread_p.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qlist.h>
-#include <qhash.h>
-#include <qmutex.h>
-#include <qsemaphore.h>
-#include <qsocketnotifier.h>
-#include <qthread.h>
-#include <qelapsedtimer.h>
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qlist.h"
+#include "qhash.h"
+#include "qmutex.h"
+#include "qsemaphore.h"
+#include "qsocketnotifier.h"
+#include "qthread.h"
+#include "qelapsedtimer.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/core/io/qresource.cpp b/src/core/io/qresource.cpp
index a2eeabf69..30b99a409 100644
--- a/src/core/io/qresource.cpp
+++ b/src/core/io/qresource.cpp
@@ -43,7 +43,7 @@
 #include "qdatetime.h"
 #include "qbytearray.h"
 #include "qstringlist.h"
-#include <qshareddata.h>
+#include "qshareddata.h"
 #include <qplatformdefs.h>
 #include "qabstractfileengine_p.h"
 #include "qcore_unix_p.h"
diff --git a/src/core/io/qsettings.cpp b/src/core/io/qsettings.cpp
index e0d74340a..07287b56f 100644
--- a/src/core/io/qsettings.cpp
+++ b/src/core/io/qsettings.cpp
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qplatformdefs.h"
 #include "qsettings.h"
 
diff --git a/src/core/io/qstandardpaths.cpp b/src/core/io/qstandardpaths.cpp
index 002fc6072..a929331a2 100644
--- a/src/core/io/qstandardpaths.cpp
+++ b/src/core/io/qstandardpaths.cpp
@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qstandardpaths.h>
+#include "qstandardpaths.h"
 
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qhash.h>
-#include <qobject.h>
-#include <qcoreapplication.h>
+#include "qdir.h"
+#include "qfileinfo.h"
+#include "qhash.h"
+#include "qobject.h"
+#include "qcoreapplication.h"
 
 #ifndef QT_NO_STANDARDPATHS
 
diff --git a/src/core/io/qstandardpaths_unix.cpp b/src/core/io/qstandardpaths_unix.cpp
index d5596cbbe..8fd36b371 100644
--- a/src/core/io/qstandardpaths_unix.cpp
+++ b/src/core/io/qstandardpaths_unix.cpp
@@ -24,15 +24,15 @@
 *
 ***********************************************************************/
 
-#include <qstandardpaths.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qhash.h>
-#include <qtextstream.h>
+#include "qstandardpaths.h"
+#include "qdir.h"
+#include "qfile.h"
+#include "qhash.h"
+#include "qtextstream.h"
 #include <qfilesystemengine_p.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <qcoreapplication.h>
+#include "qcoreapplication.h"
 
 #ifndef QT_NO_STANDARDPATHS
 
diff --git a/src/core/json/qjson.cpp b/src/core/json/qjson.cpp
index 79eb4ae29..d296620b6 100644
--- a/src/core/json/qjson.cpp
+++ b/src/core/json/qjson.cpp
@@ -24,7 +24,7 @@
 ***********************************************************************/
 
 #include <qjson_p.h>
-#include <qalgorithms.h>
+#include "qalgorithms.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/json/qjson_p.h b/src/core/json/qjson_p.h
index fb5bdc2d4..4a46d13c3 100644
--- a/src/core/json/qjson_p.h
+++ b/src/core/json/qjson_p.h
@@ -26,14 +26,14 @@
 #ifndef QJSON_P_H
 #define QJSON_P_H
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsondocument.h>
-#include <qjsonarray.h>
-#include <qatomic.h>
-#include <qstring.h>
-#include <qendian.h>
-#include <qnumeric.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsondocument.h"
+#include "qjsonarray.h"
+#include "qatomic.h"
+#include "qstring.h"
+#include "qendian.h"
+#include "qnumeric.h"
 #include <limits.h>
 #include <limits>
 
diff --git a/src/core/json/qjsonarray.cpp b/src/core/json/qjsonarray.cpp
index 74e2c23e0..5032764ff 100644
--- a/src/core/json/qjsonarray.cpp
+++ b/src/core/json/qjsonarray.cpp
@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qjsonvalue.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdebug.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qjsonvalue.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdebug.h"
 
 #include <qjsonwriter_p.h>
 #include <qjson_p.h>
diff --git a/src/core/json/qjsondocument.cpp b/src/core/json/qjsondocument.cpp
index 221b465ab..8e6657145 100644
--- a/src/core/json/qjsondocument.cpp
+++ b/src/core/json/qjsondocument.cpp
@@ -23,13 +23,13 @@
 *
 ***********************************************************************/
 
-#include <qjsondocument.h>
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdebug.h>
+#include "qjsondocument.h"
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdebug.h"
 #include <qjsonwriter_p.h>
 #include <qjsonparser_p.h>
 #include <qjson_p.h>
diff --git a/src/core/json/qjsonobject.cpp b/src/core/json/qjsonobject.cpp
index 3089548f7..173964177 100644
--- a/src/core/json/qjsonobject.cpp
+++ b/src/core/json/qjsonobject.cpp
@@ -23,12 +23,12 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qstringlist.h>
-#include <qdebug.h>
-#include <qvariant.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qstringlist.h"
+#include "qdebug.h"
+#include "qvariant.h"
 #include <qjson_p.h>
 #include <qjsonwriter_p.h>
 
diff --git a/src/core/json/qjsonobject.h b/src/core/json/qjsonobject.h
index 7633d1fb2..84799c785 100644
--- a/src/core/json/qjsonobject.h
+++ b/src/core/json/qjsonobject.h
@@ -26,7 +26,7 @@
 #ifndef QJSONOBJECT_H
 #define QJSONOBJECT_H
 
-#include <qjsonvalue.h>
+#include "qjsonvalue.h"
 #include <QtCore/qcontainerfwd.h>
 #include <QtCore/qiterator.h>
 
diff --git a/src/core/json/qjsonparser.cpp b/src/core/json/qjsonparser.cpp
index fe658c49b..3a4b687e5 100644
--- a/src/core/json/qjsonparser.cpp
+++ b/src/core/json/qjsonparser.cpp
@@ -23,8 +23,8 @@
 *
 ***********************************************************************/
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
 #include <qjsonparser_p.h>
 #include <qjson_p.h>
 
diff --git a/src/core/json/qjsonparser_p.h b/src/core/json/qjsonparser_p.h
index 8df623cdc..4fc26811b 100644
--- a/src/core/json/qjsonparser_p.h
+++ b/src/core/json/qjsonparser_p.h
@@ -26,8 +26,8 @@
 #ifndef QJSONPARSER_P_H
 #define QJSONPARSER_P_H
 
-#include <qjsondocument.h>
-#include <qvarlengtharray.h>
+#include "qjsondocument.h"
+#include "qvarlengtharray.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/json/qjsonvalue.cpp b/src/core/json/qjsonvalue.cpp
index 7a7cd1ec2..a706a0923 100644
--- a/src/core/json/qjsonvalue.cpp
+++ b/src/core/json/qjsonvalue.cpp
@@ -24,13 +24,13 @@
 *
 ***********************************************************************/
 
-#include <qjsonobject.h>
-#include <qjsonvalue.h>
-#include <qjsonarray.h>
-#include <qjsonarray.h>
-#include <qvariant.h>
-#include <qstringlist.h>
-#include <qdebug.h>
+#include "qjsonobject.h"
+#include "qjsonvalue.h"
+#include "qjsonarray.h"
+#include "qjsonarray.h"
+#include "qvariant.h"
+#include "qstringlist.h"
+#include "qdebug.h"
 
 #include <qjson_p.h>
 
diff --git a/src/core/json/qjsonwriter_p.h b/src/core/json/qjsonwriter_p.h
index 6ce7a28b2..0e8f8f6b2 100644
--- a/src/core/json/qjsonwriter_p.h
+++ b/src/core/json/qjsonwriter_p.h
@@ -26,7 +26,7 @@
 #ifndef QJSONWRITER_P_H
 #define QJSONWRITER_P_H
 
-#include <qjsonvalue.h>
+#include "qjsonvalue.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/kernel/qabstractitemmodel.cpp b/src/core/kernel/qabstractitemmodel.cpp
index e2edb2626..821b7c746 100644
--- a/src/core/kernel/qabstractitemmodel.cpp
+++ b/src/core/kernel/qabstractitemmodel.cpp
@@ -33,14 +33,14 @@
 
 #include "qabstractitemmodel.h"
 #include <qabstractitemmodel_p.h>
-#include <qdatastream.h>
-#include <qstringlist.h>
-#include <qsize.h>
-#include <qmimedata.h>
-#include <qdebug.h>
-#include <qvector.h>
-#include <qstack.h>
-#include <qbitarray.h>
+#include "qdatastream.h"
+#include "qstringlist.h"
+#include "qsize.h"
+#include "qmimedata.h"
+#include "qdebug.h"
+#include "qvector.h"
+#include "qstack.h"
+#include "qbitarray.h"
 
 #include <limits.h>
 
diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 95c30f7c7..0ff9634bd 100644
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -38,24 +38,24 @@
 #include "qcoreevent.h"
 #include "qeventloop.h"
 #include "qcorecmdlineargs_p.h"
-#include <qdatastream.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qhash.h>
+#include "qdatastream.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qhash.h"
 #include <qprocess_p.h>
-#include <qtextcodec.h>
-#include <qthread.h>
-#include <qthreadpool.h>
+#include "qtextcodec.h"
+#include "qthread.h"
+#include "qthreadpool.h"
 #include <qthread_p.h>
-#include <qelapsedtimer.h>
-#include <qlibraryinfo.h>
-#include <qvarlengtharray.h>
+#include "qelapsedtimer.h"
+#include "qlibraryinfo.h"
+#include "qvarlengtharray.h"
 #include <qfactoryloader_p.h>
 #include <qlocale_p.h>
 #include <qmutexpool_p.h>
-#include <qscopedpointer.h>
+#include "qscopedpointer.h"
 
 #if !defined(QT_NO_GLIB)
 #  include "qeventdispatcher_glib_p.h"
diff --git a/src/core/kernel/qmetaobject.cpp b/src/core/kernel/qmetaobject.cpp
index 93557f773..06f4fb8bf 100644
--- a/src/core/kernel/qmetaobject.cpp
+++ b/src/core/kernel/qmetaobject.cpp
@@ -35,16 +35,16 @@
 #include "qmetatype.h"
 #include "qobject.h"
 
-#include <qcoreapplication.h>
-#include <qcoreevent.h>
-#include <qdatastream.h>
-#include <qstringlist.h>
-#include <qthread.h>
-#include <qvarlengtharray.h>
-#include <qvariant.h>
-#include <qhash.h>
-#include <qdebug.h>
-#include <qsemaphore.h>
+#include "qcoreapplication.h"
+#include "qcoreevent.h"
+#include "qdatastream.h"
+#include "qstringlist.h"
+#include "qthread.h"
+#include "qvarlengtharray.h"
+#include "qvariant.h"
+#include "qhash.h"
+#include "qdebug.h"
+#include "qsemaphore.h"
 
 #include "qobject_p.h"
 #include "qmetaobject_p.h"
diff --git a/src/core/kernel/qmetaobject_p.h b/src/core/kernel/qmetaobject_p.h
index 212a4e34a..8263121ec 100644
--- a/src/core/kernel/qmetaobject_p.h
+++ b/src/core/kernel/qmetaobject_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qobjectdefs.h>
+#include "qobjectdefs.h"
 #include <qcorecommon_p.h>
 
 #ifndef QT_NO_QOBJECT
diff --git a/src/core/kernel/qobject.cpp b/src/core/kernel/qobject.cpp
index ef5854f35..d6c180960 100644
--- a/src/core/kernel/qobject.cpp
+++ b/src/core/kernel/qobject.cpp
@@ -40,15 +40,15 @@
 #include "qcoreapplication_p.h"
 #include "qvariant.h"
 #include "qmetaobject.h"
-#include <qregexp.h>
-#include <qthread.h>
+#include "qregexp.h"
+#include "qthread.h"
 #include <qthread_p.h>
-#include <qdebug.h>
-#include <qhash.h>
-#include <qpair.h>
-#include <qset.h>
-#include <qsemaphore.h>
-#include <qsharedpointer.h>
+#include "qdebug.h"
+#include "qhash.h"
+#include "qpair.h"
+#include "qset.h"
+#include "qsemaphore.h"
+#include "qsharedpointer.h"
 
 #include <qorderedmutexlocker_p.h>
 #include <qmutexpool_p.h>
diff --git a/src/core/kernel/qsharedmemory.cpp b/src/core/kernel/qsharedmemory.cpp
index 230cf2a55..2b32024dc 100644
--- a/src/core/kernel/qsharedmemory.cpp
+++ b/src/core/kernel/qsharedmemory.cpp
@@ -34,9 +34,9 @@
 #include "qsharedmemory.h"
 #include "qsharedmemory_p.h"
 #include "qsystemsemaphore.h"
-#include <qdir.h>
-#include <qcryptographichash.h>
-#include <qdebug.h>
+#include "qdir.h"
+#include "qcryptographichash.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/kernel/qsharedmemory_unix.cpp b/src/core/kernel/qsharedmemory_unix.cpp
index cf59752e1..81ccc1ad8 100644
--- a/src/core/kernel/qsharedmemory_unix.cpp
+++ b/src/core/kernel/qsharedmemory_unix.cpp
@@ -36,8 +36,8 @@
 #include "qsharedmemory.h"
 #include "qsharedmemory_p.h"
 
-#include <qdebug.h>
-#include <qfile.h>
+#include "qdebug.h"
+#include "qfile.h"
 
 #ifndef QT_NO_SHAREDMEMORY
 #include <sys/types.h>
diff --git a/src/core/kernel/qsystemerror_p.h b/src/core/kernel/qsystemerror_p.h
index ef40c554c..852e4d1ab 100644
--- a/src/core/kernel/qsystemerror_p.h
+++ b/src/core/kernel/qsystemerror_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qstring.h>
+#include "qstring.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/kernel/qsystemsemaphore.cpp b/src/core/kernel/qsystemsemaphore.cpp
index 46ba98fb6..2da66c652 100644
--- a/src/core/kernel/qsystemsemaphore.cpp
+++ b/src/core/kernel/qsystemsemaphore.cpp
@@ -33,7 +33,6 @@
 
 #include "qsystemsemaphore.h"
 #include "qsystemsemaphore_p.h"
-#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/kernel/qsystemsemaphore_unix.cpp b/src/core/kernel/qsystemsemaphore_unix.cpp
index 2969a57e6..a244be2fd 100644
--- a/src/core/kernel/qsystemsemaphore_unix.cpp
+++ b/src/core/kernel/qsystemsemaphore_unix.cpp
@@ -34,9 +34,9 @@
 #include "qsystemsemaphore.h"
 #include "qsystemsemaphore_p.h"
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qfile.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
+#include "qfile.h"
 
 #ifndef QT_NO_SYSTEMSEMAPHORE
 
diff --git a/src/core/plugin/qfactoryloader.cpp b/src/core/plugin/qfactoryloader.cpp
index 220c20164..bb09b91e2 100644
--- a/src/core/plugin/qfactoryloader.cpp
+++ b/src/core/plugin/qfactoryloader.cpp
@@ -36,9 +36,9 @@
 #ifndef QT_NO_LIBRARY
 #include "qfactoryinterface.h"
 #include "qmap.h"
-#include <qdir.h>
-#include <qsettings.h>
-#include <qdebug.h>
+#include "qdir.h"
+#include "qsettings.h"
+#include "qdebug.h"
 #include "qmutex.h"
 #include "qplugin.h"
 #include "qpluginloader.h"
diff --git a/src/core/plugin/qlibrary.cpp b/src/core/plugin/qlibrary.cpp
index 6be916a58..53370063c 100644
--- a/src/core/plugin/qlibrary.cpp
+++ b/src/core/plugin/qlibrary.cpp
@@ -39,20 +39,19 @@
 #ifndef QT_NO_LIBRARY
 
 #include "qlibrary_p.h"
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qmutex.h>
-#include <qmap.h>
-#include <qsettings.h>
-#include <qdatetime.h>
-#include <qcoreapplication_p.h>
-#ifndef NO_ERRNO_H
+#include "qstringlist.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qmutex.h"
+#include "qmap.h"
+#include "qsettings.h"
+#include "qdatetime.h"
+#include "qcoreapplication_p.h"
+#include "qdebug.h"
+#include "qvector.h"
+#include "qdir.h"
+
 #include <errno.h>
-#endif // NO_ERROR_H
-#include <qdebug.h>
-#include <qvector.h>
-#include <qdir.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/plugin/qlibrary_unix.cpp b/src/core/plugin/qlibrary_unix.cpp
index 62afa674b..d0293d7c2 100644
--- a/src/core/plugin/qlibrary_unix.cpp
+++ b/src/core/plugin/qlibrary_unix.cpp
@@ -33,11 +33,11 @@
 
 #include "qplatformdefs.h"
 
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qlibrary_p.h>
-#include <qcoreapplication.h>
-#include <qfilesystementry_p.h>
+#include "qfile.h"
+#include "qstringlist.h"
+#include "qlibrary_p.h"
+#include "qcoreapplication.h"
+#include "qfilesystementry_p.h"
 
 #ifndef QT_NO_LIBRARY
 
diff --git a/src/core/plugin/qpluginloader.cpp b/src/core/plugin/qpluginloader.cpp
index 757e007b0..c1282ccc5 100644
--- a/src/core/plugin/qpluginloader.cpp
+++ b/src/core/plugin/qpluginloader.cpp
@@ -35,7 +35,7 @@
 
 #include "qplugin.h"
 #include "qpluginloader.h"
-#include <qfileinfo.h>
+#include "qfileinfo.h"
 #include "qlibrary_p.h"
 #include "qdebug.h"
 #include "qdir.h"
diff --git a/src/core/tools/qbitarray.cpp b/src/core/tools/qbitarray.cpp
index 7e8eff2bd..17cc3978e 100644
--- a/src/core/tools/qbitarray.cpp
+++ b/src/core/tools/qbitarray.cpp
@@ -32,8 +32,8 @@
 ****************************************************************************/
 
 #include "qbitarray.h"
-#include <qdatastream.h>
-#include <qdebug.h>
+#include "qdatastream.h"
+#include "qdebug.h"
 #include <string.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/tools/qbytedata_p.h b/src/core/tools/qbytedata_p.h
index ccf3282ed..266f198c5 100644
--- a/src/core/tools/qbytedata_p.h
+++ b/src/core/tools/qbytedata_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qbytearray.h>
+#include "qbytearray.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qcommandlineoption.cpp b/src/core/tools/qcommandlineoption.cpp
index fc450c408..798ac1a54 100644
--- a/src/core/tools/qcommandlineoption.cpp
+++ b/src/core/tools/qcommandlineoption.cpp
@@ -28,8 +28,8 @@
 ** Copyright (C) 2013 David Faure <faure@kde.org>
 *****************************************************/
 
-#include <qcommandlineoption.h>
-#include <qset.h>
+#include "qcommandlineoption.h"
+#include "qset.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qcommandlineparser.cpp b/src/core/tools/qcommandlineparser.cpp
index 8bc054a62..fc7e7fe46 100644
--- a/src/core/tools/qcommandlineparser.cpp
+++ b/src/core/tools/qcommandlineparser.cpp
@@ -28,11 +28,11 @@
 ** Copyright (C) 2013 David Faure <faure@kde.org>
 *****************************************************/
 
-#include <qcommandlineparser.h>
+#include "qcommandlineparser.h"
+#include "qcoreapplication.h"
+#include "qhash.h"
+#include "qvector.h"
 
-#include <qcoreapplication.h>
-#include <qhash.h>
-#include <qvector.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/core/tools/qcryptographichash.cpp b/src/core/tools/qcryptographichash.cpp
index f1d186b3a..45fbc7d18 100644
--- a/src/core/tools/qcryptographichash.cpp
+++ b/src/core/tools/qcryptographichash.cpp
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include <qcryptographichash.h>
-#include <qiodevice.h>
+#include "qcryptographichash.h"
+#include "qiodevice.h"
 
 #include <openssl/md5.h>
 #include <openssl/md4.h>
diff --git a/src/core/tools/qhash.cpp b/src/core/tools/qhash.cpp
index 2a54f9a01..4e8148ad5 100644
--- a/src/core/tools/qhash.cpp
+++ b/src/core/tools/qhash.cpp
@@ -32,13 +32,10 @@
 ****************************************************************************/
 
 #include "qhash.h"
+#include "qbitarray.h"
+#include "qstring.h"
 
-#include <qbitarray.h>
-#include <qstring.h>
 #include <stdlib.h>
-#ifdef QT_QHASH_DEBUG
-#include <qstring.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qline.cpp b/src/core/tools/qline.cpp
index 95dc994c3..3d752e789 100644
--- a/src/core/tools/qline.cpp
+++ b/src/core/tools/qline.cpp
@@ -35,7 +35,7 @@
 #include "qdebug.h"
 #include "qdatastream.h"
 #include "qmath.h"
-#include <qnumeric.h>
+#include "qnumeric.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qmap.cpp b/src/core/tools/qmap.cpp
index 56bab1492..f31e30144 100644
--- a/src/core/tools/qmap.cpp
+++ b/src/core/tools/qmap.cpp
@@ -36,8 +36,8 @@
 #include <stdlib.h>
 
 #ifdef QT_QMAP_DEBUG
-# include <qstring.h>
-# include <qvector.h>
+# include "qstring.h"
+# include "qvector.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/core/tools/qshareddata.cpp b/src/core/tools/qshareddata.cpp
index ec695a0e3..fabffc9be 100644
--- a/src/core/tools/qshareddata.cpp
+++ b/src/core/tools/qshareddata.cpp
@@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 
-#include <qshareddata.h>
+#include "qshareddata.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qsharedpointer.cpp b/src/core/tools/qsharedpointer.cpp
index fa369bd00..38309df17 100644
--- a/src/core/tools/qsharedpointer.cpp
+++ b/src/core/tools/qsharedpointer.cpp
@@ -1166,8 +1166,8 @@
     compile. Use qSharedPointerConstCast to cast away the constness.
 */
 
-#include <qset.h>
-#include <qmutex.h>
+#include "qset.h"
+#include "qmutex.h"
 
 #if !defined(QT_NO_QOBJECT)
 #include "qobject_p.h"
diff --git a/src/core/tools/qstring.cpp b/src/core/tools/qstring.cpp
index 914ca89cd..307b40a4e 100644
--- a/src/core/tools/qstring.cpp
+++ b/src/core/tools/qstring.cpp
@@ -35,11 +35,11 @@
 #include "qregexp.h"
 #include "qunicodetables_p.h"
 #ifndef QT_NO_TEXTCODEC
-#include <qtextcodec.h>
+#include "qtextcodec.h"
 #endif
 #include <qutfcodec_p.h>
-#include <qdatastream.h>
-#include <qlist.h>
+#include "qdatastream.h"
+#include "qlist.h"
 #include "qlocale.h"
 #include "qlocale_p.h"
 #include "qlocale_tools_p.h"
diff --git a/src/core/tools/qstringlist.cpp b/src/core/tools/qstringlist.cpp
index d8252f2a7..cab4cf559 100644
--- a/src/core/tools/qstringlist.cpp
+++ b/src/core/tools/qstringlist.cpp
@@ -31,8 +31,8 @@
 **
 ****************************************************************************/
 
-#include <qstringlist.h>
-#include <qset.h>
+#include "qstringlist.h"
+#include "qset.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qtextboundaryfinder.cpp b/src/core/tools/qtextboundaryfinder.cpp
index ad9352d1f..adb47a992 100644
--- a/src/core/tools/qtextboundaryfinder.cpp
+++ b/src/core/tools/qtextboundaryfinder.cpp
@@ -30,8 +30,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtCore/qtextboundaryfinder.h>
-#include <qdebug.h>
+
+#include "qtextboundaryfinder.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/dbus/qdbusabstractadaptor.cpp b/src/dbus/qdbusabstractadaptor.cpp
index cf8503d1f..4ed4d7bc5 100644
--- a/src/dbus/qdbusabstractadaptor.cpp
+++ b/src/dbus/qdbusabstractadaptor.cpp
@@ -40,15 +40,12 @@
 ****************************************************************************/
 
 #include "qdbusabstractadaptor.h"
-
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qset.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qthread.h>
-
+#include "qcoreapplication.h"
+#include "qmetaobject.h"
+#include "qset.h"
+#include "qtimer.h"
+#include "qthread.h"
 #include "qdbusconnection.h"
-
 #include "qdbusconnection_p.h"  // for qDBusParametersForMethod
 #include "qdbusabstractadaptor_p.h"
 #include "qdbusmetatype_p.h"
diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h
index 2bb714e8a..5b6395fcd 100644
--- a/src/dbus/qdbusabstractadaptor_p.h
+++ b/src/dbus/qdbusabstractadaptor_p.h
@@ -46,7 +46,7 @@
 #ifndef QDBUSABSTRACTADAPTORPRIVATE_H
 #define QDBUSABSTRACTADAPTORPRIVATE_H
 
-#include <qdbusabstractadaptor.h>
+#include "qdbusabstractadaptor.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qmap.h>
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 92425d76a..6338b38f0 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -42,7 +42,7 @@
 #include "qdbusabstractinterface.h"
 #include "qdbusabstractinterface_p.h"
 
-#include <qthread.h>
+#include "qthread.h"
 
 #include "qdbusargument.h"
 #include "qdbuspendingcall.h"
@@ -51,7 +51,7 @@
 #include "qdbusmetatype_p.h"
 #include "qdbusutil_p.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h
index 6d1c5b797..1a8217f1a 100644
--- a/src/dbus/qdbusabstractinterface_p.h
+++ b/src/dbus/qdbusabstractinterface_p.h
@@ -46,9 +46,9 @@
 #ifndef QDBUSABSTRACTINTERFACEPRIVATE_H
 #define QDBUSABSTRACTINTERFACEPRIVATE_H
 
-#include <qdbusabstractinterface.h>
-#include <qdbusconnection.h>
-#include <qdbuserror.h>
+#include "qdbusabstractinterface.h"
+#include "qdbusconnection.h"
+#include "qdbuserror.h"
 #include "qdbusconnection_p.h"
 #include "qobject_p.h"
 
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp
index 91080b1d4..79318d548 100644
--- a/src/dbus/qdbusargument.cpp
+++ b/src/dbus/qdbusargument.cpp
@@ -41,16 +41,16 @@
 
 #include "qdbusargument.h"
 
-#include <qatomic.h>
-#include <qbytearray.h>
-#include <qlist.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qrect.h>
-#include <qline.h>
+#include "qatomic.h"
+#include "qbytearray.h"
+#include "qlist.h"
+#include "qmap.h"
+#include "qstring.h"
+#include "qstringlist.h"
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qrect.h"
+#include "qline.h"
 
 #include "qdbusargument_p.h"
 #include "qdbusmetatype_p.h"
diff --git a/src/dbus/qdbusargument_p.h b/src/dbus/qdbusargument_p.h
index b61969694..18b4c7fd5 100644
--- a/src/dbus/qdbusargument_p.h
+++ b/src/dbus/qdbusargument_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdbusargument.h>
+#include "qdbusargument.h"
 #include "qdbusunixfiledescriptor.h"
 
 #include <dbus/dbus.h>
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 4d63bcea4..af1a2c636 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
-#include <qcoreapplication.h>
-#include <qstringlist.h>
-#include <qthread.h>
+#include "qdebug.h"
+#include "qcoreapplication.h"
+#include "qstringlist.h"
+#include "qthread.h"
 
 #include "qdbusconnection.h"
 #include "qdbusconnectioninterface.h"
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index eb7e44848..18d200a0b 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -46,9 +46,9 @@
 #ifndef QDBUSCONNECTION_P_H
 #define QDBUSCONNECTION_P_H
 
-#include <qdbuserror.h>
-#include <qdbusconnection.h>
-#include <qdbusmessage.h>
+#include "qdbuserror.h"
+#include "qdbusconnection.h"
+#include "qdbusmessage.h"
 
 #include <QtCore/qatomic.h>
 #include <QtCore/qhash.h>
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp
index 09d87d642..a460b2747 100644
--- a/src/dbus/qdbuserror.cpp
+++ b/src/dbus/qdbuserror.cpp
@@ -40,9 +40,7 @@
 ****************************************************************************/
 
 #include "qdbuserror.h"
-
-#include <qdebug.h>
-
+#include "qdebug.h"
 #include "qdbusmessage.h"
 #include "qdbusmessage_p.h"
 
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index f0bca65ae..36972c2f9 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <qcoreapplication.h>
-#include <qdebug.h>
-#include <qmetaobject.h>
-#include <qobject.h>
-#include <qsocketnotifier.h>
-#include <qstringlist.h>
-#include <qtimer.h>
-#include <qthread.h>
+#include "qcoreapplication.h"
+#include "qdebug.h"
+#include "qmetaobject.h"
+#include "qobject.h"
+#include "qsocketnotifier.h"
+#include "qstringlist.h"
+#include "qtimer.h"
+#include "qthread.h"
 
 #include "qdbusargument.h"
 #include "qdbusconnection_p.h"
diff --git a/src/dbus/qdbusinterface_p.h b/src/dbus/qdbusinterface_p.h
index b583bcb4a..e2d91a617 100644
--- a/src/dbus/qdbusinterface_p.h
+++ b/src/dbus/qdbusinterface_p.h
@@ -48,7 +48,7 @@
 
 #include "qdbusabstractinterface_p.h"
 #include "qdbusmetaobject_p.h"
-#include <qdbusinterface.h>
+#include "qdbusinterface.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/dbus/qdbusmessage.cpp b/src/dbus/qdbusmessage.cpp
index 8fbcf2d8a..9fe172c2f 100644
--- a/src/dbus/qdbusmessage.cpp
+++ b/src/dbus/qdbusmessage.cpp
@@ -40,10 +40,8 @@
 ****************************************************************************/
 
 #include "qdbusmessage.h"
-
-#include <qdebug.h>
-#include <qstringlist.h>
-
+#include "qdebug.h"
+#include "qstringlist.h"
 #include "qdbusargument_p.h"
 #include "qdbuserror.h"
 #include "qdbusmessage_p.h"
diff --git a/src/dbus/qdbusmessage_p.h b/src/dbus/qdbusmessage_p.h
index c2ebaf480..4a7f425ce 100644
--- a/src/dbus/qdbusmessage_p.h
+++ b/src/dbus/qdbusmessage_p.h
@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qatomic.h>
-#include <qstring.h>
-#include <qdbusmessage.h>
-#include <qdbusconnection.h>
+#include "qatomic.h"
+#include "qstring.h"
+#include "qdbusmessage.h"
+#include "qdbusconnection.h"
 
 struct DBusMessage;
 
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index bcfca9fc1..dbf430535 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -40,14 +40,9 @@
 ****************************************************************************/
 
 #include "qdbusmetatype.h"
-
-#include <string.h>
-
-#include <qbytearray.h>
-#include <qglobal.h>
-#include <qreadwritelock.h>
-#include <qvector.h>
-
+#include "qbytearray.h"
+#include "qreadwritelock.h"
+#include "qvector.h"
 #include "qdbusmessage.h"
 #include "qdbusunixfiledescriptor.h"
 #include "qdbusutil_p.h"
@@ -55,6 +50,7 @@
 #include "qdbusargument_p.h"
 
 #include <dbus/dbus.h>
+#include <string.h>
 
 #ifndef DBUS_TYPE_UNIX_FD
 # define DBUS_TYPE_UNIX_FD int('h')
diff --git a/src/dbus/qdbusmetatype_p.h b/src/dbus/qdbusmetatype_p.h
index c122bdb78..0af6a81de 100644
--- a/src/dbus/qdbusmetatype_p.h
+++ b/src/dbus/qdbusmetatype_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdbusmetatype.h>
+#include "qdbusmetatype.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/dbus/qdbuspendingcall_p.h b/src/dbus/qdbuspendingcall_p.h
index 8c8749166..0549534fe 100644
--- a/src/dbus/qdbuspendingcall_p.h
+++ b/src/dbus/qdbuspendingcall_p.h
@@ -46,12 +46,11 @@
 #ifndef QDBUSPENDINGCALL_P_H
 #define QDBUSPENDINGCALL_P_H
 
-#include <qshareddata.h>
-#include <qpointer.h>
-#include <qlist.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
-
+#include "qshareddata.h"
+#include "qpointer.h"
+#include "qlist.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
 #include "qdbusmessage.h"
 
 #include <dbus/dbus.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
index f285ca01b..d2b047519 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -43,8 +43,7 @@
 
 #include "qdeclarativeitem.h"
 #include "qdeclarativeitem_p.h"
-
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QDebug>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
index ce93788b2..8793dde5f 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
@@ -36,7 +36,7 @@
 
 #include "qdeclarativeitem.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QObject>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 9b1e132c0..64c8f72fb 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -44,7 +44,7 @@
 
 #ifndef QT_NO_MOVIE
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeengine_p.h>
 
 #include <QMovie>
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index ea4b088ce..642949821 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativeborderimage_p.h"
 #include "qdeclarativeborderimage_p_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeengine_p.h>
 
 #include <QNetworkRequest>
diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
index 897ebb7de..4d2b52aba 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QtGui/qevent.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 26f156739..60b55d52a 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeflickable_p.h"
 #include "qdeclarativeflickable_p_p.h"
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <QGraphicsSceneEvent>
 #include <QPointer>
 #include <QTimer>
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index 925e7fa55..6f330256c 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -50,11 +50,11 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativeitemchangelistener_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativetimeline_p_p.h>
 #include <qdeclarativeanimation_p_p.h>
 
-#include <qdatetime.h>
+#include "qdatetime.h"
 #include "qplatformdefs.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index daba96848..1408daa1e 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -44,7 +44,7 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativeguard_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QtGui/qgraphicstransform.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 99f4fa834..4f3d800f7 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -50,7 +50,7 @@
 #include <qlistmodelinterface_p.h>
 #include <QEvent>
 
-#include <qmath.h>
+#include "qmath.h"
 #include <math.h>
 #include "qplatformdefs.h"
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index c69bc0283..c73500ae4 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -42,8 +42,8 @@
 #include "qdeclarativeimagebase_p.h"
 #include "qdeclarativeimagebase_p_p.h"
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeengine.h"
+#include "qdeclarativeinfo.h"
 #include <qdeclarativepixmapcache_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index a5a02dc92..062828960 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -46,13 +46,13 @@
 #include <qgraphicsitem_p.h>
 #include <qdeclarativeitem_p.h>
 
-#include <qdeclarativeengine.h>
+#include "qdeclarativeengine.h"
 #include <qdeclarativeopenmetaobject_p.h>
 #include <qdeclarativestate_p.h>
-#include <qdeclarativeview.h>
+#include "qdeclarativeview.h"
 #include <qdeclarativestategroup_p.h>
-#include <qdeclarativecomponent.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativecomponent.h"
+#include "qdeclarativeinfo.h"
 
 #include <QDebug>
 #include <QPen>
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index 7d1ed56f9..caa7ba46e 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -57,8 +57,8 @@
 #include <qdeclarativenotifier_p.h>
 #include <qdeclarativeglobal_p.h>
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
 
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
index c6828a679..df256da67 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEITEMMODULE_H
 #define QDECLARATIVEITEMMODULE_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index ccd42ff08..c526859b6 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -45,13 +45,13 @@
 #include "qdeclarativevisualitemmodel_p.h"
 
 #include "qdeclarativesmoothedanimation_p_p.h"
-#include <qdeclarativeexpression.h>
-#include <qdeclarativeengine.h>
+#include "qdeclarativeexpression.h"
+#include "qdeclarativeengine.h"
 #include <qdeclarativeguard_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <qlistmodelinterface_p.h>
-#include <qmath.h>
+#include "qmath.h"
 #include <QEvent>
 #include "qplatformdefs.h"
 
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index a24c2ea4b..ff4d93ed2 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeloader_p_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeengine_p.h>
 #include <qdeclarativeglobal_p.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
index 47ddabd4a..98db5380c 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -47,9 +47,9 @@
 
 #include "qdeclarativeitem_p.h"
 
-#include <qdatetime.h>
-#include <qbasictimer.h>
-#include <qgraphicssceneevent.h>
+#include "qdatetime.h"
+#include "qbasictimer.h"
+#include "qgraphicssceneevent.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index bfb653f0d..e69e4858f 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -49,7 +49,7 @@
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QPaintEngine>
-#include <qmath.h>
+#include "qmath.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p.h b/src/declarative/graphicsitems/qdeclarativepath_p.h
index f76184f6a..cfb967449 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p.h
@@ -36,7 +36,7 @@
 
 #include "qdeclarativeitem.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QObject>
 #include <QtGui/QPainterPath>
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
index a4d9702ec..f1d95eac5 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
@@ -47,7 +47,7 @@
 
 #include "qdeclarativepath_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <qobject_p.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 9620665bd..18dbc0d6a 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -49,7 +49,7 @@
 #include <qlistmodelinterface_p.h>
 #include <QGraphicsSceneEvent>
 
-#include <qmath.h>
+#include "qmath.h"
 #include <math.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index 8f2830fec..62eeee617 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -50,11 +50,11 @@
 #include "qdeclarativeitem_p.h"
 #include "qdeclarativevisualitemmodel_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativeanimation_p_p.h>
 #include <qdeclarativeguard_p.h>
 
-#include <qdatetime.h>
+#include "qdatetime.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p.h
index b08ffbaab..1c954d4cb 100644
--- a/src/declarative/graphicsitems/qdeclarativepincharea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepincharea_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEPINCHAREA_H
 #define QDECLARATIVEPINCHAREA_H
 
-#include <qdeclarativeitem.h>
+#include "qdeclarativeitem.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h
index f2039886e..94de0376a 100644
--- a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h
@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qdatetime.h>
-#include <qbasictimer.h>
-#include <qevent.h>
-#include <qgraphicssceneevent.h>
+#include "qdatetime.h"
+#include "qbasictimer.h"
+#include "qevent.h"
+#include "qgraphicssceneevent.h"
 #include "qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 670049f63..bb912c334 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -42,11 +42,11 @@
 #include "qdeclarativepositioners_p.h"
 #include "qdeclarativepositioners_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativestate_p.h>
 #include <qdeclarativestategroup_p.h>
 #include <qdeclarativestateoperations_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <QtCore/qmath.h>
 
 #include <QDebug>
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
index 8c572ac8b..2a93bf57b 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativescalegrid_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QBuffer>
 #include <QDebug>
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
index f0ccc72f2..64bb9c2ff 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVESCALEGRID_H
 #define QDECLARATIVESCALEGRID_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/QString>
 #include <QtCore/QObject>
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index c0286022a..e64058fd1 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativetext_p.h"
 #include "qdeclarativetext_p_p.h"
 #include <qdeclarativestyledtext_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativepixmapcache_p.h>
 
 #include <QSet>
@@ -51,7 +51,7 @@
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QAbstractTextDocumentLayout>
-#include <qmath.h>
+#include "qmath.h"
 #include <limits.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
index 676575cfa..f86188495 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -47,7 +47,7 @@
 
 #include "qdeclarativeitem.h"
 #include "qdeclarativeimplicitsizeitem_p_p.h"
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtGui/qtextlayout.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 7587f5367..e718dc76d 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -44,7 +44,7 @@
 
 #include "qdeclarativeevents_p_p.h"
 #include <qdeclarativeglobal_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QtCore/qmath.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 085e7634b..6316a7b33 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -48,7 +48,7 @@
 #include "qdeclarativeitem.h"
 #include "qdeclarativeimplicitsizeitem_p_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_NAMESPACE
 class QTextLayout;
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 9d91d7993..54aa187c0 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -43,7 +43,7 @@
 #include "qdeclarativetextinput_p_p.h"
 
 #include <qdeclarativeglobal_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QValidator>
 #include <QTextCursor>
@@ -51,7 +51,7 @@
 #include <QFontMetrics>
 #include <QPainter>
 #include <QTextBoundaryFinder>
-#include <qstyle.h>
+#include "qstyle.h"
 
 #ifndef QT_NO_LINEEDIT
 
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 2b8371aff..55775208d 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -44,23 +44,23 @@
 #include "qdeclarativeitem.h"
 #include "qdeclarativecommon_p.h"
 
-#include <qdeclarativecontext.h>
+#include "qdeclarativecontext.h"
 #include <qdeclarativecontext_p.h>
-#include <qdeclarativeengine.h>
-#include <qdeclarativeexpression.h>
+#include "qdeclarativeengine.h"
+#include "qdeclarativeexpression.h"
 #include <qdeclarativepackage_p.h>
 #include <qdeclarativeopenmetaobject_p.h>
 #include <qdeclarativelistaccessor_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativedata_p.h>
 #include <qdeclarativepropertycache_p.h>
 #include <qdeclarativeguard_p.h>
 #include <qdeclarativeglobal_p.h>
 
-#include <qgraphicsscene.h>
+#include "qgraphicsscene.h"
 #include <qlistmodelinterface_p.h>
-#include <qhash.h>
-#include <qlist.h>
+#include "qhash.h"
+#include "qlist.h"
 #include <qmetaobjectbuilder_p.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
index 3211d6fab..cc1854d24 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEVISUALDATAMODEL_H
 #define QDECLARATIVEVISUALDATAMODEL_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qabstractitemmodel.h>
diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
index beec52333..3fd324044 100644
--- a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp
@@ -43,7 +43,7 @@
 
 #include "qdeclarativejsnodepool_p.h"
 
-#include <qnumeric.h>
+#include "qnumeric.h"
 #include <QHash>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 6522378cc..ca061f59b 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -58,7 +58,7 @@
 #include <QStringList>
 #include <QDebug>
 #include <QApplication>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index fdd6d5603..403630bd3 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -49,8 +49,8 @@
 #include "qdeclarativecompiledbindings_p.h"
 #include "qdeclarativeglobalscriptclass_p.h"
 
-#include <qscriptengine.h>
-#include <qdebug.h>
+#include "qscriptengine.h"
+#include "qdebug.h"
 
 #include <qscriptdeclarativeclass_p.h>
 
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 844ad2dfb..9a0ef57aa 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -55,31 +55,31 @@
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qbitarray.h>
 #include <QtCore/qreadwritelock.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qmetatype.h>
-#include <qobjectdefs.h>
-#include <qdatetime.h>
-#include <qbytearray.h>
-#include <qreadwritelock.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvector.h>
-#include <qlocale.h>
-#include <qcryptographichash.h>
-#include <qscriptvalue.h>
+#include "qfileinfo.h"
+#include "qdir.h"
+#include "qmetatype.h"
+#include "qobjectdefs.h"
+#include "qdatetime.h"
+#include "qbytearray.h"
+#include "qreadwritelock.h"
+#include "qstring.h"
+#include "qstringlist.h"
+#include "qvector.h"
+#include "qlocale.h"
+#include "qcryptographichash.h"
+#include "qscriptvalue.h"
 
 #include <ctype.h>
 
-#include <qbitarray.h>
-#include <qurl.h>
-#include <qvariant.h>
+#include "qbitarray.h"
+#include "qurl.h"
+#include "qvariant.h"
 #ifndef QT_NO_GEOM_VARIANT
-# include <qsize.h>
-# include <qpoint.h>
-# include <qrect.h>
-# include <qline.h>
-# include <qvector3d.h>
+# include "qsize.h"
+# include "qpoint.h"
+# include "qrect.h"
+# include "qline.h"
+# include "qvector3d.h"
 #endif
 #define NS(x) QT_PREPEND_NAMESPACE(x)
 
diff --git a/src/declarative/qml/qdeclarativetypenotavailable_p.h b/src/declarative/qml/qdeclarativetypenotavailable_p.h
index 61816fb20..56983248c 100644
--- a/src/declarative/qml/qdeclarativetypenotavailable_p.h
+++ b/src/declarative/qml/qdeclarativetypenotavailable_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVETYPENOTAVAILABLE_H
 #define QDECLARATIVETYPENOTAVAILABLE_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index ad193a3e8..d259c2ab9 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -46,10 +46,10 @@
 #include "qdeclarativestateoperations_p.h"
 #include "qdeclarativecontext_p.h"
 
-#include <qdeclarativepropertyvaluesource.h>
-#include <qdeclarative.h>
-#include <qdeclarativeinfo.h>
-#include <qdeclarativeexpression.h>
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarative.h"
+#include "qdeclarativeinfo.h"
+#include "qdeclarativeexpression.h"
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativemetatype_p.h>
@@ -57,9 +57,9 @@
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeengine_p.h>
 
-#include <qvariant.h>
-#include <qcolor.h>
-#include <qfile.h>
+#include "qvariant.h"
+#include "qcolor.h"
+#include "qfile.h"
 #include <QParallelAnimationGroup>
 #include <QSequentialAnimationGroup>
 #include <QtCore/qset.h>
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index 6bc1c13c7..82aca627c 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -38,9 +38,9 @@
 #include "qdeclarativestate_p.h"
 #include <QtGui/qvector3d.h>
 
-#include <qdeclarativepropertyvaluesource.h>
-#include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarative.h"
+#include "qdeclarativescriptstring.h"
 
 #include <QtCore/qvariant.h>
 #include <QtCore/qeasingcurve.h>
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index e73f6a716..e24419131 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -50,9 +50,9 @@
 #include "qdeclarativenullablevalue_p_p.h"
 #include "qdeclarativetimeline_p_p.h"
 
-#include <qdeclarative.h>
-#include <qdeclarativeitem.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarative.h"
+#include "qdeclarativeitem.h"
+#include "qdeclarativecontext.h"
 
 #include <QtGui/QPauseAnimation>
 #include <QtGui/QVariantAnimation>
diff --git a/src/declarative/util/qdeclarativeapplication_p.h b/src/declarative/util/qdeclarativeapplication_p.h
index 0869d3209..fdb98120b 100644
--- a/src/declarative/util/qdeclarativeapplication_p.h
+++ b/src/declarative/util/qdeclarativeapplication_p.h
@@ -35,7 +35,7 @@
 #define QDECLARATIVEAPPLICATION_P_H
 
 #include <QtCore/QObject>
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index dfcd49b69..8430fe353 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -44,8 +44,8 @@
 #include "qdeclarativeanimation_p.h"
 #include "qdeclarativetransition_p.h"
 
-#include <qdeclarativecontext.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativecontext.h"
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeguard_p.h>
 #include <qdeclarativeengine_p.h>
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index 848edf489..699e56f95 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -36,9 +36,9 @@
 
 #include "qdeclarativestate_p.h"
 
-#include <qdeclarativepropertyvaluesource.h>
-#include <qdeclarativepropertyvalueinterceptor.h>
-#include <qdeclarative.h>
+#include "qdeclarativepropertyvaluesource.h"
+#include "qdeclarativepropertyvalueinterceptor.h"
+#include "qdeclarative.h"
 #include <QtGui/QAbstractAnimation>
 
 QT_BEGIN_HEADER
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 488a10862..6799c85e2 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -44,9 +44,9 @@
 #include "qdeclarativenullablevalue_p_p.h"
 #include "qdeclarativeguard_p.h"
 
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeproperty.h>
+#include "qdeclarativeengine.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeproperty.h"
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativebind_p.h b/src/declarative/util/qdeclarativebind_p.h
index a18d7b8ed..cc2ce8e8d 100644
--- a/src/declarative/util/qdeclarativebind_p.h
+++ b/src/declarative/util/qdeclarativebind_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEBIND_H
 #define QDECLARATIVEBIND_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index f4998a055..872890423 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -41,12 +41,12 @@
 
 #include "qdeclarativeconnections_p.h"
 
-#include <qdeclarativeexpression.h>
+#include "qdeclarativeexpression.h"
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeboundsignal_p.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarativecontext.h"
 #include <qdeclarativecontext_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
index 5139867b2..9e1c971ef 100644
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -34,8 +34,8 @@
 #ifndef QDECLARATIVECONNECTIONS_H
 #define QDECLARATIVECONNECTIONS_H
 
-#include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
+#include "qdeclarative.h"
+#include "qdeclarativescriptstring.h"
 #include <qdeclarativecustomparser_p.h>
 
 #include <QtCore/qobject.h>
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index a05dd845d..c5b71aa8c 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -41,8 +41,8 @@
 
 #include "qdeclarativefontloader_p.h"
 
-#include <qdeclarativecontext.h>
-#include <qdeclarativeengine.h>
+#include "qdeclarativecontext.h"
+#include "qdeclarativeengine.h"
 
 #include <QStringList>
 #include <QUrl>
@@ -53,7 +53,7 @@
 
 #include <qobject_p.h>
 #include <qdeclarativeengine_p.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativefontloader_p.h b/src/declarative/util/qdeclarativefontloader_p.h
index 23f84024a..879167926 100644
--- a/src/declarative/util/qdeclarativefontloader_p.h
+++ b/src/declarative/util/qdeclarativefontloader_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEFONTLOADER_H
 #define QDECLARATIVEFONTLOADER_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qurl.h>
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 80bcd4a1d..221fa8fc3 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -47,8 +47,8 @@
 #include <qdeclarativecustomparser_p.h>
 #include <qdeclarativeparser_p.h>
 #include <qdeclarativeengine_p.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativecontext.h"
+#include "qdeclarativeinfo.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qstack.h>
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index ce4f1eee1..1b6c44ba5 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVELISTMODEL_H
 #define QDECLARATIVELISTMODEL_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <qdeclarativecustomparser_p.h>
 
 #include <QtCore/QObject>
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index b7b4112f6..e29380f59 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -43,7 +43,7 @@
 #include "qdeclarativepropertycache_p.h"
 #include "qdeclarativedata_p.h"
 #include <qmetaobjectbuilder_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/util/qdeclarativepackage_p.h b/src/declarative/util/qdeclarativepackage_p.h
index 151e99431..118b8a8b9 100644
--- a/src/declarative/util/qdeclarativepackage_p.h
+++ b/src/declarative/util/qdeclarativepackage_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEPACKAGE_H
 #define QDECLARATIVEPACKAGE_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 5144e5ae0..785114289 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -43,7 +43,7 @@
 #include "qdeclarativenetworkaccessmanagerfactory.h"
 #include "qdeclarativeimageprovider.h"
 
-#include <qdeclarativeengine.h>
+#include "qdeclarativeengine.h"
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativeengine_p.h>
 
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index ae89233fa..894076b33 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -46,12 +46,12 @@
 #include "qdeclarativeengine_p.h"
 #include "qdeclarativecompiler_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativecustomparser_p.h>
 #include <qdeclarativeparser_p.h>
-#include <qdeclarativeexpression.h>
+#include "qdeclarativeexpression.h"
 #include <qdeclarativebinding_p.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarativecontext.h"
 #include <qdeclarativeguard_p.h>
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativecontext_p.h>
diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp
index 3a228137a..cd4126747 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation.cpp
+++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp
@@ -44,7 +44,7 @@
 
 #include "qdeclarativeanimation_p_p.h"
 
-#include <qdeclarativeproperty.h>
+#include "qdeclarativeproperty.h"
 #include "qdeclarativeproperty_p.h"
 
 #include "qdeclarativeglobal_p.h"
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h
index 0b26acb38..88d75af85 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVESMOOTHEDANIMATION_H
 #define QDECLARATIVESMOOTHEDANIMATION_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include "qdeclarativeanimation_p.h"
 
 #include <QtCore/qobject.h>
diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
index 7f608577f..5ad6f1b45 100644
--- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
+++ b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h
@@ -50,7 +50,7 @@
 
 #include "qdeclarativeanimation_p_p.h"
 
-#include <qparallelanimationgroup.h>
+#include "qparallelanimationgroup.h"
 
 #include <qobject_p.h>
 #include <QTimer>
diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/declarative/util/qdeclarativespringanimation_p.h
index 5302cad1a..b8458439f 100644
--- a/src/declarative/util/qdeclarativespringanimation_p.h
+++ b/src/declarative/util/qdeclarativespringanimation_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVESPRINGANIMATION_H
 #define QDECLARATIVESPRINGANIMATION_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include "qdeclarativeanimation_p.h"
 
 #include <QtCore/qobject.h>
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 58ecefcf6..fa330ae93 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -34,8 +34,8 @@
 #ifndef QDECLARATIVESTATE_H
 #define QDECLARATIVESTATE_H
 
-#include <qdeclarative.h>
-#include <qdeclarativeproperty.h>
+#include "qdeclarative.h"
+#include "qdeclarativeproperty.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qsharedpointer.h>
 #include <qdeclarativeglobal_p.h>
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index e56727d6c..641ed0567 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -41,10 +41,10 @@
 
 #include "qdeclarativestateoperations_p.h"
 
-#include <qdeclarative.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeexpression.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarative.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeexpression.h"
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeanchors_p_p.h>
 #include <qdeclarativeitem_p.h>
 #include <qdeclarativeguard_p.h>
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h
index ffe015624..08297ed53 100644
--- a/src/declarative/util/qdeclarativestateoperations_p.h
+++ b/src/declarative/util/qdeclarativestateoperations_p.h
@@ -36,9 +36,9 @@
 
 #include "qdeclarativestate_p.h"
 
-#include <qdeclarativeitem.h>
+#include "qdeclarativeitem.h"
 #include <qdeclarativeanchors_p.h>
-#include <qdeclarativescriptstring.h>
+#include "qdeclarativescriptstring.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp
index fa074be21..9dbc3e205 100644
--- a/src/declarative/util/qdeclarativestyledtext.cpp
+++ b/src/declarative/util/qdeclarativestyledtext.cpp
@@ -44,7 +44,7 @@
 #include <QPainter>
 #include <QTextLayout>
 #include <QDebug>
-#include <qmath.h>
+#include "qmath.h"
 #include "qdeclarativestyledtext_p.h"
 
 /*
diff --git a/src/declarative/util/qdeclarativesystempalette_p.h b/src/declarative/util/qdeclarativesystempalette_p.h
index f0a034f61..d8738781c 100644
--- a/src/declarative/util/qdeclarativesystempalette_p.h
+++ b/src/declarative/util/qdeclarativesystempalette_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVESYSTEMPALETTE_H
 #define QDECLARATIVESYSTEMPALETTE_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QPalette>
diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp
index d30ab78af..e7f45a74d 100644
--- a/src/declarative/util/qdeclarativetimer.cpp
+++ b/src/declarative/util/qdeclarativetimer.cpp
@@ -43,7 +43,7 @@
 
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qpauseanimation.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 #include <qobject_p.h>
 
diff --git a/src/declarative/util/qdeclarativetimer_p.h b/src/declarative/util/qdeclarativetimer_p.h
index bc6105985..f173c37c8 100644
--- a/src/declarative/util/qdeclarativetimer_p.h
+++ b/src/declarative/util/qdeclarativetimer_p.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVETIMER_H
 #define QDECLARATIVETIMER_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 #include <QtGui/qabstractanimation.h>
diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h
index 59e6bfef9..6da6b9cf6 100644
--- a/src/declarative/util/qdeclarativetransition_p.h
+++ b/src/declarative/util/qdeclarativetransition_p.h
@@ -36,7 +36,7 @@
 
 #include "qdeclarativestate_p.h"
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 
 #include <QtCore/qobject.h>
 
diff --git a/src/declarative/util/qdeclarativeutilmodule_p.h b/src/declarative/util/qdeclarativeutilmodule_p.h
index 30940b4f5..c78151ef9 100644
--- a/src/declarative/util/qdeclarativeutilmodule_p.h
+++ b/src/declarative/util/qdeclarativeutilmodule_p.h
@@ -34,8 +34,8 @@
 #ifndef QDECLARATIVEUTILMODULE_H
 #define QDECLARATIVEUTILMODULE_H
 
-#include <qdeclarative.h>
-#include <qapplication.h>
+#include "qdeclarative.h"
+#include "qapplication.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 366544458..c68eaf9a8 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -41,27 +41,27 @@
 
 #include "qdeclarativeview.h"
 
-#include <qdeclarative.h>
-#include <qdeclarativeitem.h>
-#include <qdeclarativeengine.h>
-#include <qdeclarativecontext.h>
+#include "qdeclarative.h"
+#include "qdeclarativeitem.h"
+#include "qdeclarativeengine.h"
+#include "qdeclarativecontext.h"
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativeguard_p.h>
 
-#include <qscriptvalueiterator.h>
-#include <qdebug.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qdir.h>
-#include <qcoreapplication.h>
-#include <qfontdatabase.h>
-#include <qicon.h>
-#include <qurl.h>
-#include <qlayout.h>
-#include <qwidget.h>
-#include <qgraphicswidget.h>
-#include <qbasictimer.h>
-#include <qabstractanimation.h>
+#include "qscriptvalueiterator.h"
+#include "qdebug.h"
+#include "qtimer.h"
+#include "qevent.h"
+#include "qdir.h"
+#include "qcoreapplication.h"
+#include "qfontdatabase.h"
+#include "qicon.h"
+#include "qurl.h"
+#include "qlayout.h"
+#include "qwidget.h"
+#include "qgraphicswidget.h"
+#include "qbasictimer.h"
+#include "qabstractanimation.h"
 #include <qgraphicsview_p.h>
 #include <qdeclarativeitem_p.h>
 #include <qabstractanimation_p.h>
diff --git a/src/designer/components/formeditor/formwindow.cpp b/src/designer/components/formeditor/formwindow.cpp
index 593f70112..a9fbad5e8 100644
--- a/src/designer/components/formeditor/formwindow.cpp
+++ b/src/designer/components/formeditor/formwindow.cpp
@@ -55,7 +55,7 @@
 #include <qdesigner_tabwidget_p.h>
 #include <qdesigner_toolbox_p.h>
 #include <qdesigner_stackedbox_p.h>
-#include <qdesigner_resource.h>
+#include "qdesigner_resource.h"
 #include <qdesigner_command_p.h>
 #include <qdesigner_command2_p.h>
 #include <qdesigner_propertycommand_p.h>
diff --git a/src/designer/components/formeditor/formwindow_dnditem.cpp b/src/designer/components/formeditor/formwindow_dnditem.cpp
index c688e166e..f8eeff354 100644
--- a/src/designer/components/formeditor/formwindow_dnditem.cpp
+++ b/src/designer/components/formeditor/formwindow_dnditem.cpp
@@ -43,7 +43,7 @@
 #include "formwindow.h"
 
 #include <ui4_p.h>
-#include <qdesigner_resource.h>
+#include "qdesigner_resource.h"
 #include <qtresourcemodel_p.h>
 
 #include <QtDesigner/abstractformeditor.h>
diff --git a/src/designer/components/formeditor/tool_widgeteditor.cpp b/src/designer/components/formeditor/tool_widgeteditor.cpp
index dfb065441..67834b112 100644
--- a/src/designer/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/components/formeditor/tool_widgeteditor.cpp
@@ -49,7 +49,7 @@
 
 #include <layoutinfo_p.h>
 #include <qdesigner_dnditem_p.h>
-#include <qdesigner_resource.h>
+#include "qdesigner_resource.h"
 
 #include <QtGui/qevent.h>
 #include <QtGui/QAction>
diff --git a/src/designer/components/taskmenu/inplace_widget_helper.h b/src/designer/components/taskmenu/inplace_widget_helper.h
index aed2a5d22..8f599133a 100644
--- a/src/designer/components/taskmenu/inplace_widget_helper.h
+++ b/src/designer/components/taskmenu/inplace_widget_helper.h
@@ -39,7 +39,6 @@
 #include <QtCore/QPoint>
 #include <QtCore/QSize>
 #include <QtCore/QPointer>
-#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/extension/default_extensionfactory.cpp b/src/designer/extension/default_extensionfactory.cpp
index da6aa586b..c86632ea6 100644
--- a/src/designer/extension/default_extensionfactory.cpp
+++ b/src/designer/extension/default_extensionfactory.cpp
@@ -41,7 +41,7 @@
 
 #include <QtDesigner/default_extensionfactory.h>
 #include "qextensionmanager.h"
-#include <qpointer.h>
+#include "qpointer.h"
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/sdk/abstractwidgetdatabase.cpp b/src/designer/sdk/abstractwidgetdatabase.cpp
index b1122e0fe..f6c936718 100644
--- a/src/designer/sdk/abstractwidgetdatabase.cpp
+++ b/src/designer/sdk/abstractwidgetdatabase.cpp
@@ -41,7 +41,7 @@
 
 #include "abstractwidgetdatabase.h"
 #include <QtCore/qdebug.h>
-#include <qalgorithms.h>
+#include "qalgorithms.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/shared/qdesigner_promotion.cpp b/src/designer/shared/qdesigner_promotion.cpp
index 522dd272e..9e92414fe 100644
--- a/src/designer/shared/qdesigner_promotion.cpp
+++ b/src/designer/shared/qdesigner_promotion.cpp
@@ -53,7 +53,7 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QCoreApplication>
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/shared/qdesigner_propertycommand.cpp b/src/designer/shared/qdesigner_propertycommand.cpp
index 3ec55b679..586a36086 100644
--- a/src/designer/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/shared/qdesigner_propertycommand.cpp
@@ -66,7 +66,7 @@
 #include <QtGui/QDialog>
 #include <QtGui/QPushButton>
 #include <QtGui/QLayout>
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp
index 5929757f0..21d1cc725 100644
--- a/src/gui/accessible/qaccessiblewidget.cpp
+++ b/src/gui/accessible/qaccessiblewidget.cpp
@@ -51,7 +51,7 @@
 #include "qwhatsthis.h"
 #include "qwidget.h"
 #include "qdebug.h"
-#include <qmath.h>
+#include "qmath.h"
 #include <QRubberBand>
 #include <QtGui/QFocusFrame>
 #include <QtGui/QMenu>
diff --git a/src/gui/animation/qabstractanimation_p.h b/src/gui/animation/qabstractanimation_p.h
index b7cc21fb4..6d7d69af1 100644
--- a/src/gui/animation/qabstractanimation_p.h
+++ b/src/gui/animation/qabstractanimation_p.h
@@ -50,7 +50,7 @@
 #include <QtCore/qtimer.h>
 #include <QtCore/qelapsedtimer.h>
 #include <qobject_p.h>
-#include <qabstractanimation.h>
+#include "qabstractanimation.h"
 
 #ifndef QT_NO_ANIMATION
 
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index e99d9eaf0..6b196b33b 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qvariantanimation.h>
+#include "qvariantanimation.h"
 #include <qvariantanimation_p.h>
 
 #ifndef QT_NO_ANIMATION
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 64a196b41..2ea0437cd 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#include <qvariant.h>
+#include "qvariant.h"
 #include <qwidgetitemdata_p.h>
 #include "qfiledialog.h"
 
 #ifndef QT_NO_FILEDIALOG
 #include "qfiledialog_p.h"
-#include <qfontmetrics.h>
-#include <qaction.h>
-#include <qheaderview.h>
-#include <qshortcut.h>
-#include <qgridlayout.h>
-#include <qmenu.h>
-#include <qmessagebox.h>
-#include <qinputdialog.h>
-#include <qsettings.h>
-#include <qdebug.h>
-#include <qapplication.h>
-#include <qstylepainter.h>
+#include "qfontmetrics.h"
+#include "qaction.h"
+#include "qheaderview.h"
+#include "qshortcut.h"
+#include "qgridlayout.h"
+#include "qmenu.h"
+#include "qmessagebox.h"
+#include "qinputdialog.h"
+#include "qsettings.h"
+#include "qdebug.h"
+#include "qapplication.h"
+#include "qstylepainter.h"
 #include <qfileiconprovider_p.h>
 #include "ui_qfiledialog.h"
 
diff --git a/src/gui/dialogs/qfiledialog_p.h b/src/gui/dialogs/qfiledialog_p.h
index d07c912b4..240caa386 100644
--- a/src/gui/dialogs/qfiledialog_p.h
+++ b/src/gui/dialogs/qfiledialog_p.h
@@ -52,20 +52,20 @@
 #include "qplatformdefs.h"
 
 #include "qfilesystemmodel_p.h"
-#include <qlistview.h>
-#include <qtreeview.h>
-#include <qcombobox.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
-#include <qevent.h>
-#include <qlineedit.h>
-#include <qurl.h>
-#include <qstackedwidget.h>
-#include <qdialogbuttonbox.h>
-#include <qabstractproxymodel.h>
-#include <qcompleter.h>
-#include <qpointer.h>
-#include <qdebug.h>
+#include "qlistview.h"
+#include "qtreeview.h"
+#include "qcombobox.h"
+#include "qtoolbutton.h"
+#include "qlabel.h"
+#include "qevent.h"
+#include "qlineedit.h"
+#include "qurl.h"
+#include "qstackedwidget.h"
+#include "qdialogbuttonbox.h"
+#include "qabstractproxymodel.h"
+#include "qcompleter.h"
+#include "qpointer.h"
+#include "qdebug.h"
 #include "qsidebar_p.h"
 #include "qfscompleter_p.h"
 #include "qguiplatformplugin.h"
diff --git a/src/gui/dialogs/qfileinfogatherer.cpp b/src/gui/dialogs/qfileinfogatherer.cpp
index 4f996ee0a..38dbd87ea 100644
--- a/src/gui/dialogs/qfileinfogatherer.cpp
+++ b/src/gui/dialogs/qfileinfogatherer.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 #include "qfileinfogatherer_p.h"
-#include <qdebug.h>
-#include <qfsfileengine.h>
-#include <qdiriterator.h>
+#include "qdebug.h"
+#include "qfsfileengine.h"
+#include "qdiriterator.h"
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/src/gui/dialogs/qfileinfogatherer_p.h b/src/gui/dialogs/qfileinfogatherer_p.h
index c4177744f..55fb51734 100644
--- a/src/gui/dialogs/qfileinfogatherer_p.h
+++ b/src/gui/dialogs/qfileinfogatherer_p.h
@@ -45,17 +45,17 @@
 // We mean it.
 //
 
-#include <qthread.h>
-#include <qmutex.h>
-#include <qwaitcondition.h>
-#include <qfilesystemwatcher.h>
-#include <qfileiconprovider.h>
-#include <qfsfileengine.h>
-#include <qpair.h>
-#include <qstack.h>
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qelapsedtimer.h>
+#include "qthread.h"
+#include "qmutex.h"
+#include "qwaitcondition.h"
+#include "qfilesystemwatcher.h"
+#include "qfileiconprovider.h"
+#include "qfsfileengine.h"
+#include "qpair.h"
+#include "qstack.h"
+#include "qdatetime.h"
+#include "qdir.h"
+#include "qelapsedtimer.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index 9a1ed4a2c..4a04123a2 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -41,12 +41,12 @@
 
 #include "qfilesystemmodel_p.h"
 #include "qfilesystemmodel.h"
-#include <qlocale.h>
-#include <qmimedata.h>
-#include <qurl.h>
-#include <qdebug.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
+#include "qlocale.h"
+#include "qmimedata.h"
+#include "qurl.h"
+#include "qdebug.h"
+#include "qmessagebox.h"
+#include "qapplication.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h
index 25b7f69f8..ddc728bb5 100644
--- a/src/gui/dialogs/qfilesystemmodel_p.h
+++ b/src/gui/dialogs/qfilesystemmodel_p.h
@@ -50,15 +50,15 @@
 #ifndef QT_NO_FILESYSTEMMODEL
 
 #include <qabstractitemmodel_p.h>
-#include <qabstractitemmodel.h>
+#include "qabstractitemmodel.h"
 #include "qfileinfogatherer_p.h"
-#include <qpair.h>
-#include <qdir.h>
-#include <qicon.h>
-#include <qfileinfo.h>
-#include <qtimer.h>
-#include <qhash.h>
-#include <qbasictimer.h>
+#include "qpair.h"
+#include "qdir.h"
+#include "qicon.h"
+#include "qfileinfo.h"
+#include "qtimer.h"
+#include "qhash.h"
+#include "qbasictimer.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp
index 401213878..b082d79f6 100644
--- a/src/gui/dialogs/qfontdialog.cpp
+++ b/src/gui/dialogs/qfontdialog.cpp
@@ -46,22 +46,22 @@
 #include "qfontdialog.h"
 #include "qfontdialog_p.h"
 
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qevent.h>
-#include <qfontdatabase.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qstyle.h>
-#include <qdialogbuttonbox.h>
-#include <qheaderview.h>
-#include <qlistview.h>
-#include <qstringlistmodel.h>
-#include <qvalidator.h>
+#include "qapplication.h"
+#include "qcheckbox.h"
+#include "qcombobox.h"
+#include "qevent.h"
+#include "qfontdatabase.h"
+#include "qgroupbox.h"
+#include "qlabel.h"
+#include "qlayout.h"
+#include "qlineedit.h"
+#include "qpushbutton.h"
+#include "qstyle.h"
+#include "qdialogbuttonbox.h"
+#include "qheaderview.h"
+#include "qlistview.h"
+#include "qstringlistmodel.h"
+#include "qvalidator.h"
 #include <qdialog_p.h>
 #include <qfont_p.h>
 
diff --git a/src/gui/dialogs/qpagesetupdialog_unix.cpp b/src/gui/dialogs/qpagesetupdialog_unix.cpp
index 2627a67e5..fc31dbbd6 100644
--- a/src/gui/dialogs/qpagesetupdialog_unix.cpp
+++ b/src/gui/dialogs/qpagesetupdialog_unix.cpp
@@ -47,7 +47,7 @@
 #include "qpainter.h"
 #include "qprintdialog.h"
 #include "qdialogbuttonbox.h"
-#include <qprinter.h>
+#include "qprinter.h"
 #include <qabstractpagesetupdialog_p.h>
 #include <qprinter_p.h>
 #include "qpagesetupdialog_p.h"
diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp
index ed19dd3d2..50ee058b9 100644
--- a/src/gui/dialogs/qsidebar.cpp
+++ b/src/gui/dialogs/qsidebar.cpp
@@ -44,14 +44,14 @@
 
 #ifndef QT_NO_FILEDIALOG
 
-#include <qaction.h>
-#include <qurl.h>
-#include <qmenu.h>
-#include <qmimedata.h>
-#include <qevent.h>
-#include <qdebug.h>
-#include <qfileiconprovider.h>
-#include <qfiledialog.h>
+#include "qaction.h"
+#include "qurl.h"
+#include "qmenu.h"
+#include "qmimedata.h"
+#include "qevent.h"
+#include "qdebug.h"
+#include "qfileiconprovider.h"
+#include "qfiledialog.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/dialogs/qsidebar_p.h b/src/gui/dialogs/qsidebar_p.h
index 1bcd39834..44dfb21e1 100644
--- a/src/gui/dialogs/qsidebar_p.h
+++ b/src/gui/dialogs/qsidebar_p.h
@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qlistwidget.h>
-#include <qstandarditemmodel.h>
-#include <qstyleditemdelegate.h>
-#include <qurl.h>
+#include "qlistwidget.h"
+#include "qstandarditemmodel.h"
+#include "qstyleditemdelegate.h"
+#include "qurl.h"
 
 #ifndef QT_NO_FILEDIALOG
 
diff --git a/src/gui/dialogs/qwizard.cpp b/src/gui/dialogs/qwizard.cpp
index 1d7dfb787..4db9c6c84 100644
--- a/src/gui/dialogs/qwizard.cpp
+++ b/src/gui/dialogs/qwizard.cpp
@@ -59,7 +59,7 @@
 #include "qstyle.h"
 #include "qvarlengtharray.h"
 #include "qdialog_p.h"
-#include <qdebug.h>
+#include "qdebug.h"
 
 #include <string.h>     // for memset()
 
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index dfcf27cc1..bc2248d06 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -53,7 +53,7 @@
 #include <qgraphicstransform_p.h>
 
 #include <qgraphicseffect_p.h>
-#include <qgraphicseffect.h>
+#include "qgraphicseffect.h"
 
 #include <QtCore/qpoint.h>
 
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index ef4bc16e6..616a422d9 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -65,7 +65,7 @@
 #include <QtGui/qpalette.h>
 #include <QtGui/qstyleoption.h>
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 2b1dbd2e3..7b107bea7 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -43,7 +43,7 @@
 #include "qpixmapdata_p.h"
 #include "qimage.h"
 #include "qvariant.h"
-#include <qpainter.h>
+#include "qpainter.h"
 #include <qgraphicssystem_p.h>
 #include <qapplication_p.h>
 
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 2d3633381..9f8fa896b 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -43,9 +43,9 @@
 
 #ifndef QT_NO_IMAGEFORMAT_BMP
 
-#include <qimage.h>
-#include <qvariant.h>
-#include <qvector.h>
+#include "qimage.h"
+#include "qvariant.h"
+#include "qvector.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
index 01ea9b40a..d81362a50 100644
--- a/src/gui/image/qgifhandler.cpp
+++ b/src/gui/image/qgifhandler.cpp
@@ -41,9 +41,9 @@
 
 #include "qgifhandler_p.h"
 
-#include <qimage.h>
-#include <qiodevice.h>
-#include <qvariant.h>
+#include "qimage.h"
+#include "qiodevice.h"
+#include "qvariant.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 82f70af7d..9c49e1aba 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -58,7 +58,7 @@
 #include <qmemrotate_p.h>
 #include <qpixmapdata_p.h>
 
-#include <qhash.h>
+#include "qhash.h"
 
 #include <qpaintengine_raster_p.h>
 
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 77321be45..d51625aaa 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -218,9 +218,9 @@
 
 #include "qimageiohandler.h"
 
-#include <qbytearray.h>
-#include <qimage.h>
-#include <qvariant.h>
+#include "qbytearray.h"
+#include "qimage.h"
+#include "qvariant.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index abfaac115..7ffdb37e9 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -114,20 +114,20 @@
 */
 #include "qimagereader.h"
 
-#include <qbytearray.h>
+#include "qbytearray.h"
 #ifdef QIMAGEREADER_DEBUG
-#include <qdebug.h>
+#include "qdebug.h"
 #endif
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qimage.h>
-#include <qimageiohandler.h>
-#include <qlist.h>
-#include <qrect.h>
-#include <qset.h>
-#include <qsize.h>
-#include <qcolor.h>
-#include <qvariant.h>
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qimage.h"
+#include "qimageiohandler.h"
+#include "qlist.h"
+#include "qrect.h"
+#include "qset.h"
+#include "qsize.h"
+#include "qcolor.h"
+#include "qvariant.h"
 
 // factory loader
 #include "qcoreapplication.h"
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 2f9502049..ae06a95e3 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -95,12 +95,12 @@
 
 #include "qimagewriter.h"
 
-#include <qbytearray.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qimageiohandler.h>
-#include <qset.h>
-#include <qvariant.h>
+#include "qbytearray.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qimageiohandler.h"
+#include "qset.h"
+#include "qvariant.h"
 
 // factory loader
 #include "qcoreapplication.h"
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 12f562955..ec2504d12 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -41,10 +41,10 @@
 
 #include "qjpeghandler_p.h"
 
-#include <qimage.h>
-#include <qvariant.h>
-#include <qvector.h>
-#include <qbuffer.h>
+#include "qimage.h"
+#include "qvariant.h"
+#include "qvector.h"
+#include "qbuffer.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
 #include <setjmp.h>
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index b051a0606..9fbfc5f48 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -39,14 +39,9 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
-
-#include <QDebug>
-
 #include "qpainter.h"
 #include "qpixmap.h"
 #include "qpixmapfilter_p.h"
-
 #include "qapplication_p.h"
 #include "qgraphicssystem_p.h"
 #include "qpaintengineex_p.h"
@@ -55,6 +50,7 @@
 #include "qmath_p.h"
 #include "qmemrotate_p.h"
 #include "qdrawhelper_p.h"
+#include "qdebug.h"
 
 #ifndef QT_NO_GRAPHICSEFFECT
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index f36c8ac44..0f465fc9c 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -42,13 +42,13 @@
 #include "qpnghandler_p.h"
 
 #ifndef QT_NO_IMAGEFORMAT_PNG
-#include <qcoreapplication.h>
-#include <qiodevice.h>
-#include <qimage.h>
-#include <qlist.h>
-#include <qtextcodec.h>
-#include <qvariant.h>
-#include <qvector.h>
+#include "qcoreapplication.h"
+#include "qiodevice.h"
+#include "qimage.h"
+#include "qlist.h"
+#include "qtextcodec.h"
+#include "qvariant.h"
+#include "qvector.h"
 
 #include <png.h>
 #include <pngconf.h>
diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp
index 9152f803e..a21c6be59 100644
--- a/src/gui/image/qppmhandler.cpp
+++ b/src/gui/image/qppmhandler.cpp
@@ -43,9 +43,10 @@
 
 #ifndef QT_NO_IMAGEFORMAT_PPM
 
-#include <qimage.h>
-#include <qvariant.h>
-#include <qvector.h>
+#include "qimage.h"
+#include "qvariant.h"
+#include "qvector.h"
+
 #include <ctype.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/image/qtiffhandler.cpp b/src/gui/image/qtiffhandler.cpp
index 3c0549d56..84799875e 100644
--- a/src/gui/image/qtiffhandler.cpp
+++ b/src/gui/image/qtiffhandler.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include "qtiffhandler_p.h"
-#include <qvariant.h>
-#include <qdebug.h>
-#include <qimage.h>
-#include <qglobal.h>
+#include "qvariant.h"
+#include "qdebug.h"
+#include "qimage.h"
+
 extern "C" {
 #include "tiffio.h"
 }
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index f12d08186..2efaefdde 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -44,9 +44,9 @@
 
 #ifndef QT_NO_IMAGEFORMAT_XBM
 
-#include <qimage.h>
-#include <qiodevice.h>
-#include <qvariant.h>
+#include "qimage.h"
+#include "qiodevice.h"
+#include "qvariant.h"
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index 02f7c3e6a..6de744ca2 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -44,10 +44,10 @@
 #ifndef QT_NO_IMAGEFORMAT_XPM
 
 #include <qcolor_p.h>
-#include <qimage.h>
-#include <qmap.h>
-#include <qtextstream.h>
-#include <qvariant.h>
+#include "qimage.h"
+#include "qmap.h"
+#include "qtextstream.h"
+#include "qvariant.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qabstractitemdelegate.cpp b/src/gui/itemviews/qabstractitemdelegate.cpp
index d405f8316..60fc5dc83 100644
--- a/src/gui/itemviews/qabstractitemdelegate.cpp
+++ b/src/gui/itemviews/qabstractitemdelegate.cpp
@@ -42,14 +42,14 @@
 #include "qabstractitemdelegate.h"
 
 #ifndef QT_NO_ITEMVIEWS
-#include <qabstractitemmodel.h>
-#include <qabstractitemview.h>
-#include <qfontmetrics.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qevent.h>
-#include <qstring.h>
-#include <qdebug.h>
+#include "qabstractitemmodel.h"
+#include "qabstractitemview.h"
+#include "qfontmetrics.h"
+#include "qwhatsthis.h"
+#include "qtooltip.h"
+#include "qevent.h"
+#include "qstring.h"
+#include "qdebug.h"
 #include <qtextengine_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index e06772f54..287e19906 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -42,25 +42,25 @@
 #include "qabstractitemview.h"
 
 #ifndef QT_NO_ITEMVIEWS
-#include <qpointer.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qdrag.h>
-#include <qevent.h>
-#include <qscrollbar.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qdatetime.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qstyleditemdelegate.h>
+#include "qpointer.h"
+#include "qapplication.h"
+#include "qclipboard.h"
+#include "qpainter.h"
+#include "qstyle.h"
+#include "qdrag.h"
+#include "qevent.h"
+#include "qscrollbar.h"
+#include "qwhatsthis.h"
+#include "qtooltip.h"
+#include "qdatetime.h"
+#include "qlineedit.h"
+#include "qspinbox.h"
+#include "qstyleditemdelegate.h"
 #include <qabstractitemview_p.h>
 #include <qabstractitemmodel_p.h>
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
-#include <qaccessible2.h>
+#include "qaccessible.h"
+#include "qaccessible2.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 0fe29411a..235f9b140 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -56,7 +56,7 @@
 #include "QtGui/qevent.h"
 #include "QtGui/qpainter.h"
 #include "QtGui/qregion.h"
-#include <qvector.h>
+#include "qvector.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
diff --git a/src/gui/itemviews/qbsptree_p.h b/src/gui/itemviews/qbsptree_p.h
index 6033e9b86..12da2ac65 100644
--- a/src/gui/itemviews/qbsptree_p.h
+++ b/src/gui/itemviews/qbsptree_p.h
@@ -45,8 +45,8 @@
 // We mean it.
 //
 
-#include <qvector.h>
-#include <qrect.h>
+#include "qvector.h"
+#include "qrect.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/gui/itemviews/qcolumnview.cpp
index 331af46db..a9c0d9a4d 100644
--- a/src/gui/itemviews/qcolumnview.cpp
+++ b/src/gui/itemviews/qcolumnview.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_COLUMNVIEW
 
@@ -47,11 +47,11 @@
 #include "qcolumnview_p.h"
 #include "qcolumnviewgrip_p.h"
 
-#include <qlistview.h>
-#include <qabstractitemdelegate.h>
-#include <qscrollbar.h>
-#include <qpainter.h>
-#include <qdebug.h>
+#include "qlistview.h"
+#include "qabstractitemdelegate.h"
+#include "qscrollbar.h"
+#include "qpainter.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qcolumnview_p.h b/src/gui/itemviews/qcolumnview_p.h
index 8c8675f6c..e53e40406 100644
--- a/src/gui/itemviews/qcolumnview_p.h
+++ b/src/gui/itemviews/qcolumnview_p.h
@@ -56,9 +56,9 @@
 #include <QtGui/qabstractitemdelegate.h>
 #include <QtGui/qabstractitemview.h>
 #include <QtGui/qitemdelegate.h>
-#include <qlistview.h>
-#include <qevent.h>
-#include <qscrollbar.h>
+#include "qlistview.h"
+#include "qevent.h"
+#include "qscrollbar.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qcolumnviewgrip.cpp b/src/gui/itemviews/qcolumnviewgrip.cpp
index c16c8d89b..e6b8f7dee 100644
--- a/src/gui/itemviews/qcolumnviewgrip.cpp
+++ b/src/gui/itemviews/qcolumnviewgrip.cpp
@@ -42,11 +42,11 @@
 #ifndef QT_NO_QCOLUMNVIEW
 
 #include "qcolumnviewgrip_p.h"
-#include <qstyleoption.h>
-#include <qpainter.h>
-#include <qbrush.h>
-#include <qevent.h>
-#include <qdebug.h>
+#include "qstyleoption.h"
+#include "qpainter.h"
+#include "qbrush.h"
+#include "qevent.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp
index 8d158ff4f..19cd85371 100644
--- a/src/gui/itemviews/qdirmodel.cpp
+++ b/src/gui/itemviews/qdirmodel.cpp
@@ -42,20 +42,20 @@
 #include "qdirmodel.h"
 
 #ifndef QT_NO_DIRMODEL
-#include <qstack.h>
-#include <qfile.h>
-#include <qfilesystemmodel.h>
-#include <qurl.h>
-#include <qmimedata.h>
-#include <qpair.h>
-#include <qvector.h>
-#include <qobject.h>
-#include <qdatetime.h>
-#include <qlocale.h>
-#include <qstyle.h>
-#include <qapplication.h>
+#include "qstack.h"
+#include "qfile.h"
+#include "qfilesystemmodel.h"
+#include "qurl.h"
+#include "qmimedata.h"
+#include "qpair.h"
+#include "qvector.h"
+#include "qobject.h"
+#include "qdatetime.h"
+#include "qlocale.h"
+#include "qstyle.h"
+#include "qapplication.h"
 #include <qabstractitemmodel_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 /*!
     \enum QDirModel::Roles
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index 8ad908775..6e8636983 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -44,11 +44,11 @@
 
 #ifndef QT_NO_FILEICONPROVIDER
 
-#include <qfileinfo.h>
-#include <qapplication.h>
-#include <qdir.h>
-#include <qpixmapcache.h>
-#include <qguiplatformplugin.h>
+#include "qfileinfo.h"
+#include "qapplication.h"
+#include "qdir.h"
+#include "qpixmapcache.h"
+#include "qguiplatformplugin.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qheaderview.cpp b/src/gui/itemviews/qheaderview.cpp
index ac94e8b83..7f12e867a 100644
--- a/src/gui/itemviews/qheaderview.cpp
+++ b/src/gui/itemviews/qheaderview.cpp
@@ -42,26 +42,26 @@
 #include "qheaderview.h"
 
 #ifndef QT_NO_ITEMVIEWS
-#include <qbitarray.h>
-#include <qbrush.h>
-#include <qdebug.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qscrollbar.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qvector.h>
-#include <qapplication.h>
-#include <qvarlengtharray.h>
-#include <qabstractitemdelegate.h>
-#include <qvariant.h>
+#include "qbitarray.h"
+#include "qbrush.h"
+#include "qdebug.h"
+#include "qevent.h"
+#include "qpainter.h"
+#include "qscrollbar.h"
+#include "qtooltip.h"
+#include "qwhatsthis.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qvector.h"
+#include "qapplication.h"
+#include "qvarlengtharray.h"
+#include "qabstractitemdelegate.h"
+#include "qvariant.h"
 #include <qheaderview_p.h>
 #include <qabstractitemmodel_p.h>
 
 #ifndef QT_NO_DATASTREAM
-#include <qdatastream.h>
+#include "qdatastream.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 3adfda26f..48ae34191 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -42,34 +42,34 @@
 #include "qitemdelegate.h"
 
 #ifndef QT_NO_ITEMVIEWS
-#include <qabstractitemmodel.h>
-#include <qapplication.h>
-#include <qbrush.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qplaintextedit.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qstyle.h>
-#include <qdatetime.h>
-#include <qstyleoption.h>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qpixmapcache.h>
-#include <qitemeditorfactory.h>
-#include <qmetaobject.h>
-#include <qtextlayout.h>
+#include "qabstractitemmodel.h"
+#include "qapplication.h"
+#include "qbrush.h"
+#include "qlineedit.h"
+#include "qtextedit.h"
+#include "qplaintextedit.h"
+#include "qpainter.h"
+#include "qpalette.h"
+#include "qpoint.h"
+#include "qrect.h"
+#include "qsize.h"
+#include "qstyle.h"
+#include "qdatetime.h"
+#include "qstyleoption.h"
+#include "qevent.h"
+#include "qpixmap.h"
+#include "qbitmap.h"
+#include "qpixmapcache.h"
+#include "qitemeditorfactory.h"
+#include "qmetaobject.h"
+#include "qtextlayout.h"
 #include <qobject_p.h>
 #include <qdnd_p.h>
 #include <qtextengine_p.h>
-#include <qdebug.h>
-#include <qlocale.h>
-#include <qdialog.h>
-#include <qmath.h>
+#include "qdebug.h"
+#include "qlocale.h"
+#include "qdialog.h"
+#include "qmath.h"
 
 #include <limits.h>
 
diff --git a/src/gui/itemviews/qitemeditorfactory.cpp b/src/gui/itemviews/qitemeditorfactory.cpp
index fe18e7d86..f7240efb1 100644
--- a/src/gui/itemviews/qitemeditorfactory.cpp
+++ b/src/gui/itemviews/qitemeditorfactory.cpp
@@ -39,25 +39,25 @@
 **
 ****************************************************************************/
 
-#include <qplatformdefs.h>
+#include "qplatformdefs.h"
 #include "qitemeditorfactory.h"
 #include "qitemeditorfactory_p.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
-#include <qcombobox.h>
-#include <qdatetimeedit.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
+#include "qcombobox.h"
+#include "qdatetimeedit.h"
+#include "qlabel.h"
+#include "qlineedit.h"
+#include "qspinbox.h"
+#include "qapplication.h"
+#include "qdebug.h"
+
 #include <limits.h>
 #include <float.h>
-#include <qapplication.h>
-#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-
 #ifndef QT_NO_COMBOBOX
 
 class QBooleanComboBox : public QComboBox
diff --git a/src/gui/itemviews/qitemeditorfactory_p.h b/src/gui/itemviews/qitemeditorfactory_p.h
index 511f4d165..a8d066432 100644
--- a/src/gui/itemviews/qitemeditorfactory_p.h
+++ b/src/gui/itemviews/qitemeditorfactory_p.h
@@ -47,7 +47,7 @@
 
 
 
-#include <qlineedit.h>
+#include "qlineedit.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index 868f0c162..ac6349c81 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -41,7 +41,7 @@
 
 #include "qitemselectionmodel.h"
 #include <qitemselectionmodel_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 #ifndef QT_NO_ITEMVIEWS
 
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 32bfff275..64621087e 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -42,19 +42,19 @@
 #include "qlistview.h"
 
 #ifndef QT_NO_LISTVIEW
-#include <qabstractitemdelegate.h>
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qvector.h>
-#include <qstyle.h>
-#include <qevent.h>
-#include <qscrollbar.h>
-#include <qrubberband.h>
+#include "qabstractitemdelegate.h"
+#include "qapplication.h"
+#include "qpainter.h"
+#include "qbitmap.h"
+#include "qvector.h"
+#include "qstyle.h"
+#include "qevent.h"
+#include "qscrollbar.h"
+#include "qrubberband.h"
 #include <qlistview_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
+#include "qaccessible.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h
index 9a9fa4a8d..e5806d6c3 100644
--- a/src/gui/itemviews/qlistview_p.h
+++ b/src/gui/itemviews/qlistview_p.h
@@ -49,8 +49,9 @@
 #include "qrubberband.h"
 #include "qbitarray.h"
 #include "qbsptree_p.h"
+#include "qscrollbar.h"
+
 #include <limits.h>
-#include <qscrollbar.h>
 
 #ifndef QT_NO_LISTVIEW
 
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index ef987ae5d..3d6ed2760 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -42,7 +42,7 @@
 #include "qlistwidget.h"
 
 #ifndef QT_NO_LISTWIDGET
-#include <qitemdelegate.h>
+#include "qitemdelegate.h"
 #include <qlistview_p.h>
 #include <qwidgetitemdata_p.h>
 #include <qlistwidget_p.h>
diff --git a/src/gui/itemviews/qlistwidget_p.h b/src/gui/itemviews/qlistwidget_p.h
index fe5ceb5f5..fef2255bd 100644
--- a/src/gui/itemviews/qlistwidget_p.h
+++ b/src/gui/itemviews/qlistwidget_p.h
@@ -47,7 +47,7 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QtGui/qabstractitemview.h>
 #include <QtGui/qlistwidget.h>
-#include <qitemdelegate.h>
+#include "qitemdelegate.h"
 #include <qlistview_p.h>
 #include <qwidgetitemdata_p.h>
 
diff --git a/src/gui/itemviews/qproxymodel.cpp b/src/gui/itemviews/qproxymodel.cpp
index 8506e0c80..fa7417f29 100644
--- a/src/gui/itemviews/qproxymodel.cpp
+++ b/src/gui/itemviews/qproxymodel.cpp
@@ -43,8 +43,8 @@
 
 #ifndef QT_NO_PROXYMODEL
 #include <qproxymodel_p.h>
-#include <qsize.h>
-#include <qstringlist.h>
+#include "qsize.h"
+#include "qstringlist.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index 85f7f0e91..9d5eb74a6 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -44,11 +44,11 @@
 #ifndef QT_NO_SORTFILTERPROXYMODEL
 
 #include "qitemselectionmodel.h"
-#include <qsize.h>
-#include <qdebug.h>
-#include <qdatetime.h>
-#include <qpair.h>
-#include <qstringlist.h>
+#include "qsize.h"
+#include "qdebug.h"
+#include "qdatetime.h"
+#include "qpair.h"
+#include "qstringlist.h"
 #include <qabstractitemmodel_p.h>
 #include <qabstractproxymodel_p.h>
 
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp
index feac9849e..e4d42196c 100644
--- a/src/gui/itemviews/qstandarditemmodel.cpp
+++ b/src/gui/itemviews/qstandarditemmodel.cpp
@@ -54,7 +54,7 @@
 #include <QtCore/qmimedata.h>
 
 #include <qstandarditemmodel_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index f28f8c4a5..d93308924 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -42,36 +42,36 @@
 #include "qstyleditemdelegate.h"
 
 #ifndef QT_NO_ITEMVIEWS
-#include <qabstractitemmodel.h>
-#include <qapplication.h>
-#include <qbrush.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qplaintextedit.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qstyle.h>
-#include <qdatetime.h>
-#include <qstyleoption.h>
-#include <qevent.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qpixmapcache.h>
-#include <qitemeditorfactory.h>
+#include "qabstractitemmodel.h"
+#include "qapplication.h"
+#include "qbrush.h"
+#include "qlineedit.h"
+#include "qtextedit.h"
+#include "qplaintextedit.h"
+#include "qpainter.h"
+#include "qpalette.h"
+#include "qpoint.h"
+#include "qrect.h"
+#include "qsize.h"
+#include "qstyle.h"
+#include "qdatetime.h"
+#include "qstyleoption.h"
+#include "qevent.h"
+#include "qpixmap.h"
+#include "qbitmap.h"
+#include "qpixmapcache.h"
+#include "qitemeditorfactory.h"
 #include <qitemeditorfactory_p.h>
-#include <qmetaobject.h>
-#include <qtextlayout.h>
+#include "qmetaobject.h"
+#include "qtextlayout.h"
 #include <qobject_p.h>
 #include <qdnd_p.h>
 #include <qtextengine_p.h>
 #include <qlayoutengine_p.h>
-#include <qdebug.h>
-#include <qlocale.h>
-#include <qdialog.h>
-#include <qtableview.h>
+#include "qdebug.h"
+#include "qlocale.h"
+#include "qdialog.h"
+#include "qtableview.h"
 
 #include <limits.h>
 
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index b7b9bffba..1fd2e16f5 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -42,19 +42,19 @@
 #include "qtableview.h"
 
 #ifndef QT_NO_TABLEVIEW
-#include <qheaderview.h>
-#include <qitemdelegate.h>
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qsize.h>
-#include <qevent.h>
-#include <qbitarray.h>
-#include <qscrollbar.h>
-#include <qabstractbutton.h>
+#include "qheaderview.h"
+#include "qitemdelegate.h"
+#include "qapplication.h"
+#include "qpainter.h"
+#include "qstyle.h"
+#include "qsize.h"
+#include "qevent.h"
+#include "qbitarray.h"
+#include "qscrollbar.h"
+#include "qabstractbutton.h"
 #include <qtableview_p.h>
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
+#include "qaccessible.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp
index ab513ea94..0d63c3f74 100644
--- a/src/gui/itemviews/qtablewidget.cpp
+++ b/src/gui/itemviews/qtablewidget.cpp
@@ -42,8 +42,8 @@
 #include "qtablewidget.h"
 
 #ifndef QT_NO_TABLEWIDGET
-#include <qitemdelegate.h>
-#include <qpainter.h>
+#include "qitemdelegate.h"
+#include "qpainter.h"
 #include <qtablewidget_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/itemviews/qtablewidget_p.h b/src/gui/itemviews/qtablewidget_p.h
index eaa7a259d..40b63dc1d 100644
--- a/src/gui/itemviews/qtablewidget_p.h
+++ b/src/gui/itemviews/qtablewidget_p.h
@@ -44,9 +44,9 @@
 // We mean it.
 //
 
-#include <qheaderview.h>
-#include <qtablewidget.h>
-#include <qabstractitemmodel.h>
+#include "qheaderview.h"
+#include "qtablewidget.h"
+#include "qabstractitemmodel.h"
 #include <qabstractitemmodel_p.h>
 #include <qtableview_p.h>
 #include <qwidgetitemdata_p.h>
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index 797d5838e..7a968306b 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -41,20 +41,20 @@
 #include "qtreeview.h"
 
 #ifndef QT_NO_TREEVIEW
-#include <qheaderview.h>
-#include <qitemdelegate.h>
-#include <qapplication.h>
-#include <qscrollbar.h>
-#include <qpainter.h>
-#include <qstack.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qevent.h>
-#include <qpen.h>
-#include <qdebug.h>
+#include "qheaderview.h"
+#include "qitemdelegate.h"
+#include "qapplication.h"
+#include "qscrollbar.h"
+#include "qpainter.h"
+#include "qstack.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qevent.h"
+#include "qpen.h"
+#include "qdebug.h"
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
-#include <qaccessible2.h>
+#include "qaccessible.h"
+#include "qaccessible2.h"
 #endif
 
 #include <qtreeview_p.h>
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index e26f7662e..90bc34308 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -42,11 +42,11 @@
 #include "qtreewidget.h"
 
 #ifndef QT_NO_TREEWIDGET
-#include <qheaderview.h>
-#include <qpainter.h>
-#include <qitemdelegate.h>
-#include <qstack.h>
-#include <qdebug.h>
+#include "qheaderview.h"
+#include "qpainter.h"
+#include "qitemdelegate.h"
+#include "qstack.h"
+#include "qdebug.h"
 #include <qtreewidget_p.h>
 #include <qwidgetitemdata_p.h>
 #include <qtreewidgetitemiterator_p.h>
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 55e130c90..591abfc93 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -102,7 +102,7 @@
 #include <pwd.h>
 
 #ifdef QT_RX71_MULTITOUCH
-#  include <qsocketnotifier.h>
+#  include "qsocketnotifier.h"
 #  include <linux/input.h>
 #  include <errno.h>
 #endif
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index b019673f3..331eaf27a 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -43,11 +43,11 @@
 
 #ifndef QT_NO_CURSOR
 
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qimage.h>
-#include <qdatastream.h>
-#include <qvariant.h>
+#include "qapplication.h"
+#include "qbitmap.h"
+#include "qimage.h"
+#include "qdatastream.h"
+#include "qvariant.h"
 #include <qcursor_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp
index 6b97d35a7..ba1968f5f 100644
--- a/src/gui/kernel/qcursor_x11.cpp
+++ b/src/gui/kernel/qcursor_x11.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qbitmap.h>
-#include <qcursor.h>
+#include "qbitmap.h"
+#include "qcursor.h"
 #include <qcursor_p.h>
 #include "qx11info_x11.h"
 #include <qpixmap_x11_p.h>
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 623691588..3c94b580a 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <qwidget.h>
-#include <qdrag.h>
-#include <qpixmap.h>
-#include <qpoint.h>
+#include "qwidget.h"
+#include "qdrag.h"
+#include "qpixmap.h"
+#include "qpoint.h"
 #include "qdnd_p.h"
 
 #ifndef QT_NO_DRAGANDDROP
diff --git a/src/gui/kernel/qguiplatformplugin.cpp b/src/gui/kernel/qguiplatformplugin.cpp
index 704d0402b..663705028 100644
--- a/src/gui/kernel/qguiplatformplugin.cpp
+++ b/src/gui/kernel/qguiplatformplugin.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include "qguiplatformplugin.h"
-#include <qdebug.h>
-#include <qfile.h>
-#include <qdir.h>
-#include <qsettings.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qdir.h"
+#include "qsettings.h"
 #include "qfactoryloader_p.h"
 #include "qstylefactory.h"
 #include "qapplication.h"
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index c22123b13..1d5c207b7 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -44,7 +44,7 @@
 
 #include <qobject_p.h>
 #include "qkeymapper_p.h"
-#include <qwidget.h>
+#include "qwidget.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 7df1a9359..a57182370 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -44,12 +44,12 @@
 // We mean it.
 //
 
-#include <qobject.h>
+#include "qobject.h"
 #include <qobject_p.h>
-#include <qkeysequence.h>
-#include <qlist.h>
-#include <qlocale.h>
-#include <qevent.h>
+#include "qkeysequence.h"
+#include "qlist.h"
+#include "qlocale.h"
+#include "qevent.h"
 
 #if defined(Q_WS_X11)
 #    include "qt_x11_p.h"
diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/gui/kernel/qlayoutengine.cpp
index caa4773b6..3cd1c3840 100644
--- a/src/gui/kernel/qlayoutengine.cpp
+++ b/src/gui/kernel/qlayoutengine.cpp
@@ -45,10 +45,10 @@
 #include "qvector.h"
 #include "qwidget.h"
 
-#include <qlist.h>
-#include <qalgorithms.h>
+#include "qlist.h"
+#include "qalgorithms.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qstackedlayout.cpp b/src/gui/kernel/qstackedlayout.cpp
index 1dfd38b99..56f2e06ee 100644
--- a/src/gui/kernel/qstackedlayout.cpp
+++ b/src/gui/kernel/qstackedlayout.cpp
@@ -42,8 +42,8 @@
 #include "qstackedlayout.h"
 #include "qlayout_p.h"
 
-#include <qlist.h>
-#include <qwidget.h>
+#include "qlist.h"
+#include "qwidget.h"
 #include "qlayoutengine_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 90e38154f..073527ce3 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -45,7 +45,7 @@
 #include "qevent.h"
 #include "qwidget.h"
 #include "qabstractscrollarea.h"
-#include <qgraphicssceneevent.h>
+#include "qgraphicssceneevent.h"
 #include "qdebug.h"
 
 #ifndef QT_NO_GESTURES
diff --git a/src/gui/kernel/qtooltip.cpp b/src/gui/kernel/qtooltip.cpp
index 8a03fe97d..5844cc502 100644
--- a/src/gui/kernel/qtooltip.cpp
+++ b/src/gui/kernel/qtooltip.cpp
@@ -39,22 +39,22 @@
 **
 ****************************************************************************/
 
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-#include <qevent.h>
-#include <qhash.h>
-#include <qlabel.h>
-#include <qpointer.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qstylepainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
+#include "qapplication.h"
+#include "qdesktopwidget.h"
+#include "qevent.h"
+#include "qhash.h"
+#include "qlabel.h"
+#include "qpointer.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qstylepainter.h"
+#include "qtimer.h"
+#include "qtooltip.h"
 #include <qeffects_p.h>
-#include <qtextdocument.h>
-#include <qdebug.h>
+#include "qtextdocument.h"
+#include "qdebug.h"
 #include <qstylesheetstyle_p.h>
-#include <qbasictimer.h>
+#include "qbasictimer.h"
 #ifndef QT_NO_TOOLTIP
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qwhatsthis.cpp b/src/gui/kernel/qwhatsthis.cpp
index cce46f1a0..7fb4b2d32 100644
--- a/src/gui/kernel/qwhatsthis.cpp
+++ b/src/gui/kernel/qwhatsthis.cpp
@@ -61,7 +61,7 @@
 #endif
 #if defined(Q_WS_X11)
 #include "qx11info_x11.h"
-#include <qwidget.h>
+#include "qwidget.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index 19dc0beb9..b68a0922a 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -41,17 +41,17 @@
 
 #include "qplatformdefs.h"
 #include "qx11embed_x11.h"
-#include <qapplication.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qelapsedtimer.h>
-#include <qpointer.h>
-#include <qdebug.h>
+#include "qapplication.h"
+#include "qevent.h"
+#include "qpainter.h"
+#include "qlayout.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qelapsedtimer.h"
+#include "qpointer.h"
+#include "qdebug.h"
 #include <qwidget_p.h>
-#include <qx11info_x11.h>
+#include "qx11info_x11.h"
 #include <qt_x11_p.h>
 
 //#define QX11EMBED_DEBUG
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 48c68ae26..b9972d4cf 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -41,12 +41,12 @@
 
 #include "qbezier_p.h"
 #include "qpainterpath_p.h"
-#include <qdebug.h>
-#include <qline.h>
-#include <qpolygon.h>
-#include <qvector.h>
-#include <qlist.h>
-#include <qmath.h>
+#include "qdebug.h"
+#include "qline.h"
+#include "qpolygon.h"
+#include "qvector.h"
+#include "qlist.h"
+#include "qmath.h"
 
 #include <qmath_p.h>
 
diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp
index de35edd81..0a43cac83 100644
--- a/src/gui/painting/qcssutil.cpp
+++ b/src/gui/painting/qcssutil.cpp
@@ -42,7 +42,7 @@
 #include "qcssutil_p.h"
 #include "qcssparser_p.h"
 #include "qpainter.h"
-#include <qmath.h>
+#include "qmath.h"
 #include <QtGui/qpen.h>
 
 #ifndef QT_NO_CSSPARSER
diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp
index d5dfec9da..432ce13dd 100644
--- a/src/gui/painting/qcups.cpp
+++ b/src/gui/painting/qcups.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qcups_p.h"
 
 #ifndef QT_NO_CUPS
@@ -46,7 +46,7 @@
 #ifndef QT_LINUXBASE // LSB merges everything into cups.h
 # include <cups/language.h>
 #endif
-#include <qtextcodec.h>
+#include "qtextcodec.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index cd8bbbf9a..84830626e 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -43,7 +43,7 @@
 #include <qpaintengine_raster_p.h>
 #include <qpainter_p.h>
 #include <qmath_p.h>
-#include <qmath.h>
+#include "qmath.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qdrawutil.cpp b/src/gui/painting/qdrawutil.cpp
index a3683a65f..67362b9de 100644
--- a/src/gui/painting/qdrawutil.cpp
+++ b/src/gui/painting/qdrawutil.cpp
@@ -46,8 +46,8 @@
 #include "qpainter.h"
 #include "qpalette.h"
 #include <qpaintengineex_p.h>
-#include <qvarlengtharray.h>
-#include <qmath.h>
+#include "qvarlengtharray.h"
+#include "qmath.h"
 #include <qstylehelper_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h
index 3e81cc368..ab62ac007 100644
--- a/src/gui/painting/qmath_p.h
+++ b/src/gui/painting/qmath_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index 63eef0f4c..a1953f234 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -44,10 +44,10 @@
 #include "qpolygon.h"
 #include "qbitmap.h"
 #include "qapplication.h"
-#include <qdebug.h>
-#include <qmath.h>
+#include "qdebug.h"
+#include "qmath.h"
 #include <qtextengine_p.h>
-#include <qvarlengtharray.h>
+#include "qvarlengtharray.h"
 #include <qfontengine_p.h>
 #include <qpaintengineex_p.h>
 
diff --git a/src/gui/painting/qpaintengine_alpha.cpp b/src/gui/painting/qpaintengine_alpha.cpp
index b160c571c..24a3aaf33 100644
--- a/src/gui/painting/qpaintengine_alpha.cpp
+++ b/src/gui/painting/qpaintengine_alpha.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_PRINTER
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qpaintengine_alpha_p.h"
 #include "qfont_p.h"
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 1a1c1867b..409272d56 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -46,12 +46,12 @@
 #define QT_FT_END_HEADER
 
 #include <qrasterdefs_p.h>
-#include <qpainterpath.h>
-#include <qdebug.h>
-#include <qcache.h>
-#include <qlabel.h>
-#include <qbitmap.h>
-#include <qmath.h>
+#include "qpainterpath.h"
+#include "qdebug.h"
+#include "qcache.h"
+#include "qlabel.h"
+#include "qbitmap.h"
+#include "qmath.h"
 #include <qfontengine_ft_p.h>
 #include <qmath_p.h>
 #include <qtextengine_p.h>
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 96402145e..06b2a9802 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -52,11 +52,11 @@
 #include "qtextcodec.h"
 #include "qcoreevent.h"
 #include "qiodevice.h"
-#include <qmath.h>
+#include "qmath.h"
 
 #include "qpainter_p.h"
-#include <qtextlayout.h>
-#include <qvarlengtharray.h>
+#include "qtextlayout.h"
+#include "qvarlengtharray.h"
 #include <qfont_p.h>
 #include <qtextengine_p.h>
 #include <qpaintengine_x11_p.h>
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index 96cb183e0..c4b8d803d 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -46,8 +46,8 @@
 #include <qfontengine_p.h>
 #include <qstatictext_p.h>
 
-#include <qvarlengtharray.h>
-#include <qdebug.h>
+#include "qvarlengtharray.h"
+#include "qdebug.h"
 
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index dfd9b3a85..15c1621eb 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -40,9 +40,9 @@
 ****************************************************************************/
 
 // QtCore
-#include <qdebug.h>
-#include <qmath.h>
-#include <qmutex.h>
+#include "qdebug.h"
+#include "qmath.h"
+#include "qmutex.h"
 
 // QtGui
 #include "qbitmap.h"
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index f3dde9d48..7e32d1a3a 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -42,20 +42,20 @@
 #include "qpainterpath.h"
 #include "qpainterpath_p.h"
 
-#include <qbitmap.h>
-#include <qdebug.h>
-#include <qiodevice.h>
-#include <qlist.h>
-#include <qmatrix.h>
-#include <qpen.h>
-#include <qpolygon.h>
-#include <qtextlayout.h>
-#include <qvarlengtharray.h>
-#include <qmath.h>
+#include "qbitmap.h"
+#include "qdebug.h"
+#include "qiodevice.h"
+#include "qlist.h"
+#include "qmatrix.h"
+#include "qpen.h"
+#include "qpolygon.h"
+#include "qtextlayout.h"
+#include "qvarlengtharray.h"
+#include "qmath.h"
 
 #include <qbezier_p.h>
 #include <qfontengine_p.h>
-#include <qnumeric.h>
+#include "qnumeric.h"
 #include <qobject_p.h>
 #include <qpathclipper_p.h>
 #include <qstroker_p.h>
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 52333564c..b6b78708f 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -42,9 +42,9 @@
 #include "qpathclipper_p.h"
 
 #include <qbezier_p.h>
-#include <qmath.h>
-#include <qnumeric.h>
-#include <qdebug.h>
+#include "qmath.h"
+#include "qnumeric.h"
+#include "qdebug.h"
 
 /**
   The algorithm is as follows:
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index dba5ed7ea..43465b2d2 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 #include "qplatformdefs.h"
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qpdf_p.h"
-#include <qfile.h>
-#include <qtemporaryfile.h>
+#include "qfile.h"
+#include "qtemporaryfile.h"
 #include <qmath_p.h>
 #include "qcups_p.h"
 #include "qprinterinfo.h"
-#include <qnumeric.h>
+#include "qnumeric.h"
 #include "qfont_p.h"
 
 #ifdef Q_OS_UNIX
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index d09a31aa5..223e15e6c 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -44,7 +44,7 @@
 #include "qvariant.h"
 #include "qbrush.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qprintengine_pdf.cpp b/src/gui/painting/qprintengine_pdf.cpp
index 3f46bfe38..b0c05d82f 100644
--- a/src/gui/painting/qprintengine_pdf.cpp
+++ b/src/gui/painting/qprintengine_pdf.cpp
@@ -41,16 +41,16 @@
 
 #include <QtGui/qprintengine.h>
 
-#include <qiodevice.h>
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qpainterpath.h>
-#include <qpaintdevice.h>
-#include <qfile.h>
-#include <qdebug.h>
-#include <qimagewriter.h>
-#include <qbuffer.h>
-#include <qdatetime.h>
+#include "qiodevice.h"
+#include "qpainter.h"
+#include "qbitmap.h"
+#include "qpainterpath.h"
+#include "qpaintdevice.h"
+#include "qfile.h"
+#include "qdebug.h"
+#include "qimagewriter.h"
+#include "qbuffer.h"
+#include "qdatetime.h"
 
 #ifndef QT_NO_PRINTER
 #include <limits.h>
diff --git a/src/gui/painting/qprintengine_ps.cpp b/src/gui/painting/qprintengine_ps.cpp
index 4f75aa242..e0de6b6bd 100644
--- a/src/gui/painting/qprintengine_ps.cpp
+++ b/src/gui/painting/qprintengine_ps.cpp
@@ -64,7 +64,7 @@
 #include "qregion.h"
 #include "qimagewriter.h"
 #include <qpainterpath_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 #include <qdrawhelper_p.h>
 #include <qmutexpool_p.h>
 
diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp
index 25abc728b..d810729c6 100644
--- a/src/gui/painting/qprinter.cpp
+++ b/src/gui/painting/qprinter.cpp
@@ -44,9 +44,9 @@
 #include "qprintengine.h"
 #include "qprinterinfo.h"
 #include "qlist.h"
-#include <qpagesetupdialog.h>
-#include <qapplication.h>
-#include <qfileinfo.h>
+#include "qpagesetupdialog.h"
+#include "qapplication.h"
+#include "qfileinfo.h"
 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
 #include "qcups_p.h"
 #endif
@@ -63,7 +63,7 @@
 #include "qprintengine_pdf_p.h"
 #endif
 
-#include <qimage.h>
+#include "qimage.h"
 #include <qpaintengine_preview_p.h>
 
 
diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp
index 1bd5e850d..6190558fb 100644
--- a/src/gui/painting/qprinterinfo_unix.cpp
+++ b/src/gui/painting/qprinterinfo_unix.cpp
@@ -42,11 +42,11 @@
 #include "qprinterinfo.h"
 #include "qprinterinfo_p.h"
 
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qprintdialog.h>
-#include <qtextstream.h>
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qdir.h"
+#include "qprintdialog.h"
+#include "qtextstream.h"
 
 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
 #  include <qcups_p.h>
diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp
index 375d70233..8f7585a1d 100644
--- a/src/gui/painting/qtessellator.cpp
+++ b/src/gui/painting/qtessellator.cpp
@@ -41,11 +41,11 @@
 
 #include "qtessellator_p.h"
 
-#include <QRect>
-#include <QList>
-#include <QDebug>
+#include "qrect.h"
+#include "qlist.h"
+#include "qdebug.h"
+#include "qmath.h"
 
-#include <qmath.h>
 #include <limits.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/painting/qtessellator_p.h b/src/gui/painting/qtessellator_p.h
index 22931a3fa..80085dd45 100644
--- a/src/gui/painting/qtessellator_p.h
+++ b/src/gui/painting/qtessellator_p.h
@@ -45,8 +45,8 @@
 // We mean it.
 //
 
-#include <qpoint.h>
-#include <qrect.h>
+#include "qpoint.h"
+#include "qrect.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index b61facbbc..ea31f3246 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qmath.h>
+#include "qmath.h"
 #include "qtextureglyphcache_p.h"
 #include "qfontengine_ft_p.h"
 
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index a47af73f6..6f749e02a 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -45,10 +45,10 @@
 // We mean it.
 //
 
-#include <qhash.h>
-#include <qimage.h>
-#include <qobject.h>
-#include <qtransform.h>
+#include "qhash.h"
+#include "qimage.h"
+#include "qobject.h"
+#include "qtransform.h"
 
 #include <qfontengineglyphcache_p.h>
 
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index 1d3dbfe06..7d3456a43 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qwindowsurface_p.h>
-#include <qwidget.h>
+#include "qwidget.h"
 #include <qwidget_p.h>
 #include <qbackingstore_p.h>
 #include <qapplication_p.h>
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 5dfe46ba7..5409eeba3 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
-#include <qpaintdevice.h>
-#include <qwidget.h>
+#include "qdebug.h"
+#include "qpaintdevice.h"
+#include "qwidget.h"
 
 #include "qwindowsurface_raster_p.h"
 #include "qimage.h"
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index 7637d1f01..d25303a46 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -45,7 +45,6 @@
 // We mean it.
 //
 
-#include <qglobal.h>
 #include "qwindowsurface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/painting/qwindowsurface_x11_p.h b/src/gui/painting/qwindowsurface_x11_p.h
index 8fd7f0476..0cf34726e 100644
--- a/src/gui/painting/qwindowsurface_x11_p.h
+++ b/src/gui/painting/qwindowsurface_x11_p.h
@@ -45,7 +45,6 @@
 // We mean it.
 //
 
-#include <qglobal.h>
 #include "qwindowsurface_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/styles/qcleanlooksstyle.cpp b/src/gui/styles/qcleanlooksstyle.cpp
index 5bdea2882..911fa7d8f 100644
--- a/src/gui/styles/qcleanlooksstyle.cpp
+++ b/src/gui/styles/qcleanlooksstyle.cpp
@@ -45,27 +45,27 @@
 #if !defined(QT_NO_STYLE_CLEANLOOKS) || defined(QT_PLUGIN)
 
 #include "qwindowsstyle_p.h"
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qpainter.h>
-#include <qdir.h>
-#include <qhash.h>
-#include <qstyleoption.h>
-#include <qapplication.h>
-#include <qmainwindow.h>
-#include <qfont.h>
-#include <qgroupbox.h>
-#include <qpixmapcache.h>
-#include <qdialogbuttonbox.h>
-#include <qscrollbar.h>
-#include <qspinbox.h>
-#include <qslider.h>
-#include <qsplitter.h>
-#include <qprogressbar.h>
-#include <qtoolbar.h>
-#include <qwizard.h>
+#include "qcombobox.h"
+#include "qpushbutton.h"
+#include "qpainter.h"
+#include "qdir.h"
+#include "qhash.h"
+#include "qstyleoption.h"
+#include "qapplication.h"
+#include "qmainwindow.h"
+#include "qfont.h"
+#include "qgroupbox.h"
+#include "qpixmapcache.h"
+#include "qdialogbuttonbox.h"
+#include "qscrollbar.h"
+#include "qspinbox.h"
+#include "qslider.h"
+#include "qsplitter.h"
+#include "qprogressbar.h"
+#include "qtoolbar.h"
+#include "qwizard.h"
 #include <qstylehelper_p.h>
-#include <qpen.h>
+#include "qpen.h"
 #include "qguicommon_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index b64a66bc7..f20d03d66 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -42,37 +42,37 @@
 #include "qcommonstyle.h"
 #include "qcommonstyle_p.h"
 
-#include <qfile.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qcache.h>
-#include <qdockwidget.h>
-#include <qdrawutil.h>
-#include <qdialogbuttonbox.h>
-#include <qformlayout.h>
-#include <qgroupbox.h>
-#include <qmath.h>
-#include <qmenu.h>
-#include <qpainter.h>
-#include <qpaintengine.h>
-#include <qpainterpath.h>
-#include <qslider.h>
-#include <qstyleoption.h>
-#include <qtabbar.h>
-#include <qtabwidget.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qrubberband.h>
+#include "qfile.h"
+#include "qapplication.h"
+#include "qbitmap.h"
+#include "qcache.h"
+#include "qdockwidget.h"
+#include "qdrawutil.h"
+#include "qdialogbuttonbox.h"
+#include "qformlayout.h"
+#include "qgroupbox.h"
+#include "qmath.h"
+#include "qmenu.h"
+#include "qpainter.h"
+#include "qpaintengine.h"
+#include "qpainterpath.h"
+#include "qslider.h"
+#include "qstyleoption.h"
+#include "qtabbar.h"
+#include "qtabwidget.h"
+#include "qtoolbar.h"
+#include "qtoolbutton.h"
+#include "qrubberband.h"
 #include <qcommonstylepixmaps_p.h>
 #include <qmath_p.h>
-#include <qdebug.h>
-#include <qtextformat.h>
-#include <qwizard.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qsettings.h>
-#include <qpixmapcache.h>
-#include <qguiplatformplugin.h>
+#include "qdebug.h"
+#include "qtextformat.h"
+#include "qwizard.h"
+#include "qfileinfo.h"
+#include "qdir.h"
+#include "qsettings.h"
+#include "qpixmapcache.h"
+#include "qguiplatformplugin.h"
 
 #include <limits.h>
 
diff --git a/src/gui/styles/qmotifstyle_p.h b/src/gui/styles/qmotifstyle_p.h
index 94bfe3fbf..68e79ee73 100644
--- a/src/gui/styles/qmotifstyle_p.h
+++ b/src/gui/styles/qmotifstyle_p.h
@@ -33,9 +33,9 @@
 
 #ifndef QMOTIFSTYLE_P_H
 #define QMOTIFSTYLE_P_H
-#include <qlist.h>
-#include <qdatetime.h>
-#include <qprogressbar.h>
+#include "qlist.h"
+#include "qdatetime.h"
+#include "qprogressbar.h"
 #include "qmotifstyle.h"
 #include "qcommonstyle_p.h"
 
diff --git a/src/gui/styles/qplastiquestyle.cpp b/src/gui/styles/qplastiquestyle.cpp
index dc9e0215c..3ae2e6b58 100644
--- a/src/gui/styles/qplastiquestyle.cpp
+++ b/src/gui/styles/qplastiquestyle.cpp
@@ -50,45 +50,46 @@ static const int ProgressBarFps = 25;
 static const int blueFrameWidth =  2;  // with of line edit focus frame
 
 #include "qwindowsstyle_p.h"
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qabstractitemview.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdebug.h>
-#include <qdialogbuttonbox.h>
-#include <qformlayout.h>
-#include <qgroupbox.h>
-#include <qimage.h>
-#include <qlineedit.h>
-#include <qmainwindow.h>
-#include <qmenu.h>
-#include <qmenubar.h>
-#include <qpainter.h>
-#include <qpaintengine.h>
-#include <qpainterpath.h>
-#include <qpalette.h>
-#include <qpen.h>
-#include <qpixmap.h>
-#include <qpixmapcache.h>
-#include <qprogressbar.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qscrollbar.h>
-#include <qspinbox.h>
-#include <qsplitter.h>
-#include <qstyleoption.h>
-#include <qtextedit.h>
-#include <qelapsedtimer.h>
-#include <qtoolbar.h>
-#include <qtoolbox.h>
-#include <qtoolbutton.h>
-#include <qworkspace.h>
-#include <qvarlengtharray.h>
-#include <limits.h>
-#include <qstylehelper_p.h>
+#include "qapplication.h"
+#include "qbitmap.h"
+#include "qabstractitemview.h"
+#include "qcheckbox.h"
+#include "qcombobox.h"
+#include "qdebug.h"
+#include "qdialogbuttonbox.h"
+#include "qformlayout.h"
+#include "qgroupbox.h"
+#include "qimage.h"
+#include "qlineedit.h"
+#include "qmainwindow.h"
+#include "qmenu.h"
+#include "qmenubar.h"
+#include "qpainter.h"
+#include "qpaintengine.h"
+#include "qpainterpath.h"
+#include "qpalette.h"
+#include "qpen.h"
+#include "qpixmap.h"
+#include "qpixmapcache.h"
+#include "qprogressbar.h"
+#include "qpushbutton.h"
+#include "qradiobutton.h"
+#include "qscrollbar.h"
+#include "qspinbox.h"
+#include "qsplitter.h"
+#include "qstyleoption.h"
+#include "qtextedit.h"
+#include "qelapsedtimer.h"
+#include "qtoolbar.h"
+#include "qtoolbox.h"
+#include "qtoolbutton.h"
+#include "qworkspace.h"
+#include "qvarlengtharray.h"
+#include "qstylehelper_p.h"
 #include "qguicommon_p.h"
 
+#include <limits.h>
+
 QT_BEGIN_NAMESPACE
 
 // from windows style
diff --git a/src/gui/styles/qproxystyle.cpp b/src/gui/styles/qproxystyle.cpp
index f654430f4..25fbcef9e 100644
--- a/src/gui/styles/qproxystyle.cpp
+++ b/src/gui/styles/qproxystyle.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qstyle.h>
+#include "qstyle.h"
 #include <qproxystyle_p.h>
 #include <qapplication_p.h>
 #include "qproxystyle.h"
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index d6253a2fa..4d51f0680 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -51,7 +51,7 @@
 #include "qdebug.h"
 
 #ifdef Q_WS_X11
-#include <qx11info_x11.h>
+#include "qx11info_x11.h"
 #endif
 
 #include <limits.h>
diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp
index e93e7635d..e2fc8f020 100644
--- a/src/gui/styles/qstylehelper.cpp
+++ b/src/gui/styles/qstylehelper.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include <qstyleoption.h>
-#include <qpainter.h>
-#include <qpixmapcache.h>
+#include "qstyleoption.h"
+#include "qpainter.h"
+#include "qpixmapcache.h"
 #include <qmath_p.h>
 #include <qstyle_p.h>
-#include <qmath.h>
-#include <qpen.h>
+#include "qmath.h"
+#include "qpen.h"
 #include "qstylehelper_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 732d47fc6..70f8ac0a9 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_STYLE_STYLESHEET
 
@@ -50,38 +50,38 @@
 #include "qabstractscrollarea_p.h"
 #include "qwindowsstyle_p.h"
 #include "qwidget_p.h"
-#include <qdebug.h>
-#include <qapplication.h>
-#include <qmenu.h>
-#include <qmenubar.h>
-#include <qpainter.h>
-#include <qstyleoption.h>
-#include <qlineedit.h>
-#include <qwindowsstyle.h>
-#include <qcombobox.h>
-#include <qplastiquestyle.h>
-#include <qabstractscrollarea.h>
-#include <qtooltip.h>
-#include <qshareddata.h>
-#include <qradiobutton.h>
-#include <qtoolbutton.h>
-#include <qscrollbar.h>
-#include <qstring.h>
-#include <qfile.h>
-#include <qcheckbox.h>
-#include <qstatusbar.h>
-#include <qheaderview.h>
-#include <qprogressbar.h>
-#include <qtabbar.h>
-#include <qmetaobject.h>
-#include <qmainwindow.h>
-#include <qdockwidget.h>
-#include <qmdisubwindow.h>
-#include <qdialog.h>
-#include <qabstractspinbox.h>
-#include <qlabel.h>
-#include <qdrawutil.h>
-#include <qtoolbar.h>
+#include "qdebug.h"
+#include "qapplication.h"
+#include "qmenu.h"
+#include "qmenubar.h"
+#include "qpainter.h"
+#include "qstyleoption.h"
+#include "qlineedit.h"
+#include "qwindowsstyle.h"
+#include "qcombobox.h"
+#include "qplastiquestyle.h"
+#include "qabstractscrollarea.h"
+#include "qtooltip.h"
+#include "qshareddata.h"
+#include "qradiobutton.h"
+#include "qtoolbutton.h"
+#include "qscrollbar.h"
+#include "qstring.h"
+#include "qfile.h"
+#include "qcheckbox.h"
+#include "qstatusbar.h"
+#include "qheaderview.h"
+#include "qprogressbar.h"
+#include "qtabbar.h"
+#include "qmetaobject.h"
+#include "qmainwindow.h"
+#include "qdockwidget.h"
+#include "qmdisubwindow.h"
+#include "qdialog.h"
+#include "qabstractspinbox.h"
+#include "qlabel.h"
+#include "qdrawutil.h"
+#include "qtoolbar.h"
 #include <qguicommon_p.h>
 
 #include <limits.h>
diff --git a/src/gui/styles/qwindowsstyle_p.h b/src/gui/styles/qwindowsstyle_p.h
index 1b1941fd5..706a0a931 100644
--- a/src/gui/styles/qwindowsstyle_p.h
+++ b/src/gui/styles/qwindowsstyle_p.h
@@ -49,9 +49,9 @@
 #include "qcommonstyle_p.h"
 
 #ifndef QT_NO_STYLE_WINDOWS
-#include <qlist.h>
-#include <qhash.h>
-#include <qelapsedtimer.h>
+#include "qlist.h"
+#include "qhash.h"
+#include "qelapsedtimer.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 170b00fce..0f763707b 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qabstracttextdocumentlayout.h>
-#include <qtextformat.h>
+#include "qabstracttextdocumentlayout.h"
+#include "qtextformat.h"
 #include "qtextdocument_p.h"
 #include "qtextengine_p.h"
 
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index e702c6b77..e9639d3d1 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -41,13 +41,13 @@
 
 #include "qcssparser_p.h"
 
-#include <qdebug.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qfileinfo.h>
-#include <qfontmetrics.h>
-#include <qbrush.h>
-#include <qimagereader.h>
+#include "qdebug.h"
+#include "qcolor.h"
+#include "qfont.h"
+#include "qfileinfo.h"
+#include "qfontmetrics.h"
+#include "qbrush.h"
+#include "qimagereader.h"
 
 #ifndef QT_NO_CSSPARSER
 
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index c76eabfdf..563e07d9a 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -57,7 +57,7 @@
 #include <qfontengine_p.h>
 #include <qpainter_p.h>
 #include <qtextengine_p.h>
-#include <qmutex.h>
+#include "qmutex.h"
 
 #include <limits.h>
 
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index a91ad11ab..e0a95d9ba 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qdir.h>
+#include "qdir.h"
 #include "qfontdatabase.h"
 #include "qdebug.h"
 #include "qalgorithms.h"
diff --git a/src/gui/text/qfontdatabase_x11.h b/src/gui/text/qfontdatabase_x11.h
index d60189dab..23a005634 100644
--- a/src/gui/text/qfontdatabase_x11.h
+++ b/src/gui/text/qfontdatabase_x11.h
@@ -32,13 +32,13 @@
 ****************************************************************************/
 
 #include <qplatformdefs.h>
-#include <qdebug.h>
-#include <qpaintdevice.h>
-#include <qelapsedtimer.h>
-#include <qfile.h>
-#include <qtemporaryfile.h>
-#include <qabstractfileengine.h>
-#include <qmath.h>
+#include "qdebug.h"
+#include "qpaintdevice.h"
+#include "qelapsedtimer.h"
+#include "qfile.h"
+#include "qtemporaryfile.h"
+#include "qabstractfileengine.h"
+#include "qmath.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -48,7 +48,7 @@
 #include <sys/mman.h>
 
 #include <qt_x11_p.h>
-#include <qx11info_x11.h>
+#include "qx11info_x11.h"
 #include <qfontengine_x11_p.h>
 
 #ifndef QT_NO_FONTCONFIG
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index e2ecbbabb..b15b0357d 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
+#include "qdebug.h"
 #include <qfontengine_p.h>
 
 #include "qbitmap.h"
 #include "qpainter.h"
 #include "qpainterpath.h"
 #include "qvarlengtharray.h"
-#include <qmath.h>
-#include <qendian.h>
+#include "qmath.h"
+#include "qendian.h"
 #include <qharfbuzz_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index cacff2f46..3e5b3c316 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -43,11 +43,11 @@
 
 // #define FONTENGINE_DEBUG
 
-#include <qapplication.h>
-#include <qbytearray.h>
-#include <qdebug.h>
-#include <qtextcodec.h>
-#include <qthread.h>
+#include "qapplication.h"
+#include "qbytearray.h"
+#include "qdebug.h"
+#include "qtextcodec.h"
+#include "qthread.h"
 
 #include "qfontdatabase.h"
 #include "qpaintdevice.h"
@@ -61,7 +61,7 @@
 #include "qfont.h"
 #include "qfont_p.h"
 #include "qfontengine_p.h"
-#include <qhash.h>
+#include "qhash.h"
 
 #include <qpainter_p.h>
 #include <qunicodetables_p.h>
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 1843a8c66..5870a46a8 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -38,10 +38,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qdebug.h>
+#include "qdebug.h"
 #include "qfontsubset_p.h"
-#include <qendian.h>
-#include <qpainterpath.h>
+#include "qendian.h"
+#include "qpainterpath.h"
 #include "qpdf_p.h"
 
 #ifdef Q_WS_X11
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 6bb0f1153..59a2b7c05 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -43,9 +43,9 @@
 #include "qstatictext_p.h"
 #include <qtextengine_p.h>
 #include <qfontengine_p.h>
-#include <qfontmetrics.h>
-#include <qabstracttextdocumentlayout.h>
-#include <qapplication.h>
+#include "qfontmetrics.h"
+#include "qabstracttextdocumentlayout.h"
+#include "qapplication.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index 4c9979eeb..2df6c2b72 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -43,15 +43,15 @@
 
 #ifndef QT_NO_SYNTAXHIGHLIGHTER
 #include <qobject_p.h>
-#include <qtextdocument.h>
+#include "qtextdocument.h"
 #include <qtextdocument_p.h>
-#include <qtextlayout.h>
-#include <qpointer.h>
-#include <qtextobject.h>
-#include <qtextcursor.h>
-#include <qdebug.h>
-#include <qtextedit.h>
-#include <qtimer.h>
+#include "qtextlayout.h"
+#include "qpointer.h"
+#include "qtextobject.h"
+#include "qtextcursor.h"
+#include "qdebug.h"
+#include "qtextedit.h"
+#include "qtimer.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 180ee8d48..46662880a 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -44,17 +44,17 @@
 
 #ifndef QT_NO_TEXTCONTROL
 
-#include <qfont.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qdebug.h>
-#include <qmimedata.h>
-#include <qdrag.h>
-#include <qconfig.h>
-#include <qclipboard.h>
-#include <qmenu.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include "qfont.h"
+#include "qpainter.h"
+#include "qevent.h"
+#include "qdebug.h"
+#include "qmimedata.h"
+#include "qdrag.h"
+#include "qconfig.h"
+#include "qclipboard.h"
+#include "qmenu.h"
+#include "qstyle.h"
+#include "qtimer.h"
 #include "qtextdocumentlayout_p.h"
 #include "qabstracttextdocumentlayout_p.h"
 #include "qtextedit_p.h"
@@ -65,24 +65,24 @@
 #include "qprinter.h"
 #include "qtextdocumentwriter.h"
 #include "qtextcursor_p.h"
-#include <qtextformat.h>
-#include <qdatetime.h>
-#include <qbuffer.h>
-#include <qapplication.h>
+#include "qtextformat.h"
+#include "qdatetime.h"
+#include "qbuffer.h"
+#include "qapplication.h"
 #include <limits.h>
-#include <qtexttable.h>
-#include <qvariant.h>
-#include <qurl.h>
-#include <qdesktopservices.h>
-#include <qtooltip.h>
-#include <qstyleoption.h>
-#include <qlineedit.h>
-#include <qaccessible.h>
+#include "qtexttable.h"
+#include "qvariant.h"
+#include "qurl.h"
+#include "qdesktopservices.h"
+#include "qtooltip.h"
+#include "qstyleoption.h"
+#include "qlineedit.h"
+#include "qaccessible.h"
 
 #ifndef QT_NO_SHORTCUT
 #include "qapplication_p.h"
 #include "qshortcutmap_p.h"
-#include <qkeysequence.h>
+#include "qkeysequence.h"
 #define ACCEL_KEY(k) (!qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? QLatin1Char('\t') + QKeySequence(k).toString() : QString())
 #else
 #define ACCEL_KEY(k) QString()
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 4af2e22d3..4788b0b95 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -50,8 +50,8 @@
 #include "qtextengine_p.h"
 #include "qabstracttextdocumentlayout.h"
 
-#include <qtextlayout.h>
-#include <qdebug.h>
+#include "qtextlayout.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index a64b74e98..ee86e7b60 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -40,25 +40,25 @@
 ****************************************************************************/
 
 #include "qtextdocument.h"
-#include <qtextformat.h>
+#include "qtextformat.h"
 #include "qtextdocumentlayout_p.h"
 #include "qtextdocumentfragment.h"
 #include "qtextdocumentfragment_p.h"
 #include "qtexttable.h"
 #include "qtextlist.h"
-#include <qdebug.h>
-#include <qregexp.h>
-#include <qvarlengtharray.h>
-#include <qtextcodec.h>
-#include <qthread.h>
+#include "qdebug.h"
+#include "qregexp.h"
+#include "qvarlengtharray.h"
+#include "qtextcodec.h"
+#include "qthread.h"
 #include "qtexthtmlparser_p.h"
 #include "qpainter.h"
 #include "qprinter.h"
 #include "qtextedit.h"
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qapplication.h>
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qdir.h"
+#include "qapplication.h"
 #include "qtextcontrol_p.h"
 #include "qfont_p.h"
 #include "qtextedit_p.h"
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index ba50e798d..fb0b16055 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <qtools_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 #include "qtextdocument_p.h"
 #include "qtextdocument.h"
-#include <qtextformat.h>
+#include "qtextformat.h"
 #include "qtextformat_p.h"
 #include "qtextobject_p.h"
 #include "qtextcursor.h"
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index d1beeb089..62fdb03e2 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -44,11 +44,11 @@
 #include "qtextcursor_p.h"
 #include "qtextlist.h"
 
-#include <qdebug.h>
-#include <qtextcodec.h>
-#include <qbytearray.h>
-#include <qdatastream.h>
-#include <qdatetime.h>
+#include "qdebug.h"
+#include "qtextcodec.h"
+#include "qbytearray.h"
+#include "qdatastream.h"
+#include "qdatetime.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index b07fd3a78..0e31b2d98 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -48,15 +48,15 @@
 #include "qcssutil_p.h"
 #include "qabstracttextdocumentlayout_p.h"
 #include "qcssparser_p.h"
-#include <qpainter.h>
-#include <qmath.h>
-#include <qrect.h>
-#include <qpalette.h>
-#include <qdebug.h>
-#include <qvarlengtharray.h>
-#include <qstyle.h>
-#include <qbasictimer.h>
-#include <qfontmetrics.h>
+#include "qpainter.h"
+#include "qmath.h"
+#include "qrect.h"
+#include "qpalette.h"
+#include "qdebug.h"
+#include "qvarlengtharray.h"
+#include "qstyle.h"
+#include "qbasictimer.h"
+#include "qfontmetrics.h"
 
 #include <limits.h>
 
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index cd3345f35..696840660 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -52,7 +52,7 @@
 #include "qfontengine_p.h"
 #include "qunicodetables_p.h"
 #include "qtextdocument_p.h"
-#include <qapplication.h>
+#include "qapplication.h"
 
 #if defined(Q_WS_X11)
 #   include "qfontengine_ft_p.h"
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index f25712124..b3a27e9d4 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -42,11 +42,11 @@
 #include "qtextformat.h"
 #include "qtextformat_p.h"
 
-#include <qvariant.h>
-#include <qdatastream.h>
-#include <qdebug.h>
-#include <qmap.h>
-#include <qhash.h>
+#include "qvariant.h"
+#include "qdatastream.h"
+#include "qdebug.h"
+#include "qmap.h"
+#include "qhash.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 15f63a319..a5e8b1769 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -41,12 +41,12 @@
 
 #include "qtexthtmlparser_p.h"
 
-#include <qbytearray.h>
-#include <qtextcodec.h>
-#include <qapplication.h>
-#include <qstack.h>
-#include <qdebug.h>
-#include <qthread.h>
+#include "qbytearray.h"
+#include "qtextcodec.h"
+#include "qapplication.h"
+#include "qstack.h"
+#include "qdebug.h"
+#include "qthread.h"
 #include "qtextdocument.h"
 #include "qtextformat_p.h"
 #include "qtextdocument_p.h"
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 389635a5c..7a3d4b5cb 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -42,14 +42,14 @@
 
 #include "qtextimagehandler_p.h"
 
-#include <qapplication.h>
-#include <qtextformat.h>
-#include <qpainter.h>
-#include <qdebug.h>
+#include "qapplication.h"
+#include "qtextformat.h"
+#include "qpainter.h"
+#include "qdebug.h"
 #include <qtextengine_p.h>
-#include <qpalette.h>
-#include <qtextbrowser.h>
-#include <qthread.h>
+#include "qpalette.h"
+#include "qtextbrowser.h"
+#include "qthread.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 7643147d7..a80c38cab 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -42,13 +42,13 @@
 #include "qtextlayout.h"
 #include "qtextengine_p.h"
 
-#include <qfont.h>
-#include <qapplication.h>
-#include <qmath.h>
-#include <qpainter.h>
-#include <qvarlengtharray.h>
-#include <qtextformat.h>
-#include <qabstracttextdocumentlayout.h>
+#include "qfont.h"
+#include "qapplication.h"
+#include "qmath.h"
+#include "qpainter.h"
+#include "qvarlengtharray.h"
+#include "qtextformat.h"
+#include "qabstracttextdocumentlayout.h"
 #include "qtextdocument_p.h"
 #include "qtextformat_p.h"
 #include "qstyleoption.h"
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index d8d9a3324..6c84d5423 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -44,7 +44,7 @@
 #include "qtextobject_p.h"
 #include "qtextcursor.h"
 #include "qtextdocument_p.h"
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 73c00be5b..96728ab2d 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_TEXTODFWRITER
 
@@ -50,7 +50,7 @@
 #include <QBuffer>
 #include <QUrl>
 
-#include <qtextformat.h>
+#include "qtextformat.h"
 
 #include "qtextdocument_p.h"
 #include "qtexttable.h"
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index 7bc2ac1b1..1d6ecf734 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 #ifndef QT_NO_TEXTODFWRITER
 
 #include "qzipreader_p.h"
 #include "qzipwriter_p.h"
-#include <qdatetime.h>
+#include "qdatetime.h"
 #include <qplatformdefs.h>
-#include <qendian.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qscopedpointer.h>
+#include "qendian.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qscopedpointer.h"
 
 #if 0
 #define ZDEBUG qDebug
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 9f6d30c08..17bd4c88c 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -43,20 +43,17 @@
 
 #ifndef QT_NO_DESKTOPSERVICES
 
-#include <qdebug.h>
+#include "qdebug.h"
+#include "qhash.h"
+#include "qobject.h"
+#include "qcoreapplication.h"
+#include "qurl.h"
+#include "qmutex.h"
 
-#if defined(Q_OS_BLACKBERRY)
-#include "qdesktopservices_blackberry.cpp"
-#elif defined(Q_WS_X11)
+#if defined(Q_WS_X11)
 #include "qdesktopservices_x11.cpp"
 #endif
 
-#include <qhash.h>
-#include <qobject.h>
-#include <qcoreapplication.h>
-#include <qurl.h>
-#include <qmutex.h>
-
 QT_BEGIN_NAMESPACE
 
 class QOpenUrlHandlerRegistry : public QObject
diff --git a/src/gui/util/qdesktopservices_x11.cpp b/src/gui/util/qdesktopservices_x11.cpp
index 5fb920bd8..422108561 100644
--- a/src/gui/util/qdesktopservices_x11.cpp
+++ b/src/gui/util/qdesktopservices_x11.cpp
@@ -43,13 +43,14 @@
 
 #ifndef QT_NO_DESKTOPSERVICES
 
-#include <qprocess.h>
-#include <qurl.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qt_x11_p.h>
-#include <qcoreapplication.h>
+#include "qprocess.h"
+#include "qurl.h"
+#include "qdir.h"
+#include "qfile.h"
+#include "qtextstream.h"
+#include "qt_x11_p.h"
+#include "qcoreapplication.h"
+
 #include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index 2918edb14..a6527fff6 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qapplication.h>
+#include "qapplication.h"
 #include "qabstractslider.h"
 #include "qevent.h"
 #include "qabstractslider_p.h"
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index 60a912617..f09640a88 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -42,22 +42,22 @@
 #include <qplatformdefs.h>
 #include <qabstractspinbox_p.h>
 #include <qlineedit_p.h>
-#include <qabstractspinbox.h>
+#include "qabstractspinbox.h"
 
 #ifndef QT_NO_SPINBOX
 
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qdatetime.h>
-#include <qdatetimeedit.h>
-#include <qevent.h>
-#include <qmenu.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qstylepainter.h>
-#include <qdebug.h>
+#include "qapplication.h"
+#include "qclipboard.h"
+#include "qdatetime.h"
+#include "qdatetimeedit.h"
+#include "qevent.h"
+#include "qmenu.h"
+#include "qpainter.h"
+#include "qpalette.h"
+#include "qstylepainter.h"
+#include "qdebug.h"
 #ifndef QT_NO_ACCESSIBILITY
-# include <qaccessible.h>
+# include "qaccessible.h"
 #endif
 
 #if defined(Q_WS_X11)
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 92d68b117..e70181586 100644
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -43,23 +43,23 @@
 
 #ifndef QT_NO_CALENDARWIDGET
 
-#include <qabstractitemmodel.h>
-#include <qitemdelegate.h>
-#include <qdatetime.h>
-#include <qtableview.h>
-#include <qlayout.h>
-#include <qevent.h>
-#include <qtextformat.h>
-#include <qheaderview.h>
+#include "qabstractitemmodel.h"
+#include "qitemdelegate.h"
+#include "qdatetime.h"
+#include "qtableview.h"
+#include "qlayout.h"
+#include "qevent.h"
+#include "qtextformat.h"
+#include "qheaderview.h"
 #include <qwidget_p.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
-#include <qspinbox.h>
-#include <qmenu.h>
-#include <qapplication.h>
-#include <qbasictimer.h>
-#include <qstylepainter.h>
+#include "qpushbutton.h"
+#include "qtoolbutton.h"
+#include "qlabel.h"
+#include "qspinbox.h"
+#include "qmenu.h"
+#include "qapplication.h"
+#include "qbasictimer.h"
+#include "qstylepainter.h"
 #include <qcalendartextnavigator_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 484709a39..b4e2d4faf 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -42,26 +42,26 @@
 #include "qcombobox.h"
 
 #ifndef QT_NO_COMBOBOX
-#include <qstylepainter.h>
-#include <qlineedit.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-#include <qlistview.h>
-#include <qtableview.h>
-#include <qitemdelegate.h>
-#include <qmap.h>
-#include <qmenu.h>
-#include <qevent.h>
-#include <qlayout.h>
-#include <qscrollbar.h>
-#include <qtreeview.h>
-#include <qheaderview.h>
-#include <qmath.h>
+#include "qstylepainter.h"
+#include "qlineedit.h"
+#include "qapplication.h"
+#include "qdesktopwidget.h"
+#include "qlistview.h"
+#include "qtableview.h"
+#include "qitemdelegate.h"
+#include "qmap.h"
+#include "qmenu.h"
+#include "qevent.h"
+#include "qlayout.h"
+#include "qscrollbar.h"
+#include "qtreeview.h"
+#include "qheaderview.h"
+#include "qmath.h"
 #include <qapplication_p.h>
 #include <qcombobox_p.h>
 #include <qabstractitemmodel_p.h>
 #include <qabstractscrollarea_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 #ifndef QT_NO_EFFECTS
 # include <qeffects_p.h>
diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp
index 27d8d96d1..0e1f397b0 100644
--- a/src/gui/widgets/qcommandlinkbutton.cpp
+++ b/src/gui/widgets/qcommandlinkbutton.cpp
@@ -46,7 +46,7 @@
 #include "qtextlayout.h"
 #include "qcolor.h"
 #include "qfont.h"
-#include <qmath.h>
+#include "qmath.h"
 
 #include "qpushbutton_p.h"
 
diff --git a/src/gui/widgets/qdatetimeedit.cpp b/src/gui/widgets/qdatetimeedit.cpp
index 20d0c9a54..be194ef77 100644
--- a/src/gui/widgets/qdatetimeedit.cpp
+++ b/src/gui/widgets/qdatetimeedit.cpp
@@ -41,19 +41,19 @@
 
 #include <math.h>
 #include <qdatetimeedit_p.h>
-#include <qabstractspinbox.h>
-#include <qapplication.h>
-#include <qdatetimeedit.h>
-#include <qdesktopwidget.h>
-#include <qdebug.h>
-#include <qevent.h>
-#include <qlineedit.h>
+#include "qabstractspinbox.h"
+#include "qapplication.h"
+#include "qdatetimeedit.h"
+#include "qdesktopwidget.h"
+#include "qdebug.h"
+#include "qevent.h"
+#include "qlineedit.h"
 #include <qlineedit_p.h>
-#include <qlocale.h>
-#include <qpainter.h>
-#include <qlayout.h>
-#include <qset.h>
-#include <qstyle.h>
+#include "qlocale.h"
+#include "qpainter.h"
+#include "qlayout.h"
+#include "qset.h"
+#include "qstyle.h"
 
 #ifndef QT_NO_DATETIMEEDIT
 
diff --git a/src/gui/widgets/qdial.cpp b/src/gui/widgets/qdial.cpp
index 56cea4576..f69499417 100644
--- a/src/gui/widgets/qdial.cpp
+++ b/src/gui/widgets/qdial.cpp
@@ -43,23 +43,23 @@
 
 #ifndef QT_NO_DIAL
 
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qpolygon.h>
-#include <qregion.h>
-#include <qstyle.h>
-#include <qstylepainter.h>
-#include <qstyleoption.h>
-#include <qslider.h>
+#include "qapplication.h"
+#include "qbitmap.h"
+#include "qcolor.h"
+#include "qevent.h"
+#include "qpainter.h"
+#include "qpolygon.h"
+#include "qregion.h"
+#include "qstyle.h"
+#include "qstylepainter.h"
+#include "qstyleoption.h"
+#include "qslider.h"
 #include <qabstractslider_p.h>
 #include <qmath_p.h>
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
 #endif
-#include <qmath.h>
+#include "qmath.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qdockarealayout.cpp b/src/gui/widgets/qdockarealayout.cpp
index 286ca88f0..bbde971b3 100644
--- a/src/gui/widgets/qdockarealayout.cpp
+++ b/src/gui/widgets/qdockarealayout.cpp
@@ -54,8 +54,8 @@
 #include <qlayoutengine_p.h>
 #include <qguicommon_p.h>
 
-#include <qpainter.h>
-#include <qstyleoption.h>
+#include "qpainter.h"
+#include "qstyleoption.h"
 
 #ifndef QT_NO_DOCKWIDGET
 
diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index 8e154eb8c..88beaca9e 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -42,16 +42,16 @@
 #include "qdockwidget.h"
 
 #ifndef QT_NO_DOCKWIDGET
-#include <qaction.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-#include <qevent.h>
-#include <qfontmetrics.h>
-#include <qmainwindow.h>
-#include <qrubberband.h>
-#include <qstylepainter.h>
-#include <qtoolbutton.h>
-#include <qdebug.h>
+#include "qaction.h"
+#include "qapplication.h"
+#include "qdesktopwidget.h"
+#include "qevent.h"
+#include "qfontmetrics.h"
+#include "qmainwindow.h"
+#include "qrubberband.h"
+#include "qstylepainter.h"
+#include "qtoolbutton.h"
+#include "qdebug.h"
 
 #include <qwidgetresizehandler_p.h>
 
diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index 0a3325f98..4fe260f52 100644
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -43,14 +43,14 @@
 
 #ifndef QT_NO_FONTCOMBOBOX
 
-#include <qstringlistmodel.h>
-#include <qitemdelegate.h>
-#include <qlistview.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qapplication.h>
+#include "qstringlistmodel.h"
+#include "qitemdelegate.h"
+#include "qlistview.h"
+#include "qpainter.h"
+#include "qevent.h"
+#include "qapplication.h"
 #include <qcombobox_p.h>
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index 5b7b67b41..4f7c8ccb4 100644
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -48,14 +48,14 @@
 #include <limits.h>
 #include "qaction.h"
 #include "qclipboard.h"
-#include <qdebug.h>
-#include <qurl.h>
+#include "qdebug.h"
+#include "qurl.h"
 #include "qlabel_p.h"
 #include "qstylesheetstyle_p.h"
-#include <qmath.h>
+#include "qmath.h"
 
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
+#include "qaccessible.h"
 #endif
 
 
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 265f16fa6..b80ab7f76 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -48,13 +48,13 @@
 
 #include "qdockwidget.h"
 #include "qtoolbar.h"
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qstatusbar.h>
-#include <qevent.h>
-#include <qstyle.h>
-#include <qdebug.h>
-#include <qpainter.h>
+#include "qapplication.h"
+#include "qmenubar.h"
+#include "qstatusbar.h"
+#include "qevent.h"
+#include "qstyle.h"
+#include "qdebug.h"
+#include "qpainter.h"
 #include <qwidget_p.h>
 #include "qtoolbar_p.h"
 #include "qwidgetanimator_p.h"
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp
index 79a4452b3..de627c5f4 100644
--- a/src/gui/widgets/qmainwindowlayout.cpp
+++ b/src/gui/widgets/qmainwindowlayout.cpp
@@ -52,14 +52,14 @@
 #include "qwidgetanimator_p.h"
 #include "qrubberband.h"
 #include "qtabbar_p.h"
-#include <qapplication.h>
-#include <qstatusbar.h>
-#include <qstring.h>
-#include <qstyle.h>
-#include <qstack.h>
-#include <qmap.h>
-#include <qtimer.h>
-#include <qdebug.h>
+#include "qapplication.h"
+#include "qstatusbar.h"
+#include "qstring.h"
+#include "qstyle.h"
+#include "qstack.h"
+#include "qmap.h"
+#include "qtimer.h"
+#include "qdebug.h"
 #include <qapplication_p.h>
 #include <qlayoutengine_p.h>
 #include <qguicommon_p.h>
diff --git a/src/gui/widgets/qmdiarea.cpp b/src/gui/widgets/qmdiarea.cpp
index 26c1b7287..81b771765 100644
--- a/src/gui/widgets/qmdiarea.cpp
+++ b/src/gui/widgets/qmdiarea.cpp
@@ -164,14 +164,14 @@
 #include <QStyle>
 #include <QEvent>
 #include <QScrollBar>
-#include <qalgorithms.h>
+#include "qalgorithms.h"
 #include <QList>
 #include <QPainter>
 #include <QFontMetrics>
 #include <QStyleOption>
 #include <QDesktopWidget>
 #include <QDebug>
-#include <qmath.h>
+#include "qmath.h"
 #include <qlayoutengine_p.h>
 #include <qguicommon_p.h>
 
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 4d5596636..99837aa9e 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -68,7 +68,7 @@
 #endif
 
 #ifndef QT_NO_WHATSTHIS
-# include <qwhatsthis.h>
+# include "qwhatsthis.h"
 #endif
 
 
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 5d8aa563e..02102bd30 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#include <qmenubar.h>
+#include "qmenubar.h"
 
-#include <qstyle.h>
-#include <qlayout.h>
-#include <qapplication.h>
-#include <qdesktopwidget.h>
+#include "qstyle.h"
+#include "qlayout.h"
+#include "qapplication.h"
+#include "qdesktopwidget.h"
 #ifndef QT_NO_ACCESSIBILITY
-# include <qaccessible.h>
+# include "qaccessible.h"
 #endif
-#include <qpainter.h>
-#include <qstylepainter.h>
-#include <qevent.h>
-#include <qmainwindow.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qwhatsthis.h>
+#include "qpainter.h"
+#include "qstylepainter.h"
+#include "qevent.h"
+#include "qmainwindow.h"
+#include "qtoolbar.h"
+#include "qtoolbutton.h"
+#include "qwhatsthis.h"
 #ifdef Q_WS_X11
-#include <qpluginloader.h>
+#include "qpluginloader.h"
 #endif
 
 #ifndef QT_NO_MENUBAR
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index eebe292cf..656423ea3 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -40,18 +40,16 @@
 ****************************************************************************/
 
 #include "qplaintextedit_p.h"
-
-
-#include <qfont.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qdebug.h>
-#include <qmimedata.h>
-#include <qdrag.h>
-#include <qclipboard.h>
-#include <qmenu.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include "qfont.h"
+#include "qpainter.h"
+#include "qevent.h"
+#include "qdebug.h"
+#include "qmimedata.h"
+#include "qdrag.h"
+#include "qclipboard.h"
+#include "qmenu.h"
+#include "qstyle.h"
+#include "qtimer.h"
 #include "qtextdocumentlayout_p.h"
 #include "qabstracttextdocumentlayout_p.h"
 #include "qtextdocument.h"
@@ -59,13 +57,13 @@
 #include "qtextlist.h"
 #include "qtextcontrol_p.h"
 #include "qaccessible.h"
+#include "qtextformat.h"
+#include "qdatetime.h"
+#include "qapplication.h"
+#include "qtexttable.h"
+#include "qvariant.h"
 
-#include <qtextformat.h>
-#include <qdatetime.h>
-#include <qapplication.h>
 #include <limits.h>
-#include <qtexttable.h>
-#include <qvariant.h>
 
 #ifndef QT_NO_TEXTEDIT
 
diff --git a/src/gui/widgets/qprogressbar.cpp b/src/gui/widgets/qprogressbar.cpp
index a1f9c3a02..70f9ee944 100644
--- a/src/gui/widgets/qprogressbar.cpp
+++ b/src/gui/widgets/qprogressbar.cpp
@@ -41,13 +41,13 @@
 
 #include "qprogressbar.h"
 #ifndef QT_NO_PROGRESSBAR
-#include <qevent.h>
-#include <qpainter.h>
-#include <qstylepainter.h>
-#include <qstyleoption.h>
+#include "qevent.h"
+#include "qpainter.h"
+#include "qstylepainter.h"
+#include "qstyleoption.h"
 #include <qwidget_p.h>
 #ifndef QT_NO_ACCESSIBILITY
-#include <qaccessible.h>
+#include "qaccessible.h"
 #endif
 #include <limits.h>
 
diff --git a/src/gui/widgets/qspinbox.cpp b/src/gui/widgets/qspinbox.cpp
index e1038ccf8..e438e2849 100644
--- a/src/gui/widgets/qspinbox.cpp
+++ b/src/gui/widgets/qspinbox.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include <qabstractspinbox_p.h>
-#include <qspinbox.h>
+#include "qspinbox.h"
 
 #ifndef QT_NO_SPINBOX
 
-#include <qlineedit.h>
-#include <qlocale.h>
-#include <qvalidator.h>
-#include <qdebug.h>
+#include "qlineedit.h"
+#include "qlocale.h"
+#include "qvalidator.h"
+#include "qdebug.h"
 
 #include <math.h>
 #include <float.h>
diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp
index 16b576ed6..1ebeb4934 100644
--- a/src/gui/widgets/qstackedwidget.cpp
+++ b/src/gui/widgets/qstackedwidget.cpp
@@ -43,8 +43,8 @@
 
 #ifndef QT_NO_STACKEDWIDGET
 
-#include <qstackedlayout.h>
-#include <qevent.h>
+#include "qstackedlayout.h"
+#include "qevent.h"
 #include <qframe_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/widgets/qtabbar_p.h b/src/gui/widgets/qtabbar_p.h
index 8fdd38e97..1b45f9add 100644
--- a/src/gui/widgets/qtabbar_p.h
+++ b/src/gui/widgets/qtabbar_p.h
@@ -48,16 +48,16 @@
 #include "qtabbar.h"
 #include "qwidget_p.h"
 
-#include <qicon.h>
-#include <qtoolbutton.h>
-#include <qdebug.h>
-#include <qvariantanimation.h>
+#include "qicon.h"
+#include "qtoolbutton.h"
+#include "qdebug.h"
+#include "qvariantanimation.h"
 
 #ifndef QT_NO_TABBAR
 
 #define ANIMATION_DURATION 250
 
-#include <qstyleoption.h>
+#include "qstyleoption.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qtextbrowser.cpp b/src/gui/widgets/qtextbrowser.cpp
index e3ea3ba18..d2b67f404 100644
--- a/src/gui/widgets/qtextbrowser.cpp
+++ b/src/gui/widgets/qtextbrowser.cpp
@@ -44,19 +44,19 @@
 
 #ifndef QT_NO_TEXTBROWSER
 
-#include <qstack.h>
-#include <qapplication.h>
-#include <qevent.h>
-#include <qdesktopwidget.h>
-#include <qdebug.h>
-#include <qabstracttextdocumentlayout.h>
+#include "qstack.h"
+#include "qapplication.h"
+#include "qevent.h"
+#include "qdesktopwidget.h"
+#include "qdebug.h"
+#include "qabstracttextdocumentlayout.h"
 #include "qtextdocumentlayout_p.h"
-#include <qtextcodec.h>
-#include <qpainter.h>
-#include <qdir.h>
-#include <qwhatsthis.h>
-#include <qtextobject.h>
-#include <qdesktopservices.h>
+#include "qtextcodec.h"
+#include "qpainter.h"
+#include "qdir.h"
+#include "qwhatsthis.h"
+#include "qtextobject.h"
+#include "qdesktopservices.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index 9766903df..9b6017c5a 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -44,27 +44,27 @@
 #include "qtextbrowser.h"
 
 #ifndef QT_NO_TEXTEDIT
-#include <qfont.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qdebug.h>
-#include <qmimedata.h>
-#include <qdrag.h>
-#include <qclipboard.h>
-#include <qmenu.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include "qfont.h"
+#include "qpainter.h"
+#include "qevent.h"
+#include "qdebug.h"
+#include "qmimedata.h"
+#include "qdrag.h"
+#include "qclipboard.h"
+#include "qmenu.h"
+#include "qstyle.h"
+#include "qtimer.h"
 #include "qtextdocumentlayout_p.h"
 #include "qtextdocument.h"
 #include "qtextdocument_p.h"
 #include "qtextlist.h"
 #include "qtextcontrol_p.h"
-#include <qtextformat.h>
-#include <qdatetime.h>
-#include <qapplication.h>
+#include "qtextformat.h"
+#include "qdatetime.h"
+#include "qapplication.h"
 #include <limits.h>
-#include <qtexttable.h>
-#include <qvariant.h>
+#include "qtexttable.h"
+#include "qvariant.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/widgets/qtoolbar.cpp b/src/gui/widgets/qtoolbar.cpp
index a21095364..607cbab26 100644
--- a/src/gui/widgets/qtoolbar.cpp
+++ b/src/gui/widgets/qtoolbar.cpp
@@ -43,19 +43,19 @@
 
 #ifndef QT_NO_TOOLBAR
 
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qevent.h>
-#include <qlayout.h>
-#include <qmainwindow.h>
-#include <qmenu.h>
-#include <qmenubar.h>
-#include <qrubberband.h>
-#include <qsignalmapper.h>
-#include <qstylepainter.h>
-#include <qtoolbutton.h>
-#include <qwidgetaction.h>
-#include <qtimer.h>
+#include "qapplication.h"
+#include "qcombobox.h"
+#include "qevent.h"
+#include "qlayout.h"
+#include "qmainwindow.h"
+#include "qmenu.h"
+#include "qmenubar.h"
+#include "qrubberband.h"
+#include "qsignalmapper.h"
+#include "qstylepainter.h"
+#include "qtoolbutton.h"
+#include "qwidgetaction.h"
+#include "qtimer.h"
 #include <qwidgetaction_p.h>
 #include <qmainwindowlayout_p.h>
 
diff --git a/src/gui/widgets/qtoolbararealayout.cpp b/src/gui/widgets/qtoolbararealayout.cpp
index e345301e4..d4eebb433 100644
--- a/src/gui/widgets/qtoolbararealayout.cpp
+++ b/src/gui/widgets/qtoolbararealayout.cpp
@@ -43,7 +43,7 @@
 #include <QToolBar>
 #include <QStyleOption>
 #include <QApplication>
-#include <qdebug.h>
+#include "qdebug.h"
 
 #include "qtoolbararealayout_p.h"
 #include "qmainwindowlayout_p.h"
diff --git a/src/gui/widgets/qtoolbarextension.cpp b/src/gui/widgets/qtoolbarextension.cpp
index 342bb9ede..c615598d6 100644
--- a/src/gui/widgets/qtoolbarextension.cpp
+++ b/src/gui/widgets/qtoolbarextension.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include "qtoolbarextension_p.h"
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qstylepainter.h>
-#include <qstyleoption.h>
+#include "qpixmap.h"
+#include "qstyle.h"
+#include "qstylepainter.h"
+#include "qstyleoption.h"
 
 #ifndef QT_NO_TOOLBUTTON
 
diff --git a/src/gui/widgets/qtoolbarlayout.cpp b/src/gui/widgets/qtoolbarlayout.cpp
index dd45f4090..a13383893 100644
--- a/src/gui/widgets/qtoolbarlayout.cpp
+++ b/src/gui/widgets/qtoolbarlayout.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <qaction.h>
-#include <qwidgetaction.h>
-#include <qtoolbar.h>
-#include <qstyleoption.h>
-#include <qtoolbutton.h>
-#include <qmenu.h>
-#include <qdebug.h>
-#include <qmath.h>
+#include "qaction.h"
+#include "qwidgetaction.h"
+#include "qtoolbar.h"
+#include "qstyleoption.h"
+#include "qtoolbutton.h"
+#include "qmenu.h"
+#include "qdebug.h"
+#include "qmath.h"
 
 #include "qmainwindowlayout_p.h"
 #include "qtoolbarextension_p.h"
diff --git a/src/gui/widgets/qtoolbarseparator.cpp b/src/gui/widgets/qtoolbarseparator.cpp
index ad0d42ae5..8b869b48a 100644
--- a/src/gui/widgets/qtoolbarseparator.cpp
+++ b/src/gui/widgets/qtoolbarseparator.cpp
@@ -43,10 +43,10 @@
 
 #ifndef QT_NO_TOOLBAR
 
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qtoolbar.h>
-#include <qpainter.h>
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qtoolbar.h"
+#include "qpainter.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/widgets/qtoolbox.cpp b/src/gui/widgets/qtoolbox.cpp
index d17cf75fe..62624a69c 100644
--- a/src/gui/widgets/qtoolbox.cpp
+++ b/src/gui/widgets/qtoolbox.cpp
@@ -43,16 +43,16 @@
 
 #ifndef QT_NO_TOOLBOX
 
-#include <qapplication.h>
-#include <qeventloop.h>
-#include <qlayout.h>
-#include <qlist.h>
-#include <qpainter.h>
-#include <qscrollarea.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qtooltip.h>
-#include <qabstractbutton.h>
+#include "qapplication.h"
+#include "qeventloop.h"
+#include "qlayout.h"
+#include "qlist.h"
+#include "qpainter.h"
+#include "qscrollarea.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qtooltip.h"
+#include "qabstractbutton.h"
 
 #include "qframe_p.h"
 
diff --git a/src/gui/widgets/qtoolbutton.cpp b/src/gui/widgets/qtoolbutton.cpp
index a4d05d7ab..435e90e59 100644
--- a/src/gui/widgets/qtoolbutton.cpp
+++ b/src/gui/widgets/qtoolbutton.cpp
@@ -42,20 +42,20 @@
 #include "qtoolbutton.h"
 #ifndef QT_NO_TOOLBUTTON
 
-#include <qapplication.h>
-#include <qdesktopwidget.h>
-#include <qevent.h>
-#include <qicon.h>
-#include <qmenu.h>
-#include <qpainter.h>
-#include <qpointer.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qtooltip.h>
-#include <qmainwindow.h>
-#include <qtoolbar.h>
-#include <qvariant.h>
-#include <qstylepainter.h>
+#include "qapplication.h"
+#include "qdesktopwidget.h"
+#include "qevent.h"
+#include "qicon.h"
+#include "qmenu.h"
+#include "qpainter.h"
+#include "qpointer.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qtooltip.h"
+#include "qmainwindow.h"
+#include "qtoolbar.h"
+#include "qvariant.h"
+#include "qstylepainter.h"
 #include <qabstractbutton_p.h>
 #include <qaction_p.h>
 #include <qmenu_p.h>
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index 57ca56f16..025004d16 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 #include "qvalidator.h"
 #ifndef QT_NO_VALIDATOR
diff --git a/src/gui/widgets/qwidgetanimator_p.h b/src/gui/widgets/qwidgetanimator_p.h
index c8ef058a6..2f45bc950 100644
--- a/src/gui/widgets/qwidgetanimator_p.h
+++ b/src/gui/widgets/qwidgetanimator_p.h
@@ -45,8 +45,8 @@
 // We mean it.
 //
 
-#include <qobject.h>
-#include <qmap.h>
+#include "qobject.h"
+#include "qmap.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
index d16f3d19d..b34c15e2c 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
@@ -43,7 +43,7 @@
 #include "qdeclarativefolderlistmodel.h"
 #include <QDirModel>
 #include <QDebug>
-#include <qdeclarativecontext.h>
+#include "qdeclarativecontext.h"
 
 #ifndef QT_NO_DIRMODEL
 
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
index 38f0e820e..4e570e882 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
@@ -34,7 +34,7 @@
 #ifndef QDECLARATIVEFOLDERLISTMODEL_H
 #define QDECLARATIVEFOLDERLISTMODEL_H
 
-#include <qdeclarative.h>
+#include "qdeclarative.h"
 #include <QStringList>
 #include <QUrl>
 #include <QAbstractItemModel>
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index a4ff83bba..03f81ae93 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -41,9 +41,9 @@
 
 #include "qdeclarativegesturearea_p.h"
 
-#include <qdeclarativeexpression.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeexpression.h"
+#include "qdeclarativecontext.h"
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeitem_p.h>
 
diff --git a/src/imports/gestures/qdeclarativegesturearea_p.h b/src/imports/gestures/qdeclarativegesturearea_p.h
index 18d70acfa..9aa326113 100644
--- a/src/imports/gestures/qdeclarativegesturearea_p.h
+++ b/src/imports/gestures/qdeclarativegesturearea_p.h
@@ -34,8 +34,8 @@
 #ifndef QDECLARATIVEGESTUREAREA_H
 #define QDECLARATIVEGESTUREAREA_H
 
-#include <qdeclarativeitem.h>
-#include <qdeclarativescriptstring.h>
+#include "qdeclarativeitem.h"
+#include "qdeclarativescriptstring.h"
 #include <qdeclarativecustomparser_p.h>
 
 #include <QtCore/qobject.h>
diff --git a/src/imports/particles/qdeclarativeparticles.cpp b/src/imports/particles/qdeclarativeparticles.cpp
index d3c9d1aa3..1eb55adcc 100644
--- a/src/imports/particles/qdeclarativeparticles.cpp
+++ b/src/imports/particles/qdeclarativeparticles.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativeparticles_p.h"
 
-#include <qdeclarativeinfo.h>
+#include "qdeclarativeinfo.h"
 #include <qdeclarativeitem_p.h>
 
 #include <qdeclarativepixmapcache_p.h>
diff --git a/src/network/access/qabstractnetworkcache.cpp b/src/network/access/qabstractnetworkcache.cpp
index f92c9d5e3..0ee2b70db 100644
--- a/src/network/access/qabstractnetworkcache.cpp
+++ b/src/network/access/qabstractnetworkcache.cpp
@@ -42,10 +42,10 @@
 #include "qabstractnetworkcache.h"
 #include "qabstractnetworkcache_p.h"
 
-#include <qdatetime.h>
-#include <qurl.h>
+#include "qdatetime.h"
+#include "qurl.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index e56154d7e..180e17246 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -46,14 +46,14 @@
 #include <qnetworkrequest_p.h>
 #include <qobject_p.h>
 #include <qauthenticator_p.h>
-#include <qnetworkproxy.h>
-#include <qauthenticator.h>
-#include <qcoreapplication.h>
+#include "qnetworkproxy.h"
+#include "qauthenticator.h"
+#include "qcoreapplication.h"
 
-#include <qbuffer.h>
-#include <qpair.h>
-#include <qhttp.h>
-#include <qdebug.h>
+#include "qbuffer.h"
+#include "qpair.h"
+#include "qhttp.h"
+#include "qdebug.h"
 
 #ifndef QT_NO_HTTP
 
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index d780e99b0..e81f25276 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -52,9 +52,9 @@
 #include <QtNetwork/qsslerror.h>
 
 #include <qobject_p.h>
-#include <qauthenticator.h>
-#include <qnetworkproxy.h>
-#include <qbuffer.h>
+#include "qauthenticator.h"
+#include "qnetworkproxy.h"
+#include "qbuffer.h"
 
 #include <qhttpnetworkheader_p.h>
 #include <qhttpnetworkrequest_p.h>
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 87b39945f..e8bbbe4c9 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -45,8 +45,8 @@
 #include <QtNetwork/qsslkey.h>
 #include <QtNetwork/qsslcipher.h>
 #include <QtNetwork/qsslconfiguration.h>
-#include <qpair.h>
-#include <qdebug.h>
+#include "qpair.h"
+#include "qdebug.h"
 
 #ifndef QT_NO_HTTP
 
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 91eb5fbf9..8e2e373ea 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -51,9 +51,9 @@
 #include <QtNetwork/qsslerror.h>
 
 #include <qobject_p.h>
-#include <qauthenticator.h>
-#include <qnetworkproxy.h>
-#include <qbuffer.h>
+#include "qauthenticator.h"
+#include "qnetworkproxy.h"
+#include "qbuffer.h"
 
 #include <qhttpnetworkheader_p.h>
 #include <qhttpnetworkrequest_p.h>
diff --git a/src/network/access/qhttpnetworkheader_p.h b/src/network/access/qhttpnetworkheader_p.h
index 2ee02b138..82197b3ca 100644
--- a/src/network/access/qhttpnetworkheader_p.h
+++ b/src/network/access/qhttpnetworkheader_p.h
@@ -46,8 +46,8 @@
 //
 #ifndef QT_NO_HTTP
 
-#include <qshareddata.h>
-#include <qurl.h>
+#include "qshareddata.h"
+#include "qurl.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index c6da71729..f3ff75abb 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -42,7 +42,7 @@
 #include "qhttpnetworkreply_p.h"
 #include "qhttpnetworkconnection_p.h"
 
-#include <qbytearraymatcher.h>
+#include "qbytearraymatcher.h"
 
 #ifndef QT_NO_HTTP
 
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 4e0ecd6a0..774047b85 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -66,7 +66,7 @@ static const unsigned char gz_magic[2] = {0x1f, 0x8b}; // gzip magic header
 
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkreply.h>
-#include <qbuffer.h>
+#include "qbuffer.h"
 
 #include <qobject_p.h>
 #include <qhttpnetworkheader_p.h>
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index eccf66c2e..1bbcc82c1 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -46,13 +46,13 @@
 #include "qnetworkdiskcache_p.h"
 #include "QtCore/qscopedpointer.h"
 
-#include <qfile.h>
-#include <qdir.h>
-#include <qdatetime.h>
-#include <qdiriterator.h>
-#include <qurl.h>
-#include <qcryptographichash.h>
-#include <qdebug.h>
+#include "qfile.h"
+#include "qdir.h"
+#include "qdatetime.h"
+#include "qdiriterator.h"
+#include "qurl.h"
+#include "qcryptographichash.h"
+#include "qdebug.h"
 
 #define CACHE_POSTFIX QLatin1String(".d")
 #define PREPARED_SLASH QLatin1String("prepared/")
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index 3bfe97845..97bb892ee 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -47,9 +47,9 @@
 
 #include "qabstractnetworkcache_p.h"
 
-#include <qbuffer.h>
-#include <qhash.h>
-#include <qtemporaryfile.h>
+#include "qbuffer.h"
+#include "qhash.h"
+#include "qtemporaryfile.h"
 
 #ifndef QT_NO_NETWORKDISKCACHE
 
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index c5725d36f..aeb7f6d50 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#include <qauthenticator.h>
+#include "qauthenticator.h"
 #include <qauthenticator_p.h>
-#include <qdebug.h>
-#include <qhash.h>
-#include <qbytearray.h>
-#include <qcryptographichash.h>
-#include <qhttp.h>
-#include <qiodevice.h>
-#include <qdatastream.h>
-#include <qendian.h>
-#include <qstring.h>
-#include <qdatetime.h>
+#include "qdebug.h"
+#include "qhash.h"
+#include "qbytearray.h"
+#include "qcryptographichash.h"
+#include "qhttp.h"
+#include "qiodevice.h"
+#include "qdatastream.h"
+#include "qendian.h"
+#include "qstring.h"
+#include "qdatetime.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/kernel/qauthenticator_p.h b/src/network/kernel/qauthenticator_p.h
index 9ba19917a..6327d33ad 100644
--- a/src/network/kernel/qauthenticator_p.h
+++ b/src/network/kernel/qauthenticator_p.h
@@ -45,11 +45,11 @@
 // We mean it.
 //
 
-#include <qhash.h>
-#include <qbytearray.h>
-#include <qstring.h>
-#include <qauthenticator.h>
-#include <qvariant.h>
+#include "qhash.h"
+#include "qbytearray.h"
+#include "qstring.h"
+#include "qauthenticator.h"
+#include "qvariant.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index 1dd8fc7c2..b1f888ada 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -47,7 +47,7 @@
 #include "qendian.h"
 #include "qnativesocketengine_p.h"
 #ifndef QT_NO_DATASTREAM
-#include <qdatastream.h>
+#include "qdatastream.h"
 #endif
 
 #ifdef QT_LINUXBASE
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index bc820b312..c83cc632e 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -43,12 +43,12 @@
 #include "qhostinfo_p.h"
 
 #include "QtCore/qscopedpointer.h"
-#include <qabstracteventdispatcher.h>
-#include <qcoreapplication.h>
-#include <qmetaobject.h>
-#include <qstringlist.h>
-#include <qthread.h>
-#include <qurl.h>
+#include "qabstracteventdispatcher.h"
+#include "qcoreapplication.h"
+#include "qmetaobject.h"
+#include "qstringlist.h"
+#include "qthread.h"
+#include "qurl.h"
 #include <qnetworksession_p.h>
 
 #ifdef Q_OS_UNIX
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 5829fa5da..c4050bfa2 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -46,9 +46,9 @@
 #include "qhostinfo_p.h"
 #include "qnativesocketengine_p.h"
 #include "qiodevice.h"
-#include <qbytearray.h>
-#include <qurl.h>
-#include <qfile.h>
+#include "qbytearray.h"
+#include "qurl.h"
+#include "qfile.h"
 #include <qnet_unix_p.h>
 
 #include <sys/types.h>
@@ -62,7 +62,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined (QT_NO_GETADDRINFO)
-#include <qmutex.h>
+#include "qmutex.h"
 Q_GLOBAL_STATIC(QMutex, getHostByNameMutex)
 #endif
 
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 22444e582..4e93c670f 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -370,21 +370,21 @@
 #include "qabstractsocket_p.h"
 #include "qhostinfo_p.h"
 #include "qnetworksession_p.h"
-#include <qabstracteventdispatcher.h>
-#include <qhostaddress.h>
-#include <qhostinfo.h>
-#include <qmetaobject.h>
-#include <qpointer.h>
-#include <qtimer.h>
-#include <qelapsedtimer.h>
-#include <qscopedvaluerollback.h>
-#include <qsslsocket.h>
+#include "qabstracteventdispatcher.h"
+#include "qhostaddress.h"
+#include "qhostinfo.h"
+#include "qmetaobject.h"
+#include "qpointer.h"
+#include "qtimer.h"
+#include "qelapsedtimer.h"
+#include "qscopedvaluerollback.h"
+#include "qsslsocket.h"
 #include <qthread_p.h>
 #include <qcore_unix_p.h>
 #include "qnetworkcommon_p.h"
 
 #ifdef QABSTRACTSOCKET_DEBUG
-#include <qdebug.h>
+#include "qdebug.h"
 #endif
 
 #include <time.h>
@@ -404,7 +404,7 @@ QT_BEGIN_NAMESPACE
 
 #if defined QABSTRACTSOCKET_DEBUG
 QT_BEGIN_INCLUDE_NAMESPACE
-#include <qstring.h>
+#include "qstring.h"
 #include <ctype.h>
 QT_END_INCLUDE_NAMESPACE
 
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index daf88d147..89df4c992 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -50,7 +50,7 @@
 #include "qnetworkcommon_p.h"
 
 #if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP)
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/socket/qlocalserver_p.h b/src/network/socket/qlocalserver_p.h
index 2d5e823bb..38005a8a3 100644
--- a/src/network/socket/qlocalserver_p.h
+++ b/src/network/socket/qlocalserver_p.h
@@ -49,9 +49,9 @@
 
 #include "qlocalserver.h"
 #include "qobject_p.h"
-#include <qqueue.h>
+#include "qqueue.h"
 #include <qabstractsocketengine_p.h>
-#include <qsocketnotifier.h>
+#include "qsocketnotifier.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index 7326efa8e..150a2d120 100644
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -44,9 +44,9 @@
 #include "qlocalsocket.h"
 #include "qlocalsocket_p.h"
 
-#include <qhostaddress.h>
-#include <qsettings.h>
-#include <qdebug.h>
+#include "qhostaddress.h"
+#include "qsettings.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp
index e2871da96..417687672 100644
--- a/src/network/socket/qlocalserver_unix.cpp
+++ b/src/network/socket/qlocalserver_unix.cpp
@@ -50,9 +50,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <qdebug.h>
-#include <qdir.h>
-#include <qdatetime.h>
+#include "qdebug.h"
+#include "qdir.h"
+#include "qdatetime.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h
index e0eb30b86..ee0aeb37f 100644
--- a/src/network/socket/qlocalsocket_p.h
+++ b/src/network/socket/qlocalsocket_p.h
@@ -49,10 +49,10 @@
 
 #include "qlocalsocket.h"
 #include "qiodevice_p.h"
-#include <qtimer.h>
+#include "qtimer.h"
 #include "qabstractsocketengine_p.h"
-#include <qtcpsocket.h>
-#include <qsocketnotifier.h>
+#include "qtcpsocket.h"
+#include "qsocketnotifier.h"
 
 #include <errno.h>
 
diff --git a/src/network/socket/qlocalsocket_tcp.cpp b/src/network/socket/qlocalsocket_tcp.cpp
index ebe9597d5..693d38f63 100644
--- a/src/network/socket/qlocalsocket_tcp.cpp
+++ b/src/network/socket/qlocalsocket_tcp.cpp
@@ -43,9 +43,9 @@
 #include "qlocalsocket_p.h"
 #include "qlocalserver.h"
 
-#include <qhostaddress.h>
-#include <qsettings.h>
-#include <qdebug.h>
+#include "qhostaddress.h"
+#include "qsettings.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 064d6c63f..14f943d48 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -52,9 +52,9 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <qdir.h>
-#include <qdebug.h>
-#include <qelapsedtimer.h>
+#include "qdir.h"
+#include "qdebug.h"
+#include "qelapsedtimer.h"
 
 #define QT_CONNECT_TIMEOUT 30000
 
diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp
index 40a396b8c..64e0ef802 100644
--- a/src/network/socket/qnativesocketengine.cpp
+++ b/src/network/socket/qnativesocketengine.cpp
@@ -96,9 +96,9 @@
     errorString() can be called to determine the cause of the error.
 */
 
-#include <qabstracteventdispatcher.h>
-#include <qsocketnotifier.h>
-#include <qnetworkinterface.h>
+#include "qabstracteventdispatcher.h"
+#include "qsocketnotifier.h"
+#include "qnetworkinterface.h"
 
 #include "qnativesocketengine_p.h"
 #include <qthread_p.h>
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 81d52d7d9..51eae83bf 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -61,7 +61,7 @@
 #endif
 
 #if defined QNATIVESOCKETENGINE_DEBUG
-#include <qstring.h>
+#include "qstring.h"
 #include <ctype.h>
 #endif
 
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index bbb803052..0a0b2d66b 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -41,20 +41,20 @@
 
 #include "complexwidgets.h"
 
-#include <qapplication.h>
-#include <qabstractbutton.h>
-#include <qevent.h>
-#include <qheaderview.h>
-#include <qtabbar.h>
-#include <qcombobox.h>
-#include <qlistview.h>
-#include <qtableview.h>
-#include <qlineedit.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qtreeview.h>
+#include "qapplication.h"
+#include "qabstractbutton.h"
+#include "qevent.h"
+#include "qheaderview.h"
+#include "qtabbar.h"
+#include "qcombobox.h"
+#include "qlistview.h"
+#include "qtableview.h"
+#include "qlineedit.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qtooltip.h"
+#include "qwhatsthis.h"
+#include "qtreeview.h"
 #include <qtabbar_p.h>
 #include <QAbstractScrollArea>
 #include <QScrollArea>
diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp
index d4ea60cdf..c935ba234 100644
--- a/src/plugins/accessible/widgets/itemviews.cpp
+++ b/src/plugins/accessible/widgets/itemviews.cpp
@@ -41,12 +41,12 @@
 
 #include "itemviews.h"
 
-#include <qheaderview.h>
-#include <qtableview.h>
-#include <qlistview.h>
-#include <qtreeview.h>
+#include "qheaderview.h"
+#include "qtableview.h"
+#include "qlistview.h"
+#include "qtreeview.h"
 #include <qtreewidget_p.h>
-#include <qaccessible2.h>
+#include "qaccessible2.h"
 #include <QDebug>
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp
index 655f0652b..f921925da 100644
--- a/src/plugins/accessible/widgets/main.cpp
+++ b/src/plugins/accessible/widgets/main.cpp
@@ -46,13 +46,13 @@
 #include "complexwidgets.h"
 #include "itemviews.h"
 
-#include <qaccessibleplugin.h>
-#include <qplugin.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qtreeview.h>
-#include <qvariant.h>
-#include <qaccessible.h>
+#include "qaccessibleplugin.h"
+#include "qplugin.h"
+#include "qpushbutton.h"
+#include "qtoolbutton.h"
+#include "qtreeview.h"
+#include "qvariant.h"
+#include "qaccessible.h"
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 177d29192..32a6fde93 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -41,10 +41,10 @@
 
 #include "qaccessiblemenu.h"
 
-#include <qmenu.h>
-#include <qmenubar.h>
-#include <QtGui/QAction>
-#include <qstyle.h>
+#include "qmenu.h"
+#include "qmenubar.h"
+#include "qaction.h"
+#include "qstyle.h"
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/plugins/accessible/widgets/rangecontrols.cpp b/src/plugins/accessible/widgets/rangecontrols.cpp
index 251088b67..7002392f4 100644
--- a/src/plugins/accessible/widgets/rangecontrols.cpp
+++ b/src/plugins/accessible/widgets/rangecontrols.cpp
@@ -41,17 +41,17 @@
 
 #include "rangecontrols.h"
 
-#include <qslider.h>
-#include <qdial.h>
-#include <qspinbox.h>
-#include <qscrollbar.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
-#include <qdebug.h>
-#include <qglobal.h>
+#include "qslider.h"
+#include "qdial.h"
+#include "qspinbox.h"
+#include "qscrollbar.h"
+#include "qstyle.h"
+#include "qstyleoption.h"
+#include "qdebug.h"
+#include "qglobal.h"
 #include <QDoubleSpinBox>
 #include <QDial>
-#include <qmath.h>
+#include "qmath.h"
 #include <qmath_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 0883f5082..aea17e317 100644
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -41,21 +41,21 @@
 
 #include "simplewidgets.h"
 
-#include <qabstractbutton.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qprogressbar.h>
-#include <qstatusbar.h>
-#include <qradiobutton.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qlcdnumber.h>
-#include <qtextdocument.h>
-#include <qlineedit.h>
+#include "qabstractbutton.h"
+#include "qcheckbox.h"
+#include "qpushbutton.h"
+#include "qprogressbar.h"
+#include "qstatusbar.h"
+#include "qradiobutton.h"
+#include "qtoolbutton.h"
+#include "qlabel.h"
+#include "qgroupbox.h"
+#include "qlcdnumber.h"
+#include "qtextdocument.h"
+#include "qlineedit.h"
 #include <qlineedit_p.h>
-#include <qstyle.h>
-#include <qstyleoption.h>
+#include "qstyle.h"
+#include "qstyleoption.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/iconengines/svgiconengine/svgiconplugin.cpp b/src/plugins/iconengines/svgiconengine/svgiconplugin.cpp
index 331dee32b..9b8e1c21b 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconplugin.cpp
+++ b/src/plugins/iconengines/svgiconengine/svgiconplugin.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include <qiconengineplugin.h>
-#include <qstringlist.h>
+#include "qiconengineplugin.h"
+#include "qstringlist.h"
 
 #if !defined(QT_NO_IMAGEFORMATPLUGIN) && !defined(QT_NO_SVG)
 
 #include "qsvgiconengine.h"
 
-#include <qiodevice.h>
-#include <qbytearray.h>
-#include <qdebug.h>
+#include "qiodevice.h"
+#include "qbytearray.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/imageformats/gif/qgifplugin.cpp b/src/plugins/imageformats/gif/qgifplugin.cpp
index e9c933ba6..1147c152e 100644
--- a/src/plugins/imageformats/gif/qgifplugin.cpp
+++ b/src/plugins/imageformats/gif/qgifplugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qstringlist.h>
+#include "qimageiohandler.h"
+#include "qstringlist.h"
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index c28402035..e62acf202 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -53,7 +53,7 @@
 #include <QtGui/QImage>
 #include <QtCore/QFile>
 #include <QtCore/QBuffer>
-#include <qvariant.h>
+#include "qvariant.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/imageformats/ico/qicoplugin.cpp b/src/plugins/imageformats/ico/qicoplugin.cpp
index 411211c72..475d0d77c 100644
--- a/src/plugins/imageformats/ico/qicoplugin.cpp
+++ b/src/plugins/imageformats/ico/qicoplugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qdebug.h>
+#include "qimageiohandler.h"
+#include "qdebug.h"
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff --git a/src/plugins/imageformats/jpeg/qjpegplugin.cpp b/src/plugins/imageformats/jpeg/qjpegplugin.cpp
index 1f01402c8..c72af2d88 100644
--- a/src/plugins/imageformats/jpeg/qjpegplugin.cpp
+++ b/src/plugins/imageformats/jpeg/qjpegplugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qstringlist.h>
+#include "qimageiohandler.h"
+#include "qstringlist.h"
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff --git a/src/plugins/imageformats/mng/qmngplugin.cpp b/src/plugins/imageformats/mng/qmngplugin.cpp
index 99cea9ea4..c1f49b9d4 100644
--- a/src/plugins/imageformats/mng/qmngplugin.cpp
+++ b/src/plugins/imageformats/mng/qmngplugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qstringlist.h>
+#include "qimageiohandler.h"
+#include "qstringlist.h"
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
@@ -49,8 +49,8 @@
 #endif
 #include <qmnghandler_p.h>
 
-#include <qiodevice.h>
-#include <qbytearray.h>
+#include "qiodevice.h"
+#include "qbytearray.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/imageformats/svg/qsvgplugin.cpp b/src/plugins/imageformats/svg/qsvgplugin.cpp
index 393da7f52..0238df4b5 100644
--- a/src/plugins/imageformats/svg/qsvgplugin.cpp
+++ b/src/plugins/imageformats/svg/qsvgplugin.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qstringlist.h>
+#include "qimageiohandler.h"
+#include "qstringlist.h"
 
 #if !defined(QT_NO_IMAGEFORMATPLUGIN) && !defined(QT_NO_SVGRENDERER)
 
 #include "qsvgiohandler.h"
 
-#include <qiodevice.h>
-#include <qbytearray.h>
-#include <qdebug.h>
+#include "qiodevice.h"
+#include "qbytearray.h"
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/imageformats/tiff/qtiffplugin.cpp b/src/plugins/imageformats/tiff/qtiffplugin.cpp
index 27ee70064..c6acaf58b 100644
--- a/src/plugins/imageformats/tiff/qtiffplugin.cpp
+++ b/src/plugins/imageformats/tiff/qtiffplugin.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qimageiohandler.h>
-#include <qdebug.h>
+#include "qimageiohandler.h"
+#include "qdebug.h"
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 
diff --git a/src/plugins/sqldrivers/mysql/mysqlmain.cpp b/src/plugins/sqldrivers/mysql/mysqlmain.cpp
index d30834c99..07044caf8 100644
--- a/src/plugins/sqldrivers/mysql/mysqlmain.cpp
+++ b/src/plugins/sqldrivers/mysql/mysqlmain.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
+#include "qsqldriverplugin.h"
+#include "qstringlist.h"
 #include "qsql_mysql.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index 648873caa..bd8e808bb 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -41,25 +41,22 @@
 
 #include "qsql_mysql.h"
 
-#include <qcoreapplication.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qsqlquery.h>
-#include <qsqlrecord.h>
-#include <qstringlist.h>
-#include <qtextcodec.h>
-#include <qvector.h>
+#include "qcoreapplication.h"
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qsqlerror.h"
+#include "qsqlfield.h"
+#include "qsqlindex.h"
+#include "qsqlquery.h"
+#include "qsqlrecord.h"
+#include "qstringlist.h"
+#include "qtextcodec.h"
+#include "qvector.h"
+#include "qdebug.h"
 
-#include <qdebug.h>
-
-#ifdef Q_OS_WIN32
-// comment the next line out if you want to use MySQL/embedded on Win32 systems.
-// note that it will crash if you don't statically link to the mysql/e library!
-# define Q_NO_MYSQL_EMBEDDED
-#endif
+// comment the next line out if you want to use MySQL/embedded.
+// note that it will crash if you don't link to the mysql/e library!
+// #define Q_NO_MYSQL_EMBEDDED
 
 Q_DECLARE_METATYPE(MYSQL_RES*)
 Q_DECLARE_METATYPE(MYSQL*)
diff --git a/src/plugins/sqldrivers/odbc/odbcmain.cpp b/src/plugins/sqldrivers/odbc/odbcmain.cpp
index 4a7e8c923..149873879 100644
--- a/src/plugins/sqldrivers/odbc/odbcmain.cpp
+++ b/src/plugins/sqldrivers/odbc/odbcmain.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
+#include "qsqldriverplugin.h"
+#include "qstringlist.h"
 #include "qsql_odbc.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
index 32aed4780..ad50f3aa8 100644
--- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
+++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp
@@ -40,20 +40,19 @@
 ****************************************************************************/
 
 #include "qsql_odbc.h"
-#include <qsqlrecord.h>
-
-#include <qcoreapplication.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qstringlist.h>
-#include <qvarlengtharray.h>
-#include <qvector.h>
-#include <qmath.h>
-#include <QDebug>
-#include <QSqlQuery>
+#include "qsqlrecord.h"
+#include "qcoreapplication.h"
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qsqlerror.h"
+#include "qsqlfield.h"
+#include "qsqlindex.h"
+#include "qstringlist.h"
+#include "qvarlengtharray.h"
+#include "qvector.h"
+#include "qmath.h"
+#include "qdebug.h"
+#include "qsqlquery.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sqldrivers/psql/psqlmain.cpp b/src/plugins/sqldrivers/psql/psqlmain.cpp
index 8db9cce6b..c74f7b1d9 100644
--- a/src/plugins/sqldrivers/psql/psqlmain.cpp
+++ b/src/plugins/sqldrivers/psql/psqlmain.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
+#include "qsqldriverplugin.h"
+#include "qstringlist.h"
 #include "qsql_psql.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 14a8224e2..150637208 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -41,18 +41,18 @@
 
 #include "qsql_psql.h"
 
-#include <qcoreapplication.h>
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qregexp.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qsqlrecord.h>
-#include <qsqlquery.h>
-#include <qsocketnotifier.h>
-#include <qstringlist.h>
-#include <qmutex.h>
+#include "qcoreapplication.h"
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qregexp.h"
+#include "qsqlerror.h"
+#include "qsqlfield.h"
+#include "qsqlindex.h"
+#include "qsqlrecord.h"
+#include "qsqlquery.h"
+#include "qsocketnotifier.h"
+#include "qstringlist.h"
+#include "qmutex.h"
 
 #include <libpq-fe.h>
 #include <pg_config.h>
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
index b921be3cd..83b8556fc 100644
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
@@ -40,19 +40,17 @@
 ****************************************************************************/
 
 #include "qsql_sqlite.h"
-
-#include <qcoreapplication.h>
-#include <qvariant.h>
-#include <qsqlerror.h>
-#include <qsqlfield.h>
-#include <qsqlindex.h>
-#include <qsqlquery.h>
-#include <qstringlist.h>
-#include <qvector.h>
-#include <qdebug.h>
+#include "qcoreapplication.h"
+#include "qvariant.h"
+#include "qsqlerror.h"
+#include "qsqlfield.h"
+#include "qsqlindex.h"
+#include "qsqlquery.h"
+#include "qstringlist.h"
+#include "qvector.h"
+#include "qdebug.h"
 
 #include <unistd.h>
-
 #include <sqlite3.h>
 
 Q_DECLARE_METATYPE(sqlite3*)
diff --git a/src/plugins/sqldrivers/sqlite/sqlitemain.cpp b/src/plugins/sqldrivers/sqlite/sqlitemain.cpp
index 1a42c0692..0cefd1123 100644
--- a/src/plugins/sqldrivers/sqlite/sqlitemain.cpp
+++ b/src/plugins/sqldrivers/sqlite/sqlitemain.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qsqldriverplugin.h>
-#include <qstringlist.h>
+#include "qsqldriverplugin.h"
+#include "qstringlist.h"
 #include "qsql_sqlite.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/scripttools/qscripttoolscommon_p.h b/src/scripttools/qscripttoolscommon_p.h
index 6cc77015a..561b43687 100644
--- a/src/scripttools/qscripttoolscommon_p.h
+++ b/src/scripttools/qscripttoolscommon_p.h
@@ -1,7 +1,7 @@
 #ifndef QSCRIPTTOOLSCOMMON_H
 #define QSCRIPTTOOLSCOMMON_H
 
-#include <qscriptcontextinfo.h>
+#include "qscriptcontextinfo.h"
 #include "qscriptscriptdata_p.h"
 #include "qscriptdebuggerconsolecommand_p.h"
 #include "qscriptdebuggerconsolecommandgroupdata_p.h"
diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index 0c686e67b..5821129fc 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -41,9 +41,9 @@
 
 #include "qsqlcachedresult_p.h"
 
-#include <qvariant.h>
-#include <qdatetime.h>
-#include <qvector.h>
+#include "qvariant.h"
+#include "qdatetime.h"
+#include "qvector.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index 7acc6fa80..1e798280c 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -41,9 +41,9 @@
 
 #include "qsqlquerymodel.h"
 
-#include <qdebug.h>
-#include <qsqldriver.h>
-#include <qsqlfield.h>
+#include "qdebug.h"
+#include "qsqldriver.h"
+#include "qsqlfield.h"
 
 #include "qsqlquerymodel_p.h"
 
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 527396367..6819af1a9 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -51,7 +51,7 @@
 
 #include "qsqltablemodel_p.h"
 
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/svg/qsvgstyle_p.h b/src/svg/qsvgstyle_p.h
index a01bbda9a..ccdb43893 100644
--- a/src/svg/qsvgstyle_p.h
+++ b/src/svg/qsvgstyle_p.h
@@ -54,7 +54,7 @@
 #include "QtGui/qmatrix.h"
 #include "QtGui/qcolor.h"
 #include "QtGui/qfont.h"
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/test/qabstracttestlogger_p.h b/src/test/qabstracttestlogger_p.h
index 9765be744..a383a100e 100644
--- a/src/test/qabstracttestlogger_p.h
+++ b/src/test/qabstracttestlogger_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/test/qbenchmarkevent.cpp b/src/test/qbenchmarkevent.cpp
index adb2294b7..9597d449c 100644
--- a/src/test/qbenchmarkevent.cpp
+++ b/src/test/qbenchmarkevent.cpp
@@ -42,7 +42,7 @@
 #include "QtTest/qbenchmarkevent_p.h"
 #include "QtTest/qbenchmark_p.h"
 #include "QtTest/qbenchmarkmetric_p.h"
-#include <qdebug.h>
+#include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/test/qsignaldumper_p.h b/src/test/qsignaldumper_p.h
index a19f3fb4f..ede445d31 100644
--- a/src/test/qsignaldumper_p.h
+++ b/src/test/qsignaldumper_p.h
@@ -45,7 +45,7 @@
 // We mean it.
 //
 
-#include <qglobal.h>
+#include "qglobal.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index e3e40a184..34980d4f2 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -41,8 +41,8 @@
 #include <stdio.h>
 
 #include <string.h>
-#include <qbytearray.h>
-#include <qlist.h>
+#include "qbytearray.h"
+#include "qlist.h"
 
 QT_USE_NAMESPACE
 
diff --git a/src/uitools/formbuilder.h b/src/uitools/formbuilder.h
index 1cb9e4ead..bae417ceb 100644
--- a/src/uitools/formbuilder.h
+++ b/src/uitools/formbuilder.h
@@ -34,7 +34,7 @@
 #ifndef FORMBUILDER_H
 #define FORMBUILDER_H
 
-#include <abstractformbuilder.h>
+#include "abstractformbuilder.h"
 
 #include <QtCore/QStringList>
 #include <QtCore/QMap>
diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index 2e2dce3e3..4b177a16c 100644
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -44,7 +44,7 @@
 #include "quiloader_p.h"
 #include "customwidget.h"
 
-#include <formbuilder.h>
+#include "formbuilder.h"
 #include <formbuilderextra_p.h>
 #include <textbuilder_p.h>
 #include <ui4_p.h>
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp
index 3454645ba..0384d5a83 100644
--- a/src/xml/dom/qdom.cpp
+++ b/src/xml/dom/qdom.cpp
@@ -40,25 +40,25 @@
 ****************************************************************************/
 
 #include <qplatformdefs.h>
-#include <qdom.h>
+#include "qdom.h"
 #include "qxmlutils_p.h"
 
 #ifndef QT_NO_DOM
 
-#include <qatomic.h>
-#include <qbuffer.h>
-#include <qhash.h>
-#include <qiodevice.h>
-#include <qlist.h>
-#include <qregexp.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qxml.h>
-#include <qvariant.h>
-#include <qmap.h>
-#include <qshareddata.h>
-#include <qdebug.h>
-#include <qscopedpointer.h>
+#include "qatomic.h"
+#include "qbuffer.h"
+#include "qhash.h"
+#include "qiodevice.h"
+#include "qlist.h"
+#include "qregexp.h"
+#include "qtextcodec.h"
+#include "qtextstream.h"
+#include "qxml.h"
+#include "qvariant.h"
+#include "qmap.h"
+#include "qshareddata.h"
+#include "qdebug.h"
+#include "qscopedpointer.h"
 
 #include <stdio.h>
 
diff --git a/src/xml/kernel/qxmlstream.cpp b/src/xml/kernel/qxmlstream.cpp
index 2b6f72eb3..6e63c72d0 100644
--- a/src/xml/kernel/qxmlstream.cpp
+++ b/src/xml/kernel/qxmlstream.cpp
@@ -44,15 +44,16 @@
 #ifndef QT_NO_XMLSTREAM
 
 #include "qxmlutils_p.h"
-#include <qdebug.h>
-#include <qfile.h>
-#include <stdio.h>
-#include <qtextcodec.h>
-#include <qstack.h>
-#include <qbuffer.h>
-#include <qcoreapplication.h>
+#include "qdebug.h"
+#include "qfile.h"
+#include "qtextcodec.h"
+#include "qstack.h"
+#include "qbuffer.h"
+#include "qcoreapplication.h"
 #include "qxmlcommon_p.h"
 
+#include <stdio.h>
+
 QT_BEGIN_NAMESPACE
 
 #include "qxmlstream_p.h"
diff --git a/src/xml/kernel/qxmlutils.cpp b/src/xml/kernel/qxmlutils.cpp
index 196136f56..a4907c682 100644
--- a/src/xml/kernel/qxmlutils.cpp
+++ b/src/xml/kernel/qxmlutils.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <qregexp.h>
-#include <qstring.h>
+#include "qregexp.h"
+#include "qstring.h"
 
 #include "qxmlutils_p.h"