diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 0f794f3a..26727b64 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -70,7 +70,7 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QWidget>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include "partadaptor.h"
 
 #include <memory>
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index b33485e0..3c8f92f5 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -42,10 +42,10 @@
 #include <KLocale>
 
 #include <QApplication>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QMenu>
-#include <QPaintEvent>
+
 #include <QPalette>
 #include <QScrollBar>
 
diff --git a/akregator/src/articlemodel.h b/akregator/src/articlemodel.h
index 7e770f5a..0757fb8d 100644
--- a/akregator/src/articlemodel.h
+++ b/akregator/src/articlemodel.h
@@ -24,7 +24,7 @@
 #ifndef AKREGATOR_ARTICLEMODEL_H
 #define AKREGATOR_ARTICLEMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QList>
 
 #include "akregator_export.h"
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index e524a5ab..c733bd2d 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -48,8 +48,8 @@
 //#include <qtl.h>
 
 #include <QDateTime>
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QHash>
 #include <QIcon>
 #include <QList>
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index c0cd8fe9..c7ff45ff 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -40,7 +40,7 @@
 #include <qdom.h>
 #include <QHash>
 #include <QSet>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <cassert>
 
diff --git a/akregator/src/importfeedlistcommand.cpp b/akregator/src/importfeedlistcommand.cpp
index efd155b2..19cdbf72 100644
--- a/akregator/src/importfeedlistcommand.cpp
+++ b/akregator/src/importfeedlistcommand.cpp
@@ -32,7 +32,7 @@
 #include <KInputDialog>
 #include <KLocalizedString>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QPointer>
 #include <QTimer>
 
diff --git a/akregator/src/loadfeedlistcommand.cpp b/akregator/src/loadfeedlistcommand.cpp
index c3bc24de..3085630d 100644
--- a/akregator/src/loadfeedlistcommand.cpp
+++ b/akregator/src/loadfeedlistcommand.cpp
@@ -32,7 +32,7 @@
 #include <KRandom>
 
 #include <QDateTime>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QPointer>
 #include <QString>
diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp
index 10781985..20451f08 100644
--- a/akregator/src/mainwidget.cpp
+++ b/akregator/src/mainwidget.cpp
@@ -79,7 +79,7 @@
 #include <QClipboard>
 #include <QSplitter>
 #include <QTextDocument>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QTimer>
 
 #include <algorithm>
diff --git a/ark/app/batchextract.cpp b/ark/app/batchextract.cpp
index 80cad218..9a7aa1cc 100644
--- a/ark/app/batchextract.cpp
+++ b/ark/app/batchextract.cpp
@@ -44,7 +44,7 @@
 #include <QDir>
 #include <QFileInfo>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 BatchExtract::BatchExtract(QObject* parent)
     : KCompositeJob(parent),
diff --git a/ark/app/mainwindow.cpp b/ark/app/mainwindow.cpp
index 1d8a1d1f..db1896e6 100644
--- a/ark/app/mainwindow.cpp
+++ b/ark/app/mainwindow.cpp
@@ -40,9 +40,9 @@
 #include <KShortcutsDialog>
 #include <KXMLGUIFactory>
 
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QWeakPointer>
+#include <QtGui/qevent.h>
+
+#include <QtCore/qsharedpointer.h>
 
 static bool isValidArchiveDrag(const QMimeData *data)
 {
diff --git a/ark/kerfuffle/addtoarchive.cpp b/ark/kerfuffle/addtoarchive.cpp
index b58f88af..fa30e279 100644
--- a/ark/kerfuffle/addtoarchive.cpp
+++ b/ark/kerfuffle/addtoarchive.cpp
@@ -41,7 +41,7 @@
 #include <QFileInfo>
 #include <QDir>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Kerfuffle
 {
diff --git a/ark/kerfuffle/archiveinterface.h b/ark/kerfuffle/archiveinterface.h
index 801318b7..b2b5629d 100644
--- a/ark/kerfuffle/archiveinterface.h
+++ b/ark/kerfuffle/archiveinterface.h
@@ -34,7 +34,7 @@
 #include <QObject>
 #include <QStringList>
 #include <QString>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace Kerfuffle
 {
diff --git a/ark/kerfuffle/queries.cpp b/ark/kerfuffle/queries.cpp
index 2067d0f0..16c4f651 100644
--- a/ark/kerfuffle/queries.cpp
+++ b/ark/kerfuffle/queries.cpp
@@ -33,7 +33,7 @@
 #include <kio/renamedialog.h>
 
 #include <QApplication>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Kerfuffle
 {
diff --git a/ark/kerfuffle/tests/jsonparser.cpp b/ark/kerfuffle/tests/jsonparser.cpp
index b4e54c79..8c4c7e6f 100644
--- a/ark/kerfuffle/tests/jsonparser.cpp
+++ b/ark/kerfuffle/tests/jsonparser.cpp
@@ -29,7 +29,7 @@
 
 #include <KDebug>
 
-#include <QtCore/QLatin1String>
+#include <QtCore/qstring.h>
 
 #include <qjson/parser.h>
 
diff --git a/ark/part/archivemodel.cpp b/ark/part/archivemodel.cpp
index 84d0e0aa..c0142076 100644
--- a/ark/part/archivemodel.cpp
+++ b/ark/part/archivemodel.cpp
@@ -33,10 +33,10 @@
 
 #include <QDir>
 #include <QFont>
-#include <QLatin1String>
+#include <QDateTime>
 #include <QList>
 #include <QMimeData>
-#include <QPersistentModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPixmap>
 #include <QtDBus/QtDBus>
 
diff --git a/ark/part/archiveview.cpp b/ark/part/archiveview.cpp
index 6b9918df..c4673407 100644
--- a/ark/part/archiveview.cpp
+++ b/ark/part/archiveview.cpp
@@ -25,9 +25,9 @@
 #include <KGlobalSettings>
 
 #include <QApplication>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
+
 
 ArchiveView::ArchiveView(QWidget *parent)
         : QTreeView(parent)
diff --git a/ark/part/arkviewer.h b/ark/part/arkviewer.h
index bb41472e..315adca9 100644
--- a/ark/part/arkviewer.h
+++ b/ark/part/arkviewer.h
@@ -28,7 +28,7 @@
 #include <KParts/ReadOnlyPart>
 #include <KService>
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 class ArkViewer : public KDialog
 {
diff --git a/ark/part/interface.h b/ark/part/interface.h
index 40f59028..e0d62953 100644
--- a/ark/part/interface.h
+++ b/ark/part/interface.h
@@ -22,7 +22,7 @@
 #define INTERFACE_H
 
 #include <QStringList>
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 class Interface
 {
diff --git a/ark/part/part.cpp b/ark/part/part.cpp
index 563539af..00a59d8e 100644
--- a/ark/part/part.cpp
+++ b/ark/part/part.cpp
@@ -61,12 +61,12 @@
 #include <QHeaderView>
 #include <QMenu>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QScopedPointer>
 #include <QSplitter>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QtDBus/QtDBus>
 
 using namespace Kerfuffle;
diff --git a/ark/part/part.h b/ark/part/part.h
index 93ed9635..3d6ac1ea 100644
--- a/ark/part/part.h
+++ b/ark/part/part.h
@@ -29,7 +29,7 @@
 #include <KParts/StatusBarExtension>
 #include <KTempDir>
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ArchiveModel;
 class InfoPanel;
diff --git a/ark/plugins/clilhaplugin/cliplugin.cpp b/ark/plugins/clilhaplugin/cliplugin.cpp
index 5c2aa6e3..b69f5cdf 100644
--- a/ark/plugins/clilhaplugin/cliplugin.cpp
+++ b/ark/plugins/clilhaplugin/cliplugin.cpp
@@ -22,8 +22,8 @@
 #include "cliplugin.h"
 
 #include "kerfuffle/kerfuffle_export.h"
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 #include <kdebug.h>
 
 using namespace Kerfuffle;
diff --git a/ark/plugins/cliplugin-example/cliplugin.cpp b/ark/plugins/cliplugin-example/cliplugin.cpp
index c5ca4e08..b9a7c12d 100644
--- a/ark/plugins/cliplugin-example/cliplugin.cpp
+++ b/ark/plugins/cliplugin-example/cliplugin.cpp
@@ -26,8 +26,8 @@
 #include <kdebug.h>
 
 #include <QDir>
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 
 CliPlugin::CliPlugin(QObject *parent, const QVariantList &args)
     : CliInterface(parent, args),
diff --git a/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h b/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
index 11cd2118..155088d7 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedeviladapter.h
@@ -26,8 +26,8 @@
 #include <bluedevil/bluedevil_export.h>
 
 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
-#include <QtDBus/QDBusPendingCallWatcher>
+#include <QtDBus/qdbusextratypes.h>
+#include <QtDBus/qdbuspendingcall.h>
 
 namespace BlueDevil {
 
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h b/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
index 971dbbde..64652a8e 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevildbustypes.h
@@ -22,8 +22,8 @@
 #ifndef dbustypes_H
 #define dbustypes_H
 
-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+#include <QtDBus/qdbusextratypes.h>
 
 typedef QMap<QString,QVariantMap> QVariantMapMap;
 Q_DECLARE_METATYPE(QVariantMapMap)
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevildevice.h b/bluedevil/libbluedevil/bluedevil/bluedevildevice.h
index c18f10ca..dbf85448 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevildevice.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevildevice.h
@@ -30,7 +30,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
index a76b9b8a..9410afe9 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.cpp
@@ -30,7 +30,7 @@
 #include "bluedevil/bluezagentmanager1.h"
 
 #include <QtCore/QHash>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include <QtDBus/QDBusConnectionInterface>
 
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
index 681fb2ba..5e53154b 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager.h
@@ -26,7 +26,7 @@
 #include <bluedevil/bluedevil_export.h>
 
 #include <QtCore/QObject>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
index e59d36f2..0c1825ff 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.cpp
@@ -16,6 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA   *
  *************************************************************************************/
 
+#include <QtCore/qdebug.h>
+
 #include "bluedevilmanager.h"
 #include "bluedevilmanager_p.h"
 #include "bluedeviladapter.h"
diff --git a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
index cf345ceb..fea87bd5 100644
--- a/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
+++ b/bluedevil/libbluedevil/bluedevil/bluedevilmanager_p.h
@@ -24,7 +24,7 @@
 #include "bluedevildbustypes.h"
 
 #include <QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 namespace BlueDevil {
 class Adapter;
diff --git a/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp b/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
index 8986458f..b9adf832 100644
--- a/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
+++ b/bluedevil/src/daemon/helpers/requestpin/requestpin.cpp
@@ -28,7 +28,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 #include <QValidator>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 #include <QRegExp>
 
 #include <KIcon>
diff --git a/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp b/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
index 1a4c2504..9d511bad 100644
--- a/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
+++ b/bluedevil/src/daemon/kded/BlueDevilDaemon.cpp
@@ -25,7 +25,8 @@
 
 #include "filereceiver/filereceiver.h"
 
-#include <QtCore/QProcess>
+#include <QTimer>
+#include <QProcess>
 #include <QDBusServiceWatcher>
 #include <QDBusMetaType>
 
diff --git a/bluedevil/src/daemon/kded/bluezagent.h b/bluedevil/src/daemon/kded/bluezagent.h
index 6c326887..49155349 100644
--- a/bluedevil/src/daemon/kded/bluezagent.h
+++ b/bluedevil/src/daemon/kded/bluezagent.h
@@ -24,7 +24,7 @@
 #define BLUEZAGENT_H
 
 #include <QtDBus/QDBusMessage>
-#include <QtDBus/QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QtDBus/QDBusAbstractAdaptor>
 
 class QProcess;
diff --git a/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp b/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
index 67d7e842..a4ee2507 100644
--- a/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
+++ b/bluedevil/src/daemon/kded/filereceiver/filereceiver.cpp
@@ -22,7 +22,7 @@
 
 #include <QDBusConnection>
 #include <QDBusPendingCall>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QDBusServiceWatcher>
 
 #include <KDebug>
diff --git a/bluedevil/src/daemon/kded/filereceiver/obexagent.h b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
index 0edff42c..f60f5785 100644
--- a/bluedevil/src/daemon/kded/filereceiver/obexagent.h
+++ b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
@@ -21,7 +21,7 @@
 
 #include <QDBusMessage>
 #include <QDBusAbstractAdaptor>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <KComponentData>
 
diff --git a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
index 1de755aa..c35cefee 100644
--- a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
+++ b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.cpp
@@ -23,13 +23,14 @@
 #include "obex_session.h"
 #include "dbus_properties.h"
 
-#include <KIcon>
+#include <QDir>
 #include <QDBusConnection>
 
 #include <bluedevil/bluedevilmanager.h>
 #include <bluedevil/bluedeviladapter.h>
 #include <bluedevil/bluedevildevice.h>
 
+#include <KIcon>
 #include <KDebug>
 #include <KIO/Job>
 #include <kio/copyjob.h>
diff --git a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
index 675d45c5..caddf125 100644
--- a/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
+++ b/bluedevil/src/daemon/kded/filereceiver/receivefilejob.h
@@ -20,7 +20,7 @@
 #ifndef RECEIVE_FILE_JOB_H
 #define RECEIVE_FILE_JOB_H
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QDBusMessage>
 
 #include <KJob>
diff --git a/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp b/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
index 5077cc74..b232a3fe 100644
--- a/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
+++ b/bluedevil/src/fileitemactionplugin/sendfileitemaction.cpp
@@ -24,7 +24,7 @@
 #include <QMenu>
 #include <QAction>
 #include <QWidget>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KIcon>
 #include <KPluginFactory>
diff --git a/bluedevil/src/kcmodule/bluedevildevices.cpp b/bluedevil/src/kcmodule/bluedevildevices.cpp
index e2e22823..776b3f2a 100644
--- a/bluedevil/src/kcmodule/bluedevildevices.cpp
+++ b/bluedevil/src/kcmodule/bluedevildevices.cpp
@@ -27,7 +27,7 @@
 #include <bluedevil/bluedevil.h>
 
 #include <QtCore/QAbstractItemModel>
-
+#include <QtCore/QTimer>
 #include <QtGui/QFontMetrics>
 #include <QtGui/QLabel>
 #include <QtGui/QPainter>
diff --git a/bluedevil/src/kcmodule/bluedevildevices.h b/bluedevil/src/kcmodule/bluedevildevices.h
index 8df7e106..db83c25d 100644
--- a/bluedevil/src/kcmodule/bluedevildevices.h
+++ b/bluedevil/src/kcmodule/bluedevildevices.h
@@ -21,7 +21,7 @@
 #ifndef _BLUEDEVILDEVICES_H
 #define _BLUEDEVILDEVICES_H
 
-#include <QtGui/QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 #include <kcmodule.h>
 
diff --git a/bluedevil/src/kcmodule/systemcheck.cpp b/bluedevil/src/kcmodule/systemcheck.cpp
index 6ad75d27..c7c2165c 100644
--- a/bluedevil/src/kcmodule/systemcheck.cpp
+++ b/bluedevil/src/kcmodule/systemcheck.cpp
@@ -38,7 +38,7 @@
 #include <QtGui/QWidget>
 #include <QtGui/QPainter>
 #include <QtGui/QBoxLayout>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 
 SystemCheck::SystemCheck(QWidget *parent)
     : QObject(parent)
diff --git a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
index e58a74d7..1139b878 100644
--- a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
+++ b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
@@ -21,7 +21,7 @@
 
 #include "../obexdtypes.h"
 
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <kdedmodule.h>
 
 class KJob;
diff --git a/bluedevil/src/kio/obexftp/kio_obexftp.cpp b/bluedevil/src/kio/obexftp/kio_obexftp.cpp
index 82ce5cdc..5bc01d75 100644
--- a/bluedevil/src/kio/obexftp/kio_obexftp.cpp
+++ b/bluedevil/src/kio/obexftp/kio_obexftp.cpp
@@ -22,6 +22,7 @@
 #include "obexd_file_transfer.h"
 #include "kdedobexftp.h"
 #include "version.h"
+#include <QTimer>
 #include <KDebug>
 #include <KComponentData>
 #include <KCmdLineArgs>
diff --git a/bluedevil/src/kio/obexftp/kio_obexftp.h b/bluedevil/src/kio/obexftp/kio_obexftp.h
index 6fe0e567..46918b3b 100644
--- a/bluedevil/src/kio/obexftp/kio_obexftp.h
+++ b/bluedevil/src/kio/obexftp/kio_obexftp.h
@@ -25,7 +25,7 @@
 #include "kdedobexftp.h"
 
 #include <QtCore/QObject>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QEventLoop>
 
 #include <kio/slavebase.h>
diff --git a/bluedevil/src/kio/obexftp/obexdtypes.h b/bluedevil/src/kio/obexftp/obexdtypes.h
index f3496f10..78bbb869 100644
--- a/bluedevil/src/kio/obexftp/obexdtypes.h
+++ b/bluedevil/src/kio/obexftp/obexdtypes.h
@@ -20,9 +20,9 @@
 #define OBEXD_TYPES_H
 
 #include <QtCore/QList>
-#include <QtCore/QVariantMap>
-#include <QVariantMap>
-#include <QDBusObjectPath>
+#include <QtCore/qvariant.h>
+
+#include <QtDBus/qdbusextratypes.h>
 
 typedef QList<QVariantMap> QVariantMapList;
 Q_DECLARE_METATYPE(QVariantMapList);
diff --git a/bluedevil/src/kio/obexftp/transferfilejob.h b/bluedevil/src/kio/obexftp/transferfilejob.h
index d5943595..6152c92b 100644
--- a/bluedevil/src/kio/obexftp/transferfilejob.h
+++ b/bluedevil/src/kio/obexftp/transferfilejob.h
@@ -19,7 +19,7 @@
 #ifndef KIO_GET_FILE_JOB_H
 #define KIO_GET_FILE_JOB_H
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QVariant>
 
 #include <KJob>
diff --git a/bluedevil/src/monolithic/monolithic.h b/bluedevil/src/monolithic/monolithic.h
index da69e1dd..eb22253c 100644
--- a/bluedevil/src/monolithic/monolithic.h
+++ b/bluedevil/src/monolithic/monolithic.h
@@ -20,7 +20,7 @@
 #ifndef MONOLITHIC_H
 #define MONOLITHIC_H
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 
 #include <kstatusnotifieritem.h>
 
diff --git a/bluedevil/src/sendfile/discoverwidget.cpp b/bluedevil/src/sendfile/discoverwidget.cpp
index a6da9534..f6651ae0 100644
--- a/bluedevil/src/sendfile/discoverwidget.cpp
+++ b/bluedevil/src/sendfile/discoverwidget.cpp
@@ -24,7 +24,7 @@
 #include "discoverwidget.h"
 #include "ui_discover.h"
 
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
diff --git a/bluedevil/src/sendfile/pages/connectingpage.h b/bluedevil/src/sendfile/pages/connectingpage.h
index 89dffff3..b380bb63 100644
--- a/bluedevil/src/sendfile/pages/connectingpage.h
+++ b/bluedevil/src/sendfile/pages/connectingpage.h
@@ -25,7 +25,7 @@
 
 #include "ui_connecting.h"
 
-#include <QtGui/QWizardPage>
+#include <QtGui/qwizard.h>
 
 class ConnectingPage : public QWizardPage,
 public Ui::Connecting
diff --git a/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h b/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
index ceb06744..02d4615d 100644
--- a/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
@@ -25,7 +25,7 @@
 
 #include "ui_selectfilediscover.h"
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class KUrl;
 class QWizard;
diff --git a/bluedevil/src/sendfile/pages/selectdevicepage.h b/bluedevil/src/sendfile/pages/selectdevicepage.h
index 8c4b494a..6be8e93d 100644
--- a/bluedevil/src/sendfile/pages/selectdevicepage.h
+++ b/bluedevil/src/sendfile/pages/selectdevicepage.h
@@ -25,7 +25,7 @@
 
 #include "ui_selectfilediscover.h"
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class KUrl;
 class QWizard;
diff --git a/bluedevil/src/sendfile/pages/selectfilespage.h b/bluedevil/src/sendfile/pages/selectfilespage.h
index a8022706..8690db30 100644
--- a/bluedevil/src/sendfile/pages/selectfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectfilespage.h
@@ -23,7 +23,7 @@
 #ifndef SELECTFILESPAGE_H
 #define SELECTFILESPAGE_H
 
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class QWizard;
 class KFileWidget;
diff --git a/bluedevil/src/sendfile/sendfilesjob.h b/bluedevil/src/sendfile/sendfilesjob.h
index e230a4ae..a9df0057 100644
--- a/bluedevil/src/sendfile/sendfilesjob.h
+++ b/bluedevil/src/sendfile/sendfilesjob.h
@@ -25,7 +25,7 @@
 
 #include <QList>
 #include <QStringList>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <kcompositejob.h>
 #include <KFileItemList>
diff --git a/bluedevil/src/wizard/pages/discoverpage.cpp b/bluedevil/src/wizard/pages/discoverpage.cpp
index cd524e94..95d6261c 100644
--- a/bluedevil/src/wizard/pages/discoverpage.cpp
+++ b/bluedevil/src/wizard/pages/discoverpage.cpp
@@ -22,11 +22,11 @@
 #include "../bluewizard.h"
 #include "../wizardagent.h"
 
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QListView>
 #include <QLabel>
 #include <QTimer>
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 
 #include <KDebug>
 #include <KLocale>
diff --git a/bluedevil/src/wizard/pages/discoverpage.h b/bluedevil/src/wizard/pages/discoverpage.h
index 98f5352a..8fe40330 100644
--- a/bluedevil/src/wizard/pages/discoverpage.h
+++ b/bluedevil/src/wizard/pages/discoverpage.h
@@ -20,7 +20,7 @@
 #define DISCOVERPAGE_H
 
 #include "ui_discover.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 
diff --git a/bluedevil/src/wizard/pages/fail.h b/bluedevil/src/wizard/pages/fail.h
index 1964788a..a5bce123 100644
--- a/bluedevil/src/wizard/pages/fail.h
+++ b/bluedevil/src/wizard/pages/fail.h
@@ -25,7 +25,7 @@
 #define FAIL_H
 
 #include "ui_fail.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
diff --git a/bluedevil/src/wizard/pages/keyboardpairing.h b/bluedevil/src/wizard/pages/keyboardpairing.h
index 9b06a9a5..b422c5c3 100644
--- a/bluedevil/src/wizard/pages/keyboardpairing.h
+++ b/bluedevil/src/wizard/pages/keyboardpairing.h
@@ -25,7 +25,7 @@
 #define KEYBOARDPAIRING_H
 
 #include "ui_keyboardpairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
diff --git a/bluedevil/src/wizard/pages/legacypairing.h b/bluedevil/src/wizard/pages/legacypairing.h
index c822bd5c..d3101fc6 100644
--- a/bluedevil/src/wizard/pages/legacypairing.h
+++ b/bluedevil/src/wizard/pages/legacypairing.h
@@ -25,7 +25,7 @@
 #define LEGACYPAIRING_H
 
 #include "ui_legacypairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
diff --git a/bluedevil/src/wizard/pages/legacypairingdatabase.h b/bluedevil/src/wizard/pages/legacypairingdatabase.h
index e9e13aaa..6c1dfaf0 100644
--- a/bluedevil/src/wizard/pages/legacypairingdatabase.h
+++ b/bluedevil/src/wizard/pages/legacypairingdatabase.h
@@ -25,7 +25,7 @@
 #define LEGACYPAIRINGDATABASE_H
 
 #include "ui_nopairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
diff --git a/bluedevil/src/wizard/pages/nopairing.h b/bluedevil/src/wizard/pages/nopairing.h
index ca03fb8e..3d17cea7 100644
--- a/bluedevil/src/wizard/pages/nopairing.h
+++ b/bluedevil/src/wizard/pages/nopairing.h
@@ -26,7 +26,7 @@
 
 #include "ui_nopairing.h"
 #include <QWizard>
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 class KPixmapSequenceOverlayPainter;
diff --git a/bluedevil/src/wizard/pages/ssppairing.h b/bluedevil/src/wizard/pages/ssppairing.h
index d8d0a79f..bc2da848 100644
--- a/bluedevil/src/wizard/pages/ssppairing.h
+++ b/bluedevil/src/wizard/pages/ssppairing.h
@@ -25,7 +25,7 @@
 #define SSPPAIRINGPAGE_H
 
 #include "ui_ssppairing.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 #include <QDBusMessage>
 
 class BlueWizard;
diff --git a/bluedevil/src/wizard/pages/success.h b/bluedevil/src/wizard/pages/success.h
index a41f73e1..0c71faac 100644
--- a/bluedevil/src/wizard/pages/success.h
+++ b/bluedevil/src/wizard/pages/success.h
@@ -25,7 +25,7 @@
 #define SUCCESS_H
 
 #include "ui_success.h"
-#include <QWizardPage>
+#include <QtGui/qwizard.h>
 
 class BlueWizard;
 
diff --git a/bluedevil/src/wizard/wizardagent.h b/bluedevil/src/wizard/wizardagent.h
index 5a9ea2c5..560e440e 100644
--- a/bluedevil/src/wizard/wizardagent.h
+++ b/bluedevil/src/wizard/wizardagent.h
@@ -24,7 +24,7 @@
 
 #include <QtDBus>
 #include <QApplication>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 
 namespace BlueDevil {
     class Device;
diff --git a/dragon/src/app/adjustSizeButton.cpp b/dragon/src/app/adjustSizeButton.cpp
index 4f7d9e7a..a9997551 100644
--- a/dragon/src/app/adjustSizeButton.cpp
+++ b/dragon/src/app/adjustSizeButton.cpp
@@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QPainter>
-#include <QTimerEvent>
+#include <QtCore/qcoreevent.h>
 
 #include "extern.h"
 #include "theStream.h"
diff --git a/dragon/src/app/analyzer/blockAnalyzer.cpp b/dragon/src/app/analyzer/blockAnalyzer.cpp
index d51dcfcc..0819d3c4 100644
--- a/dragon/src/app/analyzer/blockAnalyzer.cpp
+++ b/dragon/src/app/analyzer/blockAnalyzer.cpp
@@ -27,8 +27,8 @@
 
 #include <QPainter>        //paletteChange()
 //Added by qt3to4:
-#include <QContextMenuEvent>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
+
 
 static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }
 
diff --git a/dragon/src/app/analyzer/blockAnalyzer.h b/dragon/src/app/analyzer/blockAnalyzer.h
index b36c228a..1811dc63 100644
--- a/dragon/src/app/analyzer/blockAnalyzer.h
+++ b/dragon/src/app/analyzer/blockAnalyzer.h
@@ -20,9 +20,9 @@
 #include "analyzerBase.h"
 #include <QColor>
 //Added by qt3to4:
-#include <QResizeEvent>
-#include <QMouseEvent>
-#include <QContextMenuEvent>
+
+
+#include <QtGui/qevent.h>
 #include <QPixmap>
 
 class QResizeEvent;
diff --git a/dragon/src/app/discSelectionDialog.cpp b/dragon/src/app/discSelectionDialog.cpp
index 8d041ce8..395b4717 100644
--- a/dragon/src/app/discSelectionDialog.cpp
+++ b/dragon/src/app/discSelectionDialog.cpp
@@ -24,7 +24,7 @@
 #include "videoWindow.h"
 
 #include <QLabel>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QVBoxLayout>
 
 #include <KListWidget>
diff --git a/dragon/src/app/fullScreenToolBarHandler.cpp b/dragon/src/app/fullScreenToolBarHandler.cpp
index 89d22647..2dee3e9e 100644
--- a/dragon/src/app/fullScreenToolBarHandler.cpp
+++ b/dragon/src/app/fullScreenToolBarHandler.cpp
@@ -25,7 +25,7 @@
 #include "mainWindow.h"
 
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPoint>
 
 #include <KDebug>
diff --git a/dragon/src/app/mainWindow.cpp b/dragon/src/app/mainWindow.cpp
index 19b49b6c..cc9183ab 100644
--- a/dragon/src/app/mainWindow.cpp
+++ b/dragon/src/app/mainWindow.cpp
@@ -51,13 +51,13 @@
 #include <QActionGroup>
 #include <QDesktopWidget>
 #include <QDockWidget>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QEvent>        //::stateChanged()
-#include <QKeyEvent>
+
 #include <QLabel>
 #include <QLayout>      //ctor
-#include <QMouseEvent>
+
 #include <QObject>
 #include <QTimer>
 #include <QStackedWidget>
diff --git a/dragon/src/app/part.cpp b/dragon/src/app/part.cpp
index 4bbaff95..607d4625 100644
--- a/dragon/src/app/part.cpp
+++ b/dragon/src/app/part.cpp
@@ -36,7 +36,7 @@
 
 #include <QSlider>
 #include <QTimer>
-#include <QTimerEvent>
+#include <QtCore/qcoreevent.h>
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(CodeineFactory, registerPlugin<Dragon::Part>();)
diff --git a/dragon/src/app/partToolBar.cpp b/dragon/src/app/partToolBar.cpp
index a47be051..2bca3d3b 100644
--- a/dragon/src/app/partToolBar.cpp
+++ b/dragon/src/app/partToolBar.cpp
@@ -23,7 +23,7 @@
 
 #include <QApplication>
 #include <QEvent>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 MouseOverToolBar::MouseOverToolBar( QWidget *parent )
       : KToolBar( parent )
diff --git a/dragon/src/app/recentlyPlayedList.cpp b/dragon/src/app/recentlyPlayedList.cpp
index 8e8e2ed6..3284a0f5 100644
--- a/dragon/src/app/recentlyPlayedList.cpp
+++ b/dragon/src/app/recentlyPlayedList.cpp
@@ -30,7 +30,7 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 //this is a widget for dispaying the rcently played items in a list. It is subclassed so that we can hook up a context menu
 RecentlyPlayedList::RecentlyPlayedList(QWidget *parent)
diff --git a/dragon/src/app/textItem.cpp b/dragon/src/app/textItem.cpp
index 7360dbb7..113df4e6 100644
--- a/dragon/src/app/textItem.cpp
+++ b/dragon/src/app/textItem.cpp
@@ -23,7 +23,7 @@
 #include <KDebug>
 
 #include <QTextDocument>
-#include <QSizeF>
+#include <QtCore/qsize.h>
 #include <QWidget>
 
 ExpandingTextItem::ExpandingTextItem(QGraphicsWidget* parent)
diff --git a/dragon/src/app/textItem.h b/dragon/src/app/textItem.h
index 89c70fdf..38a3ac35 100644
--- a/dragon/src/app/textItem.h
+++ b/dragon/src/app/textItem.h
@@ -22,7 +22,7 @@
 #define TEXTITEM_H
 
 #include <QGraphicsWidget>
-#include <QGraphicsTextItem>
+#include <QtGui/qgraphicsitem.h>
 
 /**
  * A QGV text widget which will automatically change its font size based on 
diff --git a/dragon/src/app/videoWindow.cpp b/dragon/src/app/videoWindow.cpp
index 0144f287..e1fc8ec1 100644
--- a/dragon/src/app/videoWindow.cpp
+++ b/dragon/src/app/videoWindow.cpp
@@ -30,7 +30,7 @@
 #include "theStream.h"
 
 #include <QActionGroup>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QTimer>
 #include <QVBoxLayout>
diff --git a/dragon/src/app/videoWindow.h b/dragon/src/app/videoWindow.h
index ab61ed0f..74e9f1a8 100644
--- a/dragon/src/app/videoWindow.h
+++ b/dragon/src/app/videoWindow.h
@@ -24,7 +24,7 @@
 
 #include "codeine.h"
 
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <QWidget>
 
 #include <Phonon/Path>
diff --git a/dragon/src/mpris2/mediaplayer2player.h b/dragon/src/mpris2/mediaplayer2player.h
index 2bc0bdd4..3a30fbb4 100644
--- a/dragon/src/mpris2/mediaplayer2player.h
+++ b/dragon/src/mpris2/mediaplayer2player.h
@@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MEDIAPLAYRER2PLAYER_H
 
 #include <QDBusAbstractAdaptor>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 #include <Phonon/MediaSource>
 
diff --git a/dragon/src/mpris2/mpris2.cpp b/dragon/src/mpris2/mpris2.cpp
index 3eaa7c62..1290d689 100644
--- a/dragon/src/mpris2/mpris2.cpp
+++ b/dragon/src/mpris2/mpris2.cpp
@@ -25,7 +25,7 @@
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QMetaClassInfo>
+#include <QtCore/qmetaobject.h>
 #include <QStringList>
 
 #include <unistd.h>
diff --git a/dragon/src/mpris2/mpris2.h b/dragon/src/mpris2/mpris2.h
index bc28cd70..6ff1756a 100644
--- a/dragon/src/mpris2/mpris2.h
+++ b/dragon/src/mpris2/mpris2.h
@@ -22,7 +22,7 @@
 #define DRAGONPLAYER_MPRIS2_H
 
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 class Mpris2 : public QObject
 {
diff --git a/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp b/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
index 97218c89..01667b1a 100644
--- a/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
+++ b/ffmpegthumbs/ffmpegthumbnailer/videothumbnailer.cpp
@@ -25,7 +25,7 @@
 #include <cmath>
 #include <qglobal.h>
 #include <sys/stat.h>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 
 using namespace std;
diff --git a/filelight/src/part/radialMap/labels.cpp b/filelight/src/part/radialMap/labels.cpp
index 088f8fcb..22ddead0 100644
--- a/filelight/src/part/radialMap/labels.cpp
+++ b/filelight/src/part/radialMap/labels.cpp
@@ -19,6 +19,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ***********************************************************************/
 
+#include <QRect>
 #include <QFont>
 #include <QFontMetrics>
 #include <QPainter>
diff --git a/filelight/src/part/radialMap/widget.h b/filelight/src/part/radialMap/widget.h
index 04af6d7d..f9aed9bd 100644
--- a/filelight/src/part/radialMap/widget.h
+++ b/filelight/src/part/radialMap/widget.h
@@ -25,11 +25,11 @@
 #include <KJob>
 #include <KUrl>
 
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
+#include <QtGui/qevent.h>
+
+
+
+
 #include <QtGui/QWidget>
 #include <QtCore/QTimer>
 
diff --git a/filelight/src/part/radialMap/widgetEvents.cpp b/filelight/src/part/radialMap/widgetEvents.cpp
index 46fe5e2e..63d9ed7a 100644
--- a/filelight/src/part/radialMap/widgetEvents.cpp
+++ b/filelight/src/part/radialMap/widgetEvents.cpp
@@ -42,11 +42,11 @@
 #include <QtGui/QClipboard>
 #include <QtGui/QPainter>
 #include <QtCore/QTimer>      //::resizeEvent()
-#include <QtGui/QDropEvent>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QDragEnterEvent>
+
+
+
+
+#include <QtGui/qevent.h>
 #include <QtGui/QToolTip>
 
 #include <cmath>         //::segmentAt()
diff --git a/filelight/src/part/settingsDialog.cpp b/filelight/src/part/settingsDialog.cpp
index b35c4f99..117718a4 100644
--- a/filelight/src/part/settingsDialog.cpp
+++ b/filelight/src/part/settingsDialog.cpp
@@ -27,7 +27,7 @@
 #include <KMessageBox>
 
 #include <QtGui/QRadioButton>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QDir>
 
 SettingsDialog::SettingsDialog(QWidget *parent) : KDialog(parent)
diff --git a/filelight/src/part/settingsDialog.h b/filelight/src/part/settingsDialog.h
index 58174a02..414b2688 100644
--- a/filelight/src/part/settingsDialog.h
+++ b/filelight/src/part/settingsDialog.h
@@ -25,7 +25,7 @@
 #include "ui_dialog.h" //generated by uic
 
 #include <QtCore/QTimer>
-#include <QtGui/QCloseEvent>
+#include <QtGui/qevent.h>
 
 #include <kdialog.h>
 
diff --git a/filelight/src/part/summaryWidget.cpp b/filelight/src/part/summaryWidget.cpp
index 64d0fea9..a7d8ba96 100644
--- a/filelight/src/part/summaryWidget.cpp
+++ b/filelight/src/part/summaryWidget.cpp
@@ -42,7 +42,7 @@
 #include <QtGui/QApplication>
 #include <QtCore/QByteArray>
 #include <QtCore/QList>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QLayout>
 
 struct Disk
diff --git a/gwenview/app/browsemainpage.cpp b/gwenview/app/browsemainpage.cpp
index 9bc0b536..9003843a 100644
--- a/gwenview/app/browsemainpage.cpp
+++ b/gwenview/app/browsemainpage.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_browsemainpage.cpp"
 
 // Qt
-#include <QDropEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QSlider>
 #include <QToolTip>
diff --git a/gwenview/app/filtercontroller.cpp b/gwenview/app/filtercontroller.cpp
index 0046f598..9fa8b188 100644
--- a/gwenview/app/filtercontroller.cpp
+++ b/gwenview/app/filtercontroller.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QAction>
 #include <QCompleter>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QLineEdit>
 #include <QPainter>
 #include <QPainterPath>
diff --git a/gwenview/app/folderviewcontextmanageritem.cpp b/gwenview/app/folderviewcontextmanageritem.cpp
index f306da10..c5cbb777 100644
--- a/gwenview/app/folderviewcontextmanageritem.cpp
+++ b/gwenview/app/folderviewcontextmanageritem.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include "folderviewcontextmanageritem.h"
 
 // Qt
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QTreeView>
 
diff --git a/gwenview/app/infocontextmanageritem.cpp b/gwenview/app/infocontextmanageritem.cpp
index fb28f1eb..eb18062e 100644
--- a/gwenview/app/infocontextmanageritem.cpp
+++ b/gwenview/app/infocontextmanageritem.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Qt
 #include <QApplication>
 #include <QGridLayout>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QPainter>
 #include <QPointer>
diff --git a/gwenview/app/sidebar.cpp b/gwenview/app/sidebar.cpp
index a412199d..b885db11 100644
--- a/gwenview/app/sidebar.cpp
+++ b/gwenview/app/sidebar.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QLabel>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionTabV3>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTabBar>
 #include <QToolButton>
diff --git a/gwenview/importer/importdialog.cpp b/gwenview/importer/importdialog.cpp
index 896f3c00..2be3bb48 100644
--- a/gwenview/importer/importdialog.cpp
+++ b/gwenview/importer/importdialog.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QApplication>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QStackedWidget>
 
 // KDE
diff --git a/gwenview/importer/thumbnailpage.h b/gwenview/importer/thumbnailpage.h
index 4f74482a..bafc821a 100644
--- a/gwenview/importer/thumbnailpage.h
+++ b/gwenview/importer/thumbnailpage.h
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #define THUMBNAILPAGE_H
 
 // Qt
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QWidget>
 
 // KDE
diff --git a/gwenview/lib/abstractimageoperation.h b/gwenview/lib/abstractimageoperation.h
index 51b09530..4a50b4eb 100644
--- a/gwenview/lib/abstractimageoperation.h
+++ b/gwenview/lib/abstractimageoperation.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/gwenviewlib_export.h>
 
 // Qt
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 // KDE
 
diff --git a/gwenview/lib/crop/croptool.cpp b/gwenview/lib/crop/croptool.cpp
index 4b1b1bf3..8d662e06 100644
--- a/gwenview/lib/crop/croptool.cpp
+++ b/gwenview/lib/crop/croptool.cpp
@@ -24,9 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Qt
 #include <qmath.h>
 #include <QApplication>
-#include <QFlags>
-#include <QGraphicsSceneMouseEvent>
-#include <QMouseEvent>
+#include <QtCore/qglobal.h>
+#include <QtGui/qgraphicssceneevent.h>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QRect>
 #include <QScrollBar>
diff --git a/gwenview/lib/datewidget.cpp b/gwenview/lib/datewidget.cpp
index f867fb34..e2786607 100644
--- a/gwenview/lib/datewidget.cpp
+++ b/gwenview/lib/datewidget.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include "moc_datewidget.cpp"
 
 // Qt
-#include <QDate>
+#include <QtCore/qdatetime.h>
 #include <QHBoxLayout>
 
 // KDE
diff --git a/gwenview/lib/document/document_p.h b/gwenview/lib/document/document_p.h
index 075f554a..15687d66 100644
--- a/gwenview/lib/document/document_p.h
+++ b/gwenview/lib/document/document_p.h
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QObject>
 #include <QQueue>
 #include <QUndoStack>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/abstractimageview.cpp b/gwenview/lib/documentview/abstractimageview.cpp
index 4ebd705d..887b2f80 100644
--- a/gwenview/lib/documentview/abstractimageview.cpp
+++ b/gwenview/lib/documentview/abstractimageview.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QCursor>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/documentview.cpp b/gwenview/lib/documentview/documentview.cpp
index 1ca448d4..b4961a74 100644
--- a/gwenview/lib/documentview/documentview.cpp
+++ b/gwenview/lib/documentview/documentview.cpp
@@ -27,14 +27,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-#include <QMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QScrollBar>
 #include <QVBoxLayout>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 // KDE
 #include <KDebug>
diff --git a/gwenview/lib/documentview/documentviewcontainer.cpp b/gwenview/lib/documentview/documentviewcontainer.cpp
index fd9fa2b9..b8e6d19c 100644
--- a/gwenview/lib/documentview/documentviewcontainer.cpp
+++ b/gwenview/lib/documentview/documentviewcontainer.cpp
@@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QEvent>
-#include <QGLWidget>
+#include <QGL>
 #include <QGraphicsScene>
 #include <QPropertyAnimation>
 #include <QTimer>
diff --git a/gwenview/lib/documentview/rasterimageview.cpp b/gwenview/lib/documentview/rasterimageview.cpp
index 6a80590b..4fb34170 100644
--- a/gwenview/lib/documentview/rasterimageview.cpp
+++ b/gwenview/lib/documentview/rasterimageview.cpp
@@ -31,10 +31,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KDebug>
 
 // Qt
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QTimer>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 // LCMS2
 #include <lcms2.h>
diff --git a/gwenview/lib/documentview/svgviewadapter.cpp b/gwenview/lib/documentview/svgviewadapter.cpp
index c082b14b..7738d873 100644
--- a/gwenview/lib/documentview/svgviewadapter.cpp
+++ b/gwenview/lib/documentview/svgviewadapter.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QCursor>
 #include <QEvent>
 #include <QGraphicsSvgItem>
-#include <QGraphicsTextItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QGraphicsWidget>
 #include <QPainter>
 #include <QSvgRenderer>
diff --git a/gwenview/lib/documentview/videoviewadapter.cpp b/gwenview/lib/documentview/videoviewadapter.cpp
index 191b8ef2..bd7d0eba 100644
--- a/gwenview/lib/documentview/videoviewadapter.cpp
+++ b/gwenview/lib/documentview/videoviewadapter.cpp
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsLinearLayout>
 #include <QGraphicsProxyWidget>
 #include <QHBoxLayout>
-#include <QMouseEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 
 // KDE
 #include <KDebug>
diff --git a/gwenview/lib/flowlayout.h b/gwenview/lib/flowlayout.h
index f7d0c2bc..53856715 100644
--- a/gwenview/lib/flowlayout.h
+++ b/gwenview/lib/flowlayout.h
@@ -42,7 +42,7 @@
 
 #include <QLayout>
 #include <QRect>
-#include <QWidgetItem>
+#include <QtGui/qlayoutitem.h>
 
 class GWENVIEWLIB_EXPORT FlowLayout : public QLayout
 {
diff --git a/gwenview/lib/fullscreenbar.cpp b/gwenview/lib/fullscreenbar.cpp
index 695d2cbe..1c9fc2d9 100644
--- a/gwenview/lib/fullscreenbar.cpp
+++ b/gwenview/lib/fullscreenbar.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <QDesktopWidget>
 #include <QBitmap>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QLayout>
 #include <QTimeLine>
 #include <QTimer>
diff --git a/gwenview/lib/hud/hudbutton.cpp b/gwenview/lib/hud/hudbutton.cpp
index 15d26ac6..b9029a0a 100644
--- a/gwenview/lib/hud/hudbutton.cpp
+++ b/gwenview/lib/hud/hudbutton.cpp
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QIcon>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/hud/hudlabel.cpp b/gwenview/lib/hud/hudlabel.cpp
index f8db4c3d..913a81b0 100644
--- a/gwenview/lib/hud/hudlabel.cpp
+++ b/gwenview/lib/hud/hudlabel.cpp
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QFontMetrics>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/hud/hudslider.cpp b/gwenview/lib/hud/hudslider.cpp
index 769e2b7a..2c879158 100644
--- a/gwenview/lib/hud/hudslider.cpp
+++ b/gwenview/lib/hud/hudslider.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QGraphicsSceneEvent>
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 #include <QTimer>
 
 namespace Gwenview
diff --git a/gwenview/lib/imageformats/imageformats.cpp b/gwenview/lib/imageformats/imageformats.cpp
index 27022c74..4b4abb36 100644
--- a/gwenview/lib/imageformats/imageformats.cpp
+++ b/gwenview/lib/imageformats/imageformats.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Include QImageIOPlugin to get qRegisterStaticPluginInstanceFunction(), which
 // does not come with QPluginLoader.
-#include <QImageIOPlugin>
+#include <QtGui/qimageiohandler.h>
 
 // KDE
 
diff --git a/gwenview/lib/imageformats/jpeghandler.cpp b/gwenview/lib/imageformats/jpeghandler.cpp
index f3dd4928..2b024247 100644
--- a/gwenview/lib/imageformats/jpeghandler.cpp
+++ b/gwenview/lib/imageformats/jpeghandler.cpp
@@ -167,7 +167,7 @@ static bool loadJpeg(QImage* image, QIODevice* ioDevice, QSize scaledSize)
         break;
     case 1: // B&W image
         *image = QImage(cinfo.output_width, cinfo.output_height, QImage::Format_Indexed8);
-        image->setNumColors(256);
+        image->setColorCount(256);
         for (int i = 0; i < 256; ++i) {
             image->setColor(i, qRgba(i, i, i, 255));
         }
@@ -331,7 +331,7 @@ static bool write_jpeg_image(const QImage &sourceImage, QIODevice *device, int s
         case 1:
         case 8:
             gray = true;
-            for (int i = image.numColors(); gray && i--;) {
+            for (int i = image.colorCount(); gray && i--;) {
                 gray = gray & (qRed(cmap[i]) == qGreen(cmap[i]) &&
                                qRed(cmap[i]) == qBlue(cmap[i]));
             }
diff --git a/gwenview/lib/imageformats/jpegplugin.h b/gwenview/lib/imageformats/jpegplugin.h
index b1c20f2f..b87c0563 100644
--- a/gwenview/lib/imageformats/jpegplugin.h
+++ b/gwenview/lib/imageformats/jpegplugin.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QByteArray>
-#include <QImageIOPlugin>
+#include <QtGui/qimageiohandler.h>
 
 class QImageIOHandler;
 class QIODevice;
diff --git a/gwenview/lib/memoryutils.cpp b/gwenview/lib/memoryutils.cpp
index 4e3aec12..dee6e6bb 100644
--- a/gwenview/lib/memoryutils.cpp
+++ b/gwenview/lib/memoryutils.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QFile>
 #include <QTextStream>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 // System
 #ifdef Q_OS_WIN
diff --git a/gwenview/lib/paintutils.cpp b/gwenview/lib/paintutils.cpp
index 2902bcaf..50fb1322 100644
--- a/gwenview/lib/paintutils.cpp
+++ b/gwenview/lib/paintutils.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QPainter>
 #include <QPainterPath>
 #include <QPixmap>
-#include <QRectF>
+#include <QtCore/qrect.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/recursivedirmodel.h b/gwenview/lib/recursivedirmodel.h
index 05008b3b..36f2e353 100644
--- a/gwenview/lib/recursivedirmodel.h
+++ b/gwenview/lib/recursivedirmodel.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KFileItem>
 
 // Qt
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class KUrl;
 
diff --git a/gwenview/lib/redeyereduction/redeyereductiontool.cpp b/gwenview/lib/redeyereduction/redeyereductiontool.cpp
index 6f0d9112..a4d821ab 100644
--- a/gwenview/lib/redeyereduction/redeyereductiontool.cpp
+++ b/gwenview/lib/redeyereduction/redeyereductiontool.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include "moc_redeyereductiontool.cpp"
 
 // Qt
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QPushButton>
 #include <QRect>
diff --git a/gwenview/lib/slidecontainer.cpp b/gwenview/lib/slidecontainer.cpp
index 4f527e00..2cb4ec2b 100644
--- a/gwenview/lib/slidecontainer.cpp
+++ b/gwenview/lib/slidecontainer.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Qt
 #include <QEvent>
 #include <QPropertyAnimation>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/slidecontainer.h b/gwenview/lib/slidecontainer.h
index d7ec0a9b..0a812d46 100644
--- a/gwenview/lib/slidecontainer.h
+++ b/gwenview/lib/slidecontainer.h
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define SLIDECONTAINER_H
 
 // Qt
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QFrame>
 
 #include <lib/gwenviewlib_export.h>
diff --git a/gwenview/lib/statusbartoolbutton.cpp b/gwenview/lib/statusbartoolbutton.cpp
index 4e98b08f..1374d55e 100644
--- a/gwenview/lib/statusbartoolbutton.cpp
+++ b/gwenview/lib/statusbartoolbutton.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Qt
 #include <QAction>
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QToolButton>
 
diff --git a/gwenview/lib/thumbnailview/contextbarbutton.cpp b/gwenview/lib/thumbnailview/contextbarbutton.cpp
index 3e874260..96531579 100644
--- a/gwenview/lib/thumbnailview/contextbarbutton.cpp
+++ b/gwenview/lib/thumbnailview/contextbarbutton.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <KIconLoader>
 
 // Qt
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 
 namespace Gwenview
diff --git a/gwenview/lib/thumbnailview/itemeditor.cpp b/gwenview/lib/thumbnailview/itemeditor.cpp
index 34441ec0..dfbd83fc 100644
--- a/gwenview/lib/thumbnailview/itemeditor.cpp
+++ b/gwenview/lib/thumbnailview/itemeditor.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QApplication>
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 
 // KDE
 #include <KDebug>
diff --git a/gwenview/lib/thumbnailview/previewitemdelegate.cpp b/gwenview/lib/thumbnailview/previewitemdelegate.cpp
index c3607c36..3cc6a7a8 100644
--- a/gwenview/lib/thumbnailview/previewitemdelegate.cpp
+++ b/gwenview/lib/thumbnailview/previewitemdelegate.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QHash>
 #include <QHBoxLayout>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <QPainter>
 #include <QPainterPath>
diff --git a/gwenview/lib/thumbnailview/thumbnailbarview.cpp b/gwenview/lib/thumbnailview/thumbnailbarview.cpp
index 5a158d97..5881b895 100644
--- a/gwenview/lib/thumbnailview/thumbnailbarview.cpp
+++ b/gwenview/lib/thumbnailview/thumbnailbarview.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QApplication>
 #include <QItemSelectionModel>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <QScrollBar>
 #include <QPainter>
 #include <QTimeLine>
diff --git a/gwenview/lib/thumbnailview/thumbnailview.cpp b/gwenview/lib/thumbnailview/thumbnailview.cpp
index 4fc7037e..3080339f 100644
--- a/gwenview/lib/thumbnailview/thumbnailview.cpp
+++ b/gwenview/lib/thumbnailview/thumbnailview.cpp
@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Qt
 #include <QApplication>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QPainter>
 #include <QPointer>
 #include <QQueue>
diff --git a/gwenview/tests/auto/documenttest.cpp b/gwenview/tests/auto/documenttest.cpp
index d58c8d9f..24af83d2 100644
--- a/gwenview/tests/auto/documenttest.cpp
+++ b/gwenview/tests/auto/documenttest.cpp
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 // Qt
-#include <QConicalGradient>
+#include <QtGui/qbrush.h>
 #include <QImage>
 #include <QPainter>
 
diff --git a/gwenview/tests/manual/imageloadbench.cpp b/gwenview/tests/manual/imageloadbench.cpp
index a7759917..f1bd4714 100644
--- a/gwenview/tests/manual/imageloadbench.cpp
+++ b/gwenview/tests/manual/imageloadbench.cpp
@@ -4,7 +4,7 @@
 #include <QFile>
 #include <QImage>
 #include <QImageReader>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <lib/imageformats/imageformats.h>
 
diff --git a/gwenview/tests/manual/thumbnailgen.cpp b/gwenview/tests/manual/thumbnailgen.cpp
index 1c9f7737..46839403 100644
--- a/gwenview/tests/manual/thumbnailgen.cpp
+++ b/gwenview/tests/manual/thumbnailgen.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Qt
 #include <QDir>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 using namespace Gwenview;
 
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 6b9dbcef..868df7d1 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QApplication>
 #include <QCursor>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QShortcut>
 #include <QStyle>
 
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index 823f6b80..77330ce2 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -55,7 +55,7 @@ class KCalcConstMenu;
 #include "ui_constants.h"
 #include "ui_colors.h"
 
-#include <QFlags>
+#include <QtCore/qglobal.h>
 
 #include <kxmlguiwindow.h>
 
diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp
index e62a9dde..cf43a9b1 100644
--- a/kcalc/kcalc_button.cpp
+++ b/kcalc/kcalc_button.cpp
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QAbstractTextDocumentLayout>
 #include <QApplication>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTextDocument>
 
diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp
index cccd233c..43d95144 100644
--- a/kcalc/kcalc_const_menu.cpp
+++ b/kcalc/kcalc_const_menu.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kcalc_const_menu.h"
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 083e4594..df6ea5b7 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "kcalcdisplay.h"
 
 #include <QClipboard>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOption>
diff --git a/kcron/src/genericListWidget.cpp b/kcron/src/genericListWidget.cpp
index d8b57bc0..e5f1fcd2 100644
--- a/kcron/src/genericListWidget.cpp
+++ b/kcron/src/genericListWidget.cpp
@@ -15,7 +15,7 @@
 #include <QTreeWidgetItemIterator>
 #include <QVBoxLayout>
 #include <QPixmap>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QAction>
 
 #include <klocale.h>
diff --git a/kcron/src/kcmCron.h b/kcron/src/kcmCron.h
index 8253ddd0..b518861e 100644
--- a/kcron/src/kcmCron.h
+++ b/kcron/src/kcmCron.h
@@ -21,7 +21,7 @@
 #include <QPixmap>
 #include <QString>
 #include <QWidget>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QStringList>
 
 #include <kcmodule.h>
diff --git a/kcron/src/taskWidget.h b/kcron/src/taskWidget.h
index 390c4be2..697c9930 100644
--- a/kcron/src/taskWidget.h
+++ b/kcron/src/taskWidget.h
@@ -12,7 +12,7 @@
 #ifndef TASK_WIDGET_H
 #define TASK_WIDGET_H
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 class CTTask;
 class TasksWidget;
diff --git a/kdenetwork-filesharing/samba/filepropertiesplugin/model.h b/kdenetwork-filesharing/samba/filepropertiesplugin/model.h
index 194bad0c..d351195b 100644
--- a/kdenetwork-filesharing/samba/filepropertiesplugin/model.h
+++ b/kdenetwork-filesharing/samba/filepropertiesplugin/model.h
@@ -22,7 +22,7 @@
 #define model_h
 
 #include <QStringList>
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <ksambasharedata.h>
 
 class KSambaShareData;
diff --git a/kdevelop/app/welcomepage/sessionsmodel.h b/kdevelop/app/welcomepage/sessionsmodel.h
index eabba772..079d1ecf 100644
--- a/kdevelop/app/welcomepage/sessionsmodel.h
+++ b/kdevelop/app/welcomepage/sessionsmodel.h
@@ -19,7 +19,7 @@
 #ifndef SESSIONSMODEL_H
 #define SESSIONSMODEL_H
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <shell/sessioncontroller.h>
 
 class SessionsModel : public QAbstractListModel
diff --git a/kdevelop/debuggers/gdb/debugsession.h b/kdevelop/debuggers/gdb/debugsession.h
index 7a1a3d98..33b50709 100644
--- a/kdevelop/debuggers/gdb/debugsession.h
+++ b/kdevelop/debuggers/gdb/debugsession.h
@@ -26,7 +26,7 @@
 #ifndef GDB_DEBUGSESSION_H
 #define GDB_DEBUGSESSION_H
 
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QScopedPointer>
 
 #include <KConfigGroup>
diff --git a/kdevelop/debuggers/gdb/disassemblewidget.cpp b/kdevelop/debuggers/gdb/disassemblewidget.cpp
index 3f879530..eb20bd85 100644
--- a/kdevelop/debuggers/gdb/disassemblewidget.cpp
+++ b/kdevelop/debuggers/gdb/disassemblewidget.cpp
@@ -31,8 +31,8 @@
 #include <ktextedit.h>
 #include <kglobalsettings.h>
 
-#include <QShowEvent>
-#include <QHideEvent>
+#include <QtGui/qevent.h>
+
 #include <QAction>
 #include <QMenu>
 #include <QBoxLayout>
diff --git a/kdevelop/debuggers/gdb/gdbcommand.h b/kdevelop/debuggers/gdb/gdbcommand.h
index e1ebc698..4a6a68b7 100644
--- a/kdevelop/debuggers/gdb/gdbcommand.h
+++ b/kdevelop/debuggers/gdb/gdbcommand.h
@@ -21,7 +21,7 @@
 #include <QStringList>
 
 #include "mi/gdbmi.h"
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace GDBDebugger
 {
diff --git a/kdevelop/debuggers/gdb/gdbglobal.h b/kdevelop/debuggers/gdb/gdbglobal.h
index ef31c027..1a661e78 100644
--- a/kdevelop/debuggers/gdb/gdbglobal.h
+++ b/kdevelop/debuggers/gdb/gdbglobal.h
@@ -18,7 +18,7 @@
 #ifndef _GDBGLOBAL_H_
 #define _GDBGLOBAL_H_
 
-#include <QFlags>
+#include <QtCore/qglobal.h>
 
 namespace GDBDebugger
 {
diff --git a/kdevelop/debuggers/gdb/gdboutputwidget.cpp b/kdevelop/debuggers/gdb/gdboutputwidget.cpp
index 65a14a55..f3203039 100644
--- a/kdevelop/debuggers/gdb/gdboutputwidget.cpp
+++ b/kdevelop/debuggers/gdb/gdboutputwidget.cpp
@@ -36,7 +36,7 @@
 #include <QToolTip>
 #include <QApplication>
 #include <QClipboard>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <khistorycombobox.h>
 #include <KIcon>
diff --git a/kdevelop/debuggers/gdb/gdboutputwidget.h b/kdevelop/debuggers/gdb/gdboutputwidget.h
index e3bf3cdf..bcc85d38 100644
--- a/kdevelop/debuggers/gdb/gdboutputwidget.h
+++ b/kdevelop/debuggers/gdb/gdboutputwidget.h
@@ -25,7 +25,7 @@
 
 #include <QTimer>
 #include <QStringList>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 #include <QStringList>
 #include <QTextEdit>
 
diff --git a/kdevelop/debuggers/gdb/memviewdlg.cpp b/kdevelop/debuggers/gdb/memviewdlg.cpp
index ca12b069..237d93d3 100644
--- a/kdevelop/debuggers/gdb/memviewdlg.cpp
+++ b/kdevelop/debuggers/gdb/memviewdlg.cpp
@@ -34,7 +34,7 @@
 #include <qtoolbox.h>
 #include <QTextEdit>
 #include <QHBoxLayout>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QGridLayout>
 #include <QVBoxLayout>
 
diff --git a/kdevelop/debuggers/gdb/memviewdlg.h b/kdevelop/debuggers/gdb/memviewdlg.h
index 6ceaf932..db048327 100644
--- a/kdevelop/debuggers/gdb/memviewdlg.h
+++ b/kdevelop/debuggers/gdb/memviewdlg.h
@@ -20,7 +20,7 @@
 
 #include <kdialog.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include "gdbglobal.h"
 
diff --git a/kdevelop/debuggers/gdb/printers/tests/qdate.cpp b/kdevelop/debuggers/gdb/printers/tests/qdate.cpp
index 3081487a..202633e6 100644
--- a/kdevelop/debuggers/gdb/printers/tests/qdate.cpp
+++ b/kdevelop/debuggers/gdb/printers/tests/qdate.cpp
@@ -1,4 +1,4 @@
-#include <QDate>
+#include <QtCore/qdatetime.h>
 int main()
 {
     QDate d(2010, 1, 20);
diff --git a/kdevelop/debuggers/gdb/printers/tests/qtime.cpp b/kdevelop/debuggers/gdb/printers/tests/qtime.cpp
index 530745ad..8488b21c 100644
--- a/kdevelop/debuggers/gdb/printers/tests/qtime.cpp
+++ b/kdevelop/debuggers/gdb/printers/tests/qtime.cpp
@@ -1,4 +1,4 @@
-#include <QTime>
+#include <QtCore/qdatetime.h>
 int main()
 {
     QTime t(15, 30, 10, 123);
diff --git a/kdevelop/debuggers/gdb/registers/registersview.cpp b/kdevelop/debuggers/gdb/registers/registersview.cpp
index a91bce19..48508700 100644
--- a/kdevelop/debuggers/gdb/registers/registersview.cpp
+++ b/kdevelop/debuggers/gdb/registers/registersview.cpp
@@ -24,7 +24,7 @@
 #include "converters.h"
 
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSignalMapper>
 
 #include <KDebug>
diff --git a/kdevelop/debuggers/gdb/unittests/gdbtest.cpp b/kdevelop/debuggers/gdb/unittests/gdbtest.cpp
index ef3cd428..9d64cc03 100644
--- a/kdevelop/debuggers/gdb/unittests/gdbtest.cpp
+++ b/kdevelop/debuggers/gdb/unittests/gdbtest.cpp
@@ -25,6 +25,7 @@
 #include <QApplication>
 #include <QFileInfo>
 #include <QDir>
+#include <QTemporaryFile>
 
 #include <KGlobal>
 #include <KSharedConfig>
diff --git a/kdevelop/documentation/CMakeLists.txt b/kdevelop/documentation/CMakeLists.txt
index 66f1c5ca..812a58ae 100644
--- a/kdevelop/documentation/CMakeLists.txt
+++ b/kdevelop/documentation/CMakeLists.txt
@@ -1,6 +1,8 @@
 macro_log_feature(QT_QTHELP_FOUND "QtHelp" "The Help module for the Qt toolkit, needed for the qthelp plugin" "http://qt-project.org/" FALSE)
+macro_log_feature(QT_QTWEBKIT_FOUND "QtWebKit" "The WebKit module for the Qt toolkit, needed for the qthelp and manpage plugin" "http://qt-project.org/" FALSE)
 
-if(QT_QTHELP_FOUND)
+# TODO: that should use a part
+if(QT_QTHELP_FOUND AND QT_QTWEBKIT_FOUND)
  macro_optional_add_subdirectory(qthelp)
+    macro_optional_add_subdirectory(manpage)
 endif()
-macro_optional_add_subdirectory(manpage)
diff --git a/kdevelop/documentation/manpage/manpagemodel.h b/kdevelop/documentation/manpage/manpagemodel.h
index 1733d5f6..41f8ce40 100644
--- a/kdevelop/documentation/manpage/manpagemodel.h
+++ b/kdevelop/documentation/manpage/manpagemodel.h
@@ -27,7 +27,7 @@
 
 #include <KIO/Job>
 
-#include <QListIterator>
+#include <QtCore/qlist.h>
 
 // id and name for man section
 typedef QPair<QString, QString> ManSection;
diff --git a/kdevelop/documentation/manpage/manpageplugin.h b/kdevelop/documentation/manpage/manpageplugin.h
index 8677d87f..3ed5f658 100644
--- a/kdevelop/documentation/manpage/manpageplugin.h
+++ b/kdevelop/documentation/manpage/manpageplugin.h
@@ -26,7 +26,7 @@
 #include <interfaces/iplugin.h>
 #include <interfaces/idocumentationprovider.h>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QProgressBar>
 
 class ManPageDocumentation;
diff --git a/kdevelop/documentation/qthelp/qthelpdocumentation.cpp b/kdevelop/documentation/qthelp/qthelpdocumentation.cpp
index 979b96a6..899a275d 100644
--- a/kdevelop/documentation/qthelp/qthelpdocumentation.cpp
+++ b/kdevelop/documentation/qthelp/qthelpdocumentation.cpp
@@ -24,7 +24,7 @@
 #include <KLocale>
 #include <KIcon>
 #include <QTreeView>
-#include <QHelpContentModel>
+#include <QtHelp/qhelpcontentwidget.h>
 #include <QHeaderView>
 #include <QMenu>
 #include <interfaces/icore.h>
diff --git a/kdevelop/documentation/qthelp/qthelpproviderabstract.cpp b/kdevelop/documentation/qthelp/qthelpproviderabstract.cpp
index 9ba7ccd5..6890c8fa 100644
--- a/kdevelop/documentation/qthelp/qthelpproviderabstract.cpp
+++ b/kdevelop/documentation/qthelp/qthelpproviderabstract.cpp
@@ -21,9 +21,9 @@
 
 #include "qthelpprovider.h"
 
-#include <QHelpIndexModel>
+#include <QtHelp/qhelpindexwidget.h>
 #include <QTemporaryFile>
-#include <QHelpContentModel>
+#include <QtHelp/qhelpcontentwidget.h>
 
 #include <KDebug>
 #include <KStandardDirs>
diff --git a/kdevelop/documentation/qthelp/qthelpproviderabstract.h b/kdevelop/documentation/qthelp/qthelpproviderabstract.h
index 7bd49a64..04fb54b9 100644
--- a/kdevelop/documentation/qthelp/qthelpproviderabstract.h
+++ b/kdevelop/documentation/qthelp/qthelpproviderabstract.h
@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QString>
 #include <QUrl>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QHelpEngine>
 
 
diff --git a/kdevelop/file_templates/classes/qt_shared/class.h b/kdevelop/file_templates/classes/qt_shared/class.h
index 7adaa44a..1ac099f1 100644
--- a/kdevelop/file_templates/classes/qt_shared/class.h
+++ b/kdevelop/file_templates/classes/qt_shared/class.h
@@ -3,7 +3,7 @@
 
 {% block includes %}
 {{ block.super }}
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 {% endblock %}
 
 {% block forward_declarations %}
diff --git a/kdevelop/kdeintegration/kdeprovider/kdeprojectsreader.cpp b/kdevelop/kdeintegration/kdeprovider/kdeprojectsreader.cpp
index 7e99155e..db91fe3c 100644
--- a/kdevelop/kdeintegration/kdeprovider/kdeprojectsreader.cpp
+++ b/kdevelop/kdeintegration/kdeprovider/kdeprojectsreader.cpp
@@ -20,7 +20,7 @@
 #include <KUrl>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QDebug>
 #include <vcs/vcslocation.h>
 
diff --git a/kdevelop/kdeintegration/kdeprovider/kdeproviderplugin.cpp b/kdevelop/kdeintegration/kdeprovider/kdeproviderplugin.cpp
index 72bc9d26..7f9b1793 100644
--- a/kdevelop/kdeintegration/kdeprovider/kdeproviderplugin.cpp
+++ b/kdevelop/kdeintegration/kdeprovider/kdeproviderplugin.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "kdeproviderplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
diff --git a/kdevelop/languages/cpp/codecompletion/item.cpp b/kdevelop/languages/cpp/codecompletion/item.cpp
index 455c5096..6abbd3e6 100644
--- a/kdevelop/languages/cpp/codecompletion/item.cpp
+++ b/kdevelop/languages/cpp/codecompletion/item.cpp
@@ -26,7 +26,7 @@
 #include <ktexteditor/view.h>
 #include <ktexteditor/document.h>
 #include <cpptypes.h>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include "helpers.h"
 #include "model.h"
 #include <language/duchain/declaration.h>
diff --git a/kdevelop/languages/cpp/cppduchain/overloadresolution.cpp b/kdevelop/languages/cpp/cppduchain/overloadresolution.cpp
index 5f38aa29..c24ebb67 100644
--- a/kdevelop/languages/cpp/cppduchain/overloadresolution.cpp
+++ b/kdevelop/languages/cpp/cppduchain/overloadresolution.cpp
@@ -27,7 +27,7 @@
 #include "templatedeclaration.h"
 #include "templateparameterdeclaration.h"
 #include "typeutils.h"
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include "adlhelper.h"
 #include "typeconversion.h"
 #include <language/duchain/persistentsymboltable.h>
diff --git a/kdevelop/languages/cpp/cppparsejob.cpp b/kdevelop/languages/cpp/cppparsejob.cpp
index 1b9f950a..089a1b1d 100644
--- a/kdevelop/languages/cpp/cppparsejob.cpp
+++ b/kdevelop/languages/cpp/cppparsejob.cpp
@@ -37,7 +37,7 @@
 #include <QFile>
 #include <QByteArray>
 #include <QReadWriteLock>
-#include <QReadLocker>
+#include <QtCore/qreadwritelock.h>
 
 #include <KDebug>
 #include <KLocale>
diff --git a/kdevelop/languages/cpp/parser/headergen/main.cpp b/kdevelop/languages/cpp/parser/headergen/main.cpp
index 16d6878e..e58edbc6 100644
--- a/kdevelop/languages/cpp/parser/headergen/main.cpp
+++ b/kdevelop/languages/cpp/parser/headergen/main.cpp
@@ -20,12 +20,12 @@
 
 #include <QByteArray>
 #include <QFile>
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QDir>
 #include <QTextStream>
-#include <QMultiMap>
-#include <QMapIterator>
+
+#include <QtCore/qmap.h>
 #include <QSet>
 
 #include <kdebug.h>
diff --git a/kdevelop/languages/cpp/parser/rpp/pp-macro-expander.cpp b/kdevelop/languages/cpp/parser/rpp/pp-macro-expander.cpp
index 59c83859..bad99c68 100644
--- a/kdevelop/languages/cpp/parser/rpp/pp-macro-expander.cpp
+++ b/kdevelop/languages/cpp/parser/rpp/pp-macro-expander.cpp
@@ -22,8 +22,8 @@
 
 #include "pp-macro-expander.h"
 
-#include <QDate>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 
 #include <kdebug.h>
 #include <klocale.h> 
diff --git a/kdevelop/languages/cpp/preprocessjob.cpp b/kdevelop/languages/cpp/preprocessjob.cpp
index b9d5d7f7..b88d1272 100644
--- a/kdevelop/languages/cpp/preprocessjob.cpp
+++ b/kdevelop/languages/cpp/preprocessjob.cpp
@@ -25,7 +25,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QByteArray>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QReadWriteLock>
 
 #include <kdebug.h>
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
index 2179e137..77c3f12b 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
+++ b/kdevelop/languages/plugins/custom-definesandincludes/compilerprovider/msvccompiler.cpp
@@ -26,7 +26,7 @@
 #include "msvccompiler.h"
 
 #include <QDir>
-#include <QProcessEnvironment>
+#include <QtCore/qprocess.h>
 
 #include <KProcess>
 
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/definesandincludesmanager.h b/kdevelop/languages/plugins/custom-definesandincludes/definesandincludesmanager.h
index 8833c7bc..246e7654 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/definesandincludesmanager.h
+++ b/kdevelop/languages/plugins/custom-definesandincludes/definesandincludesmanager.h
@@ -22,7 +22,7 @@
 #ifndef CUSTOMDEFINESANDINCLUDESMANAGER_H
 #define CUSTOMDEFINESANDINCLUDESMANAGER_H
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <QVector>
 
 #include <interfaces/iplugin.h>
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.h b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.h
index 7ad7af8a..2fabf6f2 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.h
+++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/compilersmodel.h
@@ -24,7 +24,7 @@
 #ifndef COMPILERMODEL_H
 #define COMPILERMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QHash>
 
 #include "../compilerprovider/icompiler.h"
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h
index 619a8c4d..03296109 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h
+++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/definesmodel.h
@@ -19,7 +19,7 @@
 #ifndef DEFINESMODEL_H
 #define DEFINESMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QHash>
 
 #include <language/interfaces/idefinesandincludesmanager.h>
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h
index 3b7fa3fd..12f4497f 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h
+++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/includesmodel.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDESMODEL_H
 #define INCLUDESMODEL_H
 
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStringList>
 
 class IncludesModel : public QAbstractListModel
diff --git a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h
index 4844e0ee..1773c212 100644
--- a/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h
+++ b/kdevelop/languages/plugins/custom-definesandincludes/kcm_widget/projectpathsmodel.h
@@ -19,7 +19,7 @@
 #ifndef PROJECTPATHSMODEL_H
 #define PROJECTPATHSMODEL_H
 
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QList>
 
 #include <KUrl>
diff --git a/kdevelop/projectbuilders/ninjabuilder/kdevninjabuilderplugin.h b/kdevelop/projectbuilders/ninjabuilder/kdevninjabuilderplugin.h
index 0eb6a4be..11df075a 100644
--- a/kdevelop/projectbuilders/ninjabuilder/kdevninjabuilderplugin.h
+++ b/kdevelop/projectbuilders/ninjabuilder/kdevninjabuilderplugin.h
@@ -22,7 +22,7 @@
 #include <interfaces/iplugin.h>
 #include <project/interfaces/iprojectbuilder.h>
 #include <KUrl>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class NinjaJob;
 
diff --git a/kdevelop/projectmanagers/cmake/CMakeLists.txt b/kdevelop/projectmanagers/cmake/CMakeLists.txt
index 39d01241..efbdf69c 100644
--- a/kdevelop/projectmanagers/cmake/CMakeLists.txt
+++ b/kdevelop/projectmanagers/cmake/CMakeLists.txt
@@ -67,34 +67,54 @@ remove_definitions( -DQT_NO_STL )
 
 add_library( kdev4cmakecommon SHARED ${cmakecommon_SRCS} )
 target_link_libraries( kdev4cmakecommon LINK_PRIVATE ${KDE4_KDEUI_LIBS}
-                        ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
+                        ${KDE4_KTEXTEDITOR_LIBS} ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+                        ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
                         ${QT_QTSCRIPT_LIBRARY} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         )
 
 kde4_add_plugin( kdevcmakemanager ${cmakemanager_SRCS} )
-target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDEVPLATFORM_UTIL_LIBRARIES}
+target_link_libraries( kdevcmakemanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS}
+                        ${KDEVPLATFORM_UTIL_LIBRARIES}
                         ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
                         ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         ${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES} ${KDE4_KTEXTEDITOR_LIBS})
 
+if(QT_QTWEBKIT_FOUND)
 kde4_add_plugin( kdevcmakedocumentation ${cmakedoc_SRCS} )
 target_link_libraries( kdevcmakedocumentation
                         ${KDEVPLATFORM_INTERFACES_LIBRARIES} kdev4cmakecommon
-                        ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+                        ${KDEVPLATFORM_PROJECT_LIBRARIES}
+                        ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
                         ${KDEVPLATFORM_DOCUMENTATION_LIBRARIES}
-                        ${KDE4_KTEXTEDITOR_LIBS} ${QT_QTWEBKIT_LIBRARY})
+                        ${KDE4_KTEXTEDITOR_LIBS}
+                        ${QT_QTWEBKIT_LIBRARY})
+endif()
 
 kde4_add_plugin( kcm_kdevcmake_settings ${cmakesettings_SRCS} )
-target_link_libraries( kcm_kdevcmake_settings ${KDE4_KIO_LIBS}
-                       ${KDEVPLATFORM_INTERFACES_LIBRARIES} ${KDEVPLATFORM_PROJECT_LIBRARIES} ${KDEVPLATFORM_UTIL_LIBRARIES}
+target_link_libraries( kcm_kdevcmake_settings
+                       ${KDE4_KIO_LIBS}
+                       ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+                       ${KDEVPLATFORM_PROJECT_LIBRARIES}
+                       ${KDEVPLATFORM_UTIL_LIBRARIES}
                        ${KDE4_KIO_LIBRARY} kdev4cmakecommon )
 
 install(TARGETS kdevcmakemanager DESTINATION ${PLUGIN_INSTALL_DIR} )
-install(TARGETS kdevcmakedocumentation DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kcm_kdevcmake_settings DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(TARGETS kdev4cmakecommon ${INSTALL_TARGETS_DEFAULT_ARGS} )
 configure_file(kdevcmakemanager.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakemanager.desktop)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakemanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-configure_file(kdevcmakedocumentation.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install(FILES kcm_kdevcmake_settings.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+if(QT_QTWEBKIT_FOUND)
+    install(
+        TARGETS kdevcmakedocumentation
+        DESTINATION ${PLUGIN_INSTALL_DIR}
+    )
+    configure_file(
+        kdevcmakedocumentation.desktop.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop
+    )
+    install(
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevcmakedocumentation.desktop
+        DESTINATION ${SERVICES_INSTALL_DIR}
+    )
+endif()
\ No newline at end of file
diff --git a/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.h b/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.h
index 88145abb..21279f6d 100644
--- a/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.h
+++ b/kdevelop/projectmanagers/cmake/cmakebuilddirchooser.h
@@ -22,7 +22,7 @@
 #define CMAKEBUILDDIRCHOOSER_H
 
 #include <KDialog>
-#include <QFlags>
+#include <QtCore/qglobal.h>
 #include <kurl.h>
 
 #include "cmakeexport.h"
diff --git a/kdevelop/projectmanagers/cmake/cmakecodecompletionmodel.cpp b/kdevelop/projectmanagers/cmake/cmakecodecompletionmodel.cpp
index 767468ab..019f9292 100644
--- a/kdevelop/projectmanagers/cmake/cmakecodecompletionmodel.cpp
+++ b/kdevelop/projectmanagers/cmake/cmakecodecompletionmodel.cpp
@@ -20,7 +20,7 @@
 
 #include "cmakecodecompletionmodel.h"
 #include <QVariant>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <kurl.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
diff --git a/kdevelop/projectmanagers/cmake/cmakedocumentation.h b/kdevelop/projectmanagers/cmake/cmakedocumentation.h
index ab9ca90d..c4ee9f17 100644
--- a/kdevelop/projectmanagers/cmake/cmakedocumentation.h
+++ b/kdevelop/projectmanagers/cmake/cmakedocumentation.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QMap>
 #include <QStringList>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <interfaces/iplugin.h>
 #include "icmakedocumentation.h"
 
diff --git a/kdevelop/projectmanagers/cmake/tests/manual/kde4app/kde4app.cpp b/kdevelop/projectmanagers/cmake/tests/manual/kde4app/kde4app.cpp
index 94ef5821..a367f2e0 100644
--- a/kdevelop/projectmanagers/cmake/tests/manual/kde4app/kde4app.cpp
+++ b/kdevelop/projectmanagers/cmake/tests/manual/kde4app/kde4app.cpp
@@ -7,7 +7,7 @@
 #include "kde4appview.h"
 #include "settings.h"
 
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QPainter>
 #include <QtGui/QPrinter>
 
diff --git a/kdevelop/projectmanagers/custommake/custommakemanager.cpp b/kdevelop/projectmanagers/custommake/custommakemanager.cpp
index 90c4e086..bd089ebb 100644
--- a/kdevelop/projectmanagers/custommake/custommakemanager.cpp
+++ b/kdevelop/projectmanagers/custommake/custommakemanager.cpp
@@ -24,7 +24,7 @@
 #include <language/duchain/indexedstring.h>
 
 #include <QDir>
-#include <QFileInfoList>
+#include <QtCore/qfileinfo.h>
 #include <QFile>
 #include <QApplication>
 
diff --git a/kdevelop/providers/ghprovider/ghlineedit.cpp b/kdevelop/providers/ghprovider/ghlineedit.cpp
index 2c9f9fb4..71ef6616 100644
--- a/kdevelop/providers/ghprovider/ghlineedit.cpp
+++ b/kdevelop/providers/ghprovider/ghlineedit.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QtCore/QTimer>
 #include <ghlineedit.h>
 
diff --git a/kdevelop/utils/okteta/oktetaplugin.h b/kdevelop/utils/okteta/oktetaplugin.h
index 0bfc0385..4d27d9b6 100644
--- a/kdevelop/utils/okteta/oktetaplugin.h
+++ b/kdevelop/utils/okteta/oktetaplugin.h
@@ -28,7 +28,7 @@
 // KDev
 #include <interfaces/iplugin.h>
 // Qt
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 class KUrl;
 
diff --git a/kdevplatform/debugger/breakpoint/breakpointmodel.h b/kdevplatform/debugger/breakpoint/breakpointmodel.h
index 162d57c9..73cacd74 100644
--- a/kdevplatform/debugger/breakpoint/breakpointmodel.h
+++ b/kdevplatform/debugger/breakpoint/breakpointmodel.h
@@ -22,7 +22,7 @@
 #ifndef KDEVPLATFORM_BREAKPOINTMODEL_H
 #define KDEVPLATFORM_BREAKPOINTMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <KDE/KTextEditor/MarkInterface>
 #include "breakpoint.h"
diff --git a/kdevplatform/debugger/breakpoint/breakpointwidget.cpp b/kdevplatform/debugger/breakpoint/breakpointwidget.cpp
index db876cae..81c260ce 100644
--- a/kdevplatform/debugger/breakpoint/breakpointwidget.cpp
+++ b/kdevplatform/debugger/breakpoint/breakpointwidget.cpp
@@ -27,7 +27,7 @@
 #include <QTableView>
 #include <QHeaderView>
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KIcon>
 #include <KLocalizedString>
diff --git a/kdevplatform/debugger/framestack/framestackmodel.h b/kdevplatform/debugger/framestack/framestackmodel.h
index 3661099d..fdfd52bf 100644
--- a/kdevplatform/debugger/framestack/framestackmodel.h
+++ b/kdevplatform/debugger/framestack/framestackmodel.h
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_FRAMESTACKMODEL_H
 #define KDEVPLATFORM_FRAMESTACKMODEL_H
 
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QHash>
 
 #include <KDE/KUrl>
diff --git a/kdevplatform/debugger/framestack/framestackwidget.cpp b/kdevplatform/debugger/framestack/framestackwidget.cpp
index cc47ed73..430241b6 100644
--- a/kdevplatform/debugger/framestack/framestackwidget.cpp
+++ b/kdevplatform/debugger/framestack/framestackwidget.cpp
@@ -33,7 +33,7 @@
 #include <QMenu>
 #include <QApplication>
 #include <QClipboard>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 #include <KAction>
 #include <KStandardAction>
diff --git a/kdevplatform/debugger/util/pathmappings.cpp b/kdevplatform/debugger/util/pathmappings.cpp
index e5f9921c..d89802fd 100644
--- a/kdevplatform/debugger/util/pathmappings.cpp
+++ b/kdevplatform/debugger/util/pathmappings.cpp
@@ -21,7 +21,7 @@
 
 #include "pathmappings.h"
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QTableView>
diff --git a/kdevplatform/debugger/util/treeitem.cpp b/kdevplatform/debugger/util/treeitem.cpp
index 1ba6c554..89b38d82 100644
--- a/kdevplatform/debugger/util/treeitem.cpp
+++ b/kdevplatform/debugger/util/treeitem.cpp
@@ -22,7 +22,7 @@
 #include "treeitem.h"
 
 #include <QStringList>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "treemodel.h"
 
diff --git a/kdevplatform/debugger/util/treemodel.h b/kdevplatform/debugger/util/treemodel.h
index bbab15e9..f24a4151 100644
--- a/kdevplatform/debugger/util/treemodel.h
+++ b/kdevplatform/debugger/util/treemodel.h
@@ -23,7 +23,7 @@
 #define KDEVPLATFORM_TREEMODEL_H
 
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
 #include <QtCore/QString>
diff --git a/kdevplatform/debugger/variable/variabletooltip.cpp b/kdevplatform/debugger/variable/variabletooltip.cpp
index 5100421e..06a23e02 100644
--- a/kdevplatform/debugger/variable/variabletooltip.cpp
+++ b/kdevplatform/debugger/variable/variabletooltip.cpp
@@ -28,7 +28,7 @@
 #include <QApplication>
 #include <QEvent>
 #include <QStandardItemModel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 #include <QLabel>
 #include <QPushButton>
diff --git a/kdevplatform/debugger/variable/variablewidget.cpp b/kdevplatform/debugger/variable/variablewidget.cpp
index e6297257..0eab804b 100644
--- a/kdevplatform/debugger/variable/variablewidget.cpp
+++ b/kdevplatform/debugger/variable/variablewidget.cpp
@@ -22,8 +22,8 @@
 #include <QRegExp>
 #include <QCursor>
 #include <QHBoxLayout>
-#include <QKeyEvent>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
+
 #include <QVBoxLayout>
 #include <QPoint>
 #include <QClipboard>
diff --git a/kdevplatform/documentation/CMakeLists.txt b/kdevplatform/documentation/CMakeLists.txt
index d18e3a9a..38a989fd 100644
--- a/kdevplatform/documentation/CMakeLists.txt
+++ b/kdevplatform/documentation/CMakeLists.txt
@@ -1,27 +1,30 @@
 macro_log_feature(QT_QTWEBKIT_FOUND "QtWebKit" "QtWebKit, for integrated documentation" "http://qt-project.org/" FALSE)
 
+set(kdevplatformdocumentation_LIB_SRCS
+    documentationfindwidget.cpp
+    documentationview.cpp
+)
+
 if(QT_QTWEBKIT_FOUND)
     set(kdevplatformdocumentation_LIB_SRCS
+        ${kdevplatformdocumentation_LIB_SRCS}
         standarddocumentationview.cpp
-        documentationfindwidget.cpp
-        documentationview.cpp
-        documentationfindwidget.ui
     )
+endif()
 
-    add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS})
+add_library(kdevplatformdocumentation SHARED ${kdevplatformdocumentation_LIB_SRCS})
 
-    install(TARGETS kdevplatformdocumentation EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kdevplatformdocumentation EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
-    target_link_libraries(kdevplatformdocumentation
-            LINK_PRIVATE ${QT_QTWEBKIT_LIBRARY}
-            LINK_PUBLIC kdevplatforminterfaces)
+target_link_libraries(kdevplatformdocumentation
+        LINK_PRIVATE ${QT_QTWEBKIT_LIBRARY}
+        LINK_PUBLIC kdevplatforminterfaces)
 
-    set_target_properties(kdevplatformdocumentation PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
+set_target_properties(kdevplatformdocumentation PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
 
-    install(FILES
-        documentationexport.h
-        documentationfindwidget.h
-        standarddocumentationview.h
-        DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/documentation COMPONENT Devel
-    )
-endif()
\ No newline at end of file
+install(FILES
+    documentationexport.h
+    documentationfindwidget.h
+    standarddocumentationview.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/documentation COMPONENT Devel
+)
\ No newline at end of file
diff --git a/kdevplatform/documentation/documentationview.h b/kdevplatform/documentation/documentationview.h
index e0fa7d6f..04a679d1 100644
--- a/kdevplatform/documentation/documentationview.h
+++ b/kdevplatform/documentation/documentationview.h
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_DOCUMENTATIONVIEW_H
 
 #include <QWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <KToolBar>
 #include <interfaces/idocumentation.h>
 #include "documentationexport.h"
diff --git a/kdevplatform/interfaces/iassistant.cpp b/kdevplatform/interfaces/iassistant.cpp
index 293696ff..4e72d025 100644
--- a/kdevplatform/interfaces/iassistant.cpp
+++ b/kdevplatform/interfaces/iassistant.cpp
@@ -20,7 +20,7 @@
 #include "icore.h"
 
 #include <KAction>
-#include <QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QTextEdit>
 #include <QThread>
 
diff --git a/kdevplatform/language/backgroundparser/backgroundparser.cpp b/kdevplatform/language/backgroundparser/backgroundparser.cpp
index 93c179d7..fa826d88 100644
--- a/kdevplatform/language/backgroundparser/backgroundparser.cpp
+++ b/kdevplatform/language/backgroundparser/backgroundparser.cpp
@@ -28,9 +28,9 @@
 #include <QTimer>
 #include <QMutex>
 #include <QWaitCondition>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThread>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kdevplatform/language/backgroundparser/documentchangetracker.cpp b/kdevplatform/language/backgroundparser/documentchangetracker.cpp
index 3086bbc0..d4c42bdc 100644
--- a/kdevplatform/language/backgroundparser/documentchangetracker.cpp
+++ b/kdevplatform/language/backgroundparser/documentchangetracker.cpp
@@ -22,7 +22,7 @@
 #include "documentchangetracker.h"
 
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <ktexteditor/document.h>
diff --git a/kdevplatform/language/backgroundparser/parsejob.cpp b/kdevplatform/language/backgroundparser/parsejob.cpp
index fd276b9e..3fae6e3d 100644
--- a/kdevplatform/language/backgroundparser/parsejob.cpp
+++ b/kdevplatform/language/backgroundparser/parsejob.cpp
@@ -30,7 +30,7 @@
 #include <QFile>
 #include <QByteArray>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QApplication>
 
 #include <kdebug.h>
diff --git a/kdevplatform/language/backgroundparser/parsejob.h b/kdevplatform/language/backgroundparser/parsejob.h
index c7cb8ffc..72e2384b 100644
--- a/kdevplatform/language/backgroundparser/parsejob.h
+++ b/kdevplatform/language/backgroundparser/parsejob.h
@@ -23,7 +23,7 @@
 #ifndef KDEVPLATFORM_PARSEJOB_H
 #define KDEVPLATFORM_PARSEJOB_H
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <KDE/KUrl>
 
 #include <threadweaver/JobSequence.h>
diff --git a/kdevplatform/language/backgroundparser/parserdependencypolicy.h b/kdevplatform/language/backgroundparser/parserdependencypolicy.h
index 31352fe2..11e71df4 100644
--- a/kdevplatform/language/backgroundparser/parserdependencypolicy.h
+++ b/kdevplatform/language/backgroundparser/parserdependencypolicy.h
@@ -24,7 +24,7 @@
 
 #include <threadweaver/DependencyPolicy.h>
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 
 namespace KDevelop
 {
diff --git a/kdevplatform/language/codecompletion/codecompletionitem.cpp b/kdevplatform/language/codecompletion/codecompletionitem.cpp
index 5cc02896..5443fd1f 100644
--- a/kdevplatform/language/codecompletion/codecompletionitem.cpp
+++ b/kdevplatform/language/codecompletion/codecompletionitem.cpp
@@ -21,7 +21,7 @@
 
 #include "codecompletionitem.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <ktexteditor/codecompletionmodel.h>
 #include <ktexteditor/range.h>
diff --git a/kdevplatform/language/codegen/sourcefiletemplate.cpp b/kdevplatform/language/codegen/sourcefiletemplate.cpp
index 62f11051..c48bd9b0 100644
--- a/kdevplatform/language/codegen/sourcefiletemplate.cpp
+++ b/kdevplatform/language/codegen/sourcefiletemplate.cpp
@@ -32,7 +32,7 @@
 #include <KConfigGroup>
 
 #include <QFileInfo>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 using namespace KDevelop;
 typedef SourceFileTemplate::ConfigOption ConfigOption;
diff --git a/kdevplatform/language/codegen/templateclassgenerator.h b/kdevplatform/language/codegen/templateclassgenerator.h
index 76a08b79..9b8d3102 100644
--- a/kdevplatform/language/codegen/templateclassgenerator.h
+++ b/kdevplatform/language/codegen/templateclassgenerator.h
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_TEMPLATECLASSGENERATOR_H
 
 #include <QHash>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 #include "../languageexport.h"
 #include <language/duchain/duchainpointer.h>
diff --git a/kdevplatform/language/codegen/templaterenderer.h b/kdevplatform/language/codegen/templaterenderer.h
index fc339b43..84633a39 100644
--- a/kdevplatform/language/codegen/templaterenderer.h
+++ b/kdevplatform/language/codegen/templaterenderer.h
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_TEMPLATERENDERER_H
 #define KDEVPLATFORM_TEMPLATERENDERER_H
 
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 #include "../languageexport.h"
 
diff --git a/kdevplatform/language/duchain/builders/abstractcontextbuilder.h b/kdevplatform/language/duchain/builders/abstractcontextbuilder.h
index 58ba3d38..ac8d53e3 100644
--- a/kdevplatform/language/duchain/builders/abstractcontextbuilder.h
+++ b/kdevplatform/language/duchain/builders/abstractcontextbuilder.h
@@ -25,7 +25,7 @@
 
 #include <climits>
 
-#include <QtCore/QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <ktexteditor/range.h>
 
diff --git a/kdevplatform/language/duchain/duchain.cpp b/kdevplatform/language/duchain/duchain.cpp
index da18b69a..7f5838ec 100644
--- a/kdevplatform/language/duchain/duchain.cpp
+++ b/kdevplatform/language/duchain/duchain.cpp
@@ -25,10 +25,10 @@
 #include <QtCore/QCoreApplication>
 #include <QApplication>
 #include <QtCore/QHash>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QTimer>
 #include <QtCore/QReadWriteLock>
-#include <QtCore/QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QtCore/QThread>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
diff --git a/kdevplatform/language/duchain/duchainbase.cpp b/kdevplatform/language/duchain/duchainbase.cpp
index 0c8d4385..4680c6e2 100644
--- a/kdevplatform/language/duchain/duchainbase.cpp
+++ b/kdevplatform/language/duchain/duchainbase.cpp
@@ -19,7 +19,7 @@
 
 #include "duchainbase.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThreadStorage>
 
 #include "duchainpointer.h"
diff --git a/kdevplatform/language/duchain/ducontext.cpp b/kdevplatform/language/duchain/ducontext.cpp
index d4e071d3..e1136199 100644
--- a/kdevplatform/language/duchain/ducontext.cpp
+++ b/kdevplatform/language/duchain/ducontext.cpp
@@ -21,7 +21,7 @@
 
 #include <limits>
 
-#include <QMutableLinkedListIterator>
+#include <QtCore/qlist.h>
 #include <QSet>
 
 #include <ktexteditor/document.h>
diff --git a/kdevplatform/language/duchain/navigation/useswidget.cpp b/kdevplatform/language/duchain/navigation/useswidget.cpp
index bc22b1c8..bbd21e58 100644
--- a/kdevplatform/language/duchain/navigation/useswidget.cpp
+++ b/kdevplatform/language/duchain/navigation/useswidget.cpp
@@ -33,7 +33,7 @@
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/iprojectcontroller.h>
 #include <qtextdocument.h>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 #include <language/duchain/duchainutils.h>
 #include <language/codegen/coderepresentation.h>
 #include <interfaces/iproject.h>
diff --git a/kdevplatform/language/duchain/referencecounting.cpp b/kdevplatform/language/duchain/referencecounting.cpp
index ab3fc2bc..fa909cd8 100644
--- a/kdevplatform/language/duchain/referencecounting.cpp
+++ b/kdevplatform/language/duchain/referencecounting.cpp
@@ -22,7 +22,7 @@
 #include "referencecounting.h"
 #include <QMutex>
 #include <QMap>
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <kdebug.h>
 #include "repositories/itemrepository.h"
 #include <util/spinlock.h>
diff --git a/kdevplatform/language/duchain/repositories/itemrepositoryregistry.cpp b/kdevplatform/language/duchain/repositories/itemrepositoryregistry.cpp
index 83e50e00..733f0d6a 100644
--- a/kdevplatform/language/duchain/repositories/itemrepositoryregistry.cpp
+++ b/kdevplatform/language/duchain/repositories/itemrepositoryregistry.cpp
@@ -19,7 +19,7 @@
 #include "itemrepositoryregistry.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QProcessEnvironment>
+#include <QtCore/qprocess.h>
 #include <QtCore/QCoreApplication>
 #include <QtDBus/QDBusConnection>
 
diff --git a/kdevplatform/language/duchain/repositories/itemrepositoryregistry.h b/kdevplatform/language/duchain/repositories/itemrepositoryregistry.h
index 223a23d7..1ff7d851 100644
--- a/kdevplatform/language/duchain/repositories/itemrepositoryregistry.h
+++ b/kdevplatform/language/duchain/repositories/itemrepositoryregistry.h
@@ -21,7 +21,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QMutex>
-#include <QtCore/QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QtCore/QMap>
 
 #include <language/languageexport.h>
diff --git a/kdevplatform/language/duchain/repositories/typerepository.cpp b/kdevplatform/language/duchain/repositories/typerepository.cpp
index 009da2af..adb5f996 100644
--- a/kdevplatform/language/duchain/repositories/typerepository.cpp
+++ b/kdevplatform/language/duchain/repositories/typerepository.cpp
@@ -20,7 +20,7 @@
 
 #include <QHash>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include "../types/typesystemdata.h"
 #include "../types/typeregister.h"
diff --git a/kdevplatform/language/duchain/types/typepointer.h b/kdevplatform/language/duchain/types/typepointer.h
index c2d02b24..a23b1fbc 100644
--- a/kdevplatform/language/duchain/types/typepointer.h
+++ b/kdevplatform/language/duchain/types/typepointer.h
@@ -28,8 +28,8 @@
 #ifndef KDEVPLATFORM_TYPEPOINTER_H
 #define KDEVPLATFORM_TYPEPOINTER_H
 
-#include <QtCore/QExplicitlySharedDataPointer>
-#include <QtCore/QAtomicPointer>
+#include <QtCore/qsharedpointer.h>
+#include <QtCore/qatomic.h>
 #include <kdemacros.h>
 
 typedef QSharedData TypeShared;
diff --git a/kdevplatform/language/highlighting/codehighlighting.h b/kdevplatform/language/highlighting/codehighlighting.h
index afc09185..9dbde8c9 100644
--- a/kdevplatform/language/highlighting/codehighlighting.h
+++ b/kdevplatform/language/highlighting/codehighlighting.h
@@ -26,7 +26,7 @@
 
 #include <QtCore/QObject>
 #include <QtCore/QHash>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <ktexteditor/attribute.h>
 #include <ktexteditor/movingrange.h>
diff --git a/kdevplatform/language/highlighting/colorcache.h b/kdevplatform/language/highlighting/colorcache.h
index ab385bae..1d87b8e9 100644
--- a/kdevplatform/language/highlighting/colorcache.h
+++ b/kdevplatform/language/highlighting/colorcache.h
@@ -25,7 +25,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 #include <QtGui/QColor>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include "../languageexport.h"
 
diff --git a/kdevplatform/outputview/ioutputview.h b/kdevplatform/outputview/ioutputview.h
index 26780179..f6757f3f 100644
--- a/kdevplatform/outputview/ioutputview.h
+++ b/kdevplatform/outputview/ioutputview.h
@@ -22,7 +22,7 @@
 #define KDEVPLATFORM_IOUTPUTVIEW_H
 
 #include <QtCore/QMetaType>
-#include <QtCore/QFlags>
+#include <QtCore/qglobal.h>
 #include <KDE/KIcon>
 
 #include "outputviewexport.h"
diff --git a/kdevplatform/outputview/outputmodel.h b/kdevplatform/outputview/outputmodel.h
index fedeeec5..f9954347 100644
--- a/kdevplatform/outputview/outputmodel.h
+++ b/kdevplatform/outputview/outputmodel.h
@@ -25,7 +25,7 @@
 #include "outputviewexport.h"
 #include "ioutputviewmodel.h"
 
-#include <QtCore/QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class KUrl;
 
diff --git a/kdevplatform/plugins/appwizard/projectselectionpage.h b/kdevplatform/plugins/appwizard/projectselectionpage.h
index 5cdfdc2a..0de655f0 100644
--- a/kdevplatform/plugins/appwizard/projectselectionpage.h
+++ b/kdevplatform/plugins/appwizard/projectselectionpage.h
@@ -12,7 +12,7 @@
 
 #include "appwizardpagewidget.h"
 #include "appwizarddialog.h"
-#include <QRegExpValidator>
+#include <QtGui/qvalidator.h>
 
 namespace KDevelop
 {
diff --git a/kdevplatform/plugins/bazaar/bazaarplugin.h b/kdevplatform/plugins/bazaar/bazaarplugin.h
index 6f0a3eb2..f253667c 100644
--- a/kdevplatform/plugins/bazaar/bazaarplugin.h
+++ b/kdevplatform/plugins/bazaar/bazaarplugin.h
@@ -21,7 +21,7 @@
 #ifndef BAZAAR_BAZAARPLUGIN_H
 #define BAZAAR_BAZAARPLUGIN_H
 
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <interfaces/iplugin.h>
 #include <vcs/interfaces/idistributedversioncontrol.h>
diff --git a/kdevplatform/plugins/classbrowser/classtree.cpp b/kdevplatform/plugins/classbrowser/classtree.cpp
index 902ece08..fc093fd1 100644
--- a/kdevplatform/plugins/classbrowser/classtree.cpp
+++ b/kdevplatform/plugins/classbrowser/classtree.cpp
@@ -25,7 +25,7 @@
 
 #include <QtGui/QMenu>
 #include <QtGui/QHeaderView>
-#include <QtGui/QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include "interfaces/contextmenuextension.h"
 #include "interfaces/icore.h"
diff --git a/kdevplatform/plugins/codeutils/codeutilsplugin.cpp b/kdevplatform/plugins/codeutils/codeutilsplugin.cpp
index 26a457e5..ecd2aa46 100644
--- a/kdevplatform/plugins/codeutils/codeutilsplugin.cpp
+++ b/kdevplatform/plugins/codeutils/codeutilsplugin.cpp
@@ -20,7 +20,7 @@
 
 #include "codeutilsplugin.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KLocale>
 #include <KPluginFactory>
diff --git a/kdevplatform/plugins/contextbrowser/browsemanager.cpp b/kdevplatform/plugins/contextbrowser/browsemanager.cpp
index 9501ae52..ec7ffcf4 100644
--- a/kdevplatform/plugins/contextbrowser/browsemanager.cpp
+++ b/kdevplatform/plugins/contextbrowser/browsemanager.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "browsemanager.h"
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QToolButton>
 #include <kdebug.h>
 #include <ktexteditor/view.h>
diff --git a/kdevplatform/plugins/contextbrowser/contextbrowserview.cpp b/kdevplatform/plugins/contextbrowser/contextbrowserview.cpp
index f6a6c313..16a98782 100644
--- a/kdevplatform/plugins/contextbrowser/contextbrowserview.cpp
+++ b/kdevplatform/plugins/contextbrowser/contextbrowserview.cpp
@@ -26,7 +26,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QToolButton>
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 #include <QAction>
 #include <QMenu>
 #include <KIcon>
diff --git a/kdevplatform/plugins/cvs/editorsview.h b/kdevplatform/plugins/cvs/editorsview.h
index 2b9a43d9..5bf73737 100644
--- a/kdevplatform/plugins/cvs/editorsview.h
+++ b/kdevplatform/plugins/cvs/editorsview.h
@@ -12,7 +12,7 @@
 #define KDEVPLATFORM_PLUGIN_EDITORSVIEW_H
 
 #include <QDialog>
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <KJob>
 
 #include "ui_editorsview.h"
diff --git a/kdevplatform/plugins/documentswitcher/documentswitchertreeview.cpp b/kdevplatform/plugins/documentswitcher/documentswitchertreeview.cpp
index 09c3814b..b75b621b 100644
--- a/kdevplatform/plugins/documentswitcher/documentswitchertreeview.cpp
+++ b/kdevplatform/plugins/documentswitcher/documentswitchertreeview.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 #include "documentswitchertreeview.h"
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kdebug.h>
 
diff --git a/kdevplatform/plugins/documentview/kdevdocumentmodel.h b/kdevplatform/plugins/documentview/kdevdocumentmodel.h
index a7d20b7c..c176e7d0 100644
--- a/kdevplatform/plugins/documentview/kdevdocumentmodel.h
+++ b/kdevplatform/plugins/documentview/kdevdocumentmodel.h
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_PLUGIN_KDEVDOCUMENTMODEL_H
 #define KDEVPLATFORM_PLUGIN_KDEVDOCUMENTMODEL_H
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/idocument.h>
diff --git a/kdevplatform/plugins/documentview/kdevdocumentview.cpp b/kdevplatform/plugins/documentview/kdevdocumentview.cpp
index 0068cf96..60295781 100644
--- a/kdevplatform/plugins/documentview/kdevdocumentview.cpp
+++ b/kdevplatform/plugins/documentview/kdevdocumentview.cpp
@@ -24,7 +24,7 @@ Boston, MA 02110-1301, USA.
 
 #include <QDir>
 #include <QHeaderView>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 
 #include <kaction.h>
diff --git a/kdevplatform/plugins/executescript/executescriptplugin.cpp b/kdevplatform/plugins/executescript/executescriptplugin.cpp
index 9c0de2b4..4f855a1f 100644
--- a/kdevplatform/plugins/executescript/executescriptplugin.cpp
+++ b/kdevplatform/plugins/executescript/executescriptplugin.cpp
@@ -23,7 +23,7 @@
 #include "executescriptplugin.h"
 
 #include <QApplication>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <klocale.h>
 #include <kpluginfactory.h>
diff --git a/kdevplatform/plugins/externalscript/externalscriptplugin.h b/kdevplatform/plugins/externalscript/externalscriptplugin.h
index 7534ea84..08035ddb 100644
--- a/kdevplatform/plugins/externalscript/externalscriptplugin.h
+++ b/kdevplatform/plugins/externalscript/externalscriptplugin.h
@@ -23,9 +23,9 @@
 #define KDEVPLATFORM_PLUGIN_EXTERNALSCRIPTPLUGIN_H
 
 #include <interfaces/iplugin.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <KConfigGroup>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ExternalScriptItem;
 
diff --git a/kdevplatform/plugins/externalscript/externalscriptview.cpp b/kdevplatform/plugins/externalscript/externalscriptview.cpp
index 70e9cae4..8afbac7a 100644
--- a/kdevplatform/plugins/externalscript/externalscriptview.cpp
+++ b/kdevplatform/plugins/externalscript/externalscriptview.cpp
@@ -29,7 +29,7 @@
 
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <KMessageBox>
 #include <QMenu>
 
diff --git a/kdevplatform/plugins/filetemplates/CMakeLists.txt b/kdevplatform/plugins/filetemplates/CMakeLists.txt
index e28118ed..7095d2e8 100644
--- a/kdevplatform/plugins/filetemplates/CMakeLists.txt
+++ b/kdevplatform/plugins/filetemplates/CMakeLists.txt
@@ -13,14 +13,6 @@ set(kdevfiletemplates_PART_SRCS
     templateoptionspage.cpp
     templateselectionpage.cpp
     testcasespage.cpp
-
-    templatepreviewtoolview.ui
-    licensechooser.ui
-    newclass.ui
-    outputlocation.ui
-    overridevirtuals.ui
-    templateselection.ui
-    testcases.ui
 )
 
 kde4_add_plugin(kdevfiletemplates ${kdevfiletemplates_PART_SRCS})
@@ -63,7 +55,7 @@ DESTINATION ${DATA_INSTALL_DIR}/kdevcodegen/licenses
 ################
 
 set(test_srcs
-main.cpp
+    main.cpp
     templatepreview.cpp
 
     classidentifierpage.cpp
diff --git a/kdevplatform/plugins/filetemplates/filetemplatesplugin.h b/kdevplatform/plugins/filetemplates/filetemplatesplugin.h
index 3ba2af8a..21c268b0 100644
--- a/kdevplatform/plugins/filetemplates/filetemplatesplugin.h
+++ b/kdevplatform/plugins/filetemplates/filetemplatesplugin.h
@@ -3,7 +3,7 @@
 
 #include <interfaces/iplugin.h>
 #include <interfaces/itemplateprovider.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class KUrl;
 namespace KDevelop
diff --git a/kdevplatform/plugins/filetemplates/overridespage.cpp b/kdevplatform/plugins/filetemplates/overridespage.cpp
index 9b223830..b60cdb4f 100644
--- a/kdevplatform/plugins/filetemplates/overridespage.cpp
+++ b/kdevplatform/plugins/filetemplates/overridespage.cpp
@@ -29,7 +29,7 @@
 #include <language/duchain/classfunctiondeclaration.h>
 
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QHeaderView>
 
 using namespace KDevelop;
diff --git a/kdevplatform/plugins/filetemplates/templateoptionspage.cpp b/kdevplatform/plugins/filetemplates/templateoptionspage.cpp
index ea6b8717..5fc1e013 100644
--- a/kdevplatform/plugins/filetemplates/templateoptionspage.cpp
+++ b/kdevplatform/plugins/filetemplates/templateoptionspage.cpp
@@ -27,7 +27,7 @@
 #include <KIntNumInput>
 #include <KDebug>
 
-#include <QDomElement>
+#include <QtXml/qdom.h>
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QFormLayout>
diff --git a/kdevplatform/plugins/filetemplates/templateoptionspage.h b/kdevplatform/plugins/filetemplates/templateoptionspage.h
index 54ed596f..4169b040 100644
--- a/kdevplatform/plugins/filetemplates/templateoptionspage.h
+++ b/kdevplatform/plugins/filetemplates/templateoptionspage.h
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_PLUGIN_TEMPLATEOPTIONSPAGE_H
 
 #include <QWidget>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 
 
diff --git a/kdevplatform/plugins/git/gitmessagehighlighter.cpp b/kdevplatform/plugins/git/gitmessagehighlighter.cpp
index 745bf13c..21bf2138 100644
--- a/kdevplatform/plugins/git/gitmessagehighlighter.cpp
+++ b/kdevplatform/plugins/git/gitmessagehighlighter.cpp
@@ -21,7 +21,7 @@
 #include "gitmessagehighlighter.h"
 
 #include <QtCore/QString>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QtGui/QTextEdit>
 #include <KDE/KLocalizedString>
 
diff --git a/kdevplatform/plugins/grepview/grepoutputdelegate.cpp b/kdevplatform/plugins/grepview/grepoutputdelegate.cpp
index 6c923bbd..6223ffc9 100644
--- a/kdevplatform/plugins/grepview/grepoutputdelegate.cpp
+++ b/kdevplatform/plugins/grepview/grepoutputdelegate.cpp
@@ -23,11 +23,11 @@
 #include "grepoutputmodel.h"
 
 #include <QtGui/QPainter>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtGui/QTextDocument>
 #include <QtGui/QTextCursor>
 #include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QtCore/QRegExp>
 #include <KLocalizedString>
 #include <cmath>
diff --git a/kdevplatform/plugins/grepview/grepoutputmodel.cpp b/kdevplatform/plugins/grepview/grepoutputmodel.cpp
index 0c9a8a29..443ddf34 100644
--- a/kdevplatform/plugins/grepview/grepoutputmodel.cpp
+++ b/kdevplatform/plugins/grepview/grepoutputmodel.cpp
@@ -21,7 +21,7 @@
 #include <ktexteditor/document.h>
 #include <klocale.h>
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTextDocument>
 #include <interfaces/icore.h>
 #include <interfaces/idocumentcontroller.h>
diff --git a/kdevplatform/plugins/konsole/kdevkonsoleview.cpp b/kdevplatform/plugins/konsole/kdevkonsoleview.cpp
index 2efdd412..782c81e7 100644
--- a/kdevplatform/plugins/konsole/kdevkonsoleview.cpp
+++ b/kdevplatform/plugins/konsole/kdevkonsoleview.cpp
@@ -16,7 +16,7 @@
 #include <QFrame>
 #include <QLayout>
 #include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QUuid>
 
diff --git a/kdevplatform/plugins/openwith/openwithplugin.cpp b/kdevplatform/plugins/openwith/openwithplugin.cpp
index fb4a564d..3141d9d5 100644
--- a/kdevplatform/plugins/openwith/openwithplugin.cpp
+++ b/kdevplatform/plugins/openwith/openwithplugin.cpp
@@ -20,7 +20,7 @@
 
 #include "openwithplugin.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
diff --git a/kdevplatform/plugins/openwith/openwithplugin.h b/kdevplatform/plugins/openwith/openwithplugin.h
index 1a3c7c70..114eade4 100644
--- a/kdevplatform/plugins/openwith/openwithplugin.h
+++ b/kdevplatform/plugins/openwith/openwithplugin.h
@@ -22,7 +22,7 @@
 #define KDEVPLATFORM_PLUGIN_OPENWITHPLUGIN_H
 
 #include <interfaces/iplugin.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <kservice.h>
 
 #include "iopenwith.h"
diff --git a/kdevplatform/plugins/pastebin/pastebinplugin.cpp b/kdevplatform/plugins/pastebin/pastebinplugin.cpp
index aa1d872b..6d39ba22 100644
--- a/kdevplatform/plugins/pastebin/pastebinplugin.cpp
+++ b/kdevplatform/plugins/pastebin/pastebinplugin.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "pastebinplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
diff --git a/kdevplatform/plugins/patchreview/patchhighlighter.cpp b/kdevplatform/plugins/patchreview/patchhighlighter.cpp
index a0fb45c4..9739a305 100644
--- a/kdevplatform/plugins/patchreview/patchhighlighter.cpp
+++ b/kdevplatform/plugins/patchreview/patchhighlighter.cpp
@@ -34,7 +34,7 @@
 #include <interfaces/iuicontroller.h>
 
 #include <QApplication>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QWidget>
 #include <QTextDocument>
 #include <QPointer>
diff --git a/kdevplatform/plugins/patchreview/patchreviewtoolview.h b/kdevplatform/plugins/patchreview/patchreviewtoolview.h
index 26d6a977..2cd04e40 100644
--- a/kdevplatform/plugins/patchreview/patchreviewtoolview.h
+++ b/kdevplatform/plugins/patchreview/patchreviewtoolview.h
@@ -16,7 +16,7 @@
 
 #include <QWidget>
 #include <QPointer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <ui_patchreview.h>
 #include <interfaces/ipatchsource.h>
 
diff --git a/kdevplatform/plugins/problemreporter/problemwidget.cpp b/kdevplatform/plugins/problemreporter/problemwidget.cpp
index 38bde4ca..05e75e1e 100644
--- a/kdevplatform/plugins/problemreporter/problemwidget.cpp
+++ b/kdevplatform/plugins/problemreporter/problemwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <QMenu>
 #include <QCursor>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QSignalMapper>
 #include <QHeaderView>
 
diff --git a/kdevplatform/plugins/projectfilter/filtermodel.h b/kdevplatform/plugins/projectfilter/filtermodel.h
index 677bded2..a044b373 100644
--- a/kdevplatform/plugins/projectfilter/filtermodel.h
+++ b/kdevplatform/plugins/projectfilter/filtermodel.h
@@ -22,7 +22,7 @@
 #ifndef FILTERMODEL_H
 #define FILTERMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "filter.h"
 
diff --git a/kdevplatform/plugins/projectfilter/projectfilterkcm.cpp b/kdevplatform/plugins/projectfilter/projectfilterkcm.cpp
index ba94c0e5..3a092c6c 100644
--- a/kdevplatform/plugins/projectfilter/projectfilterkcm.cpp
+++ b/kdevplatform/plugins/projectfilter/projectfilterkcm.cpp
@@ -20,7 +20,7 @@
 
 #include <QLayout>
 #include <QStandardItemModel>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kpluginfactory.h>
 #include <KConfigDialogManager>
diff --git a/kdevplatform/plugins/projectfilter/projectfilterprovider.h b/kdevplatform/plugins/projectfilter/projectfilterprovider.h
index cb1fa978..9f05cb19 100644
--- a/kdevplatform/plugins/projectfilter/projectfilterprovider.h
+++ b/kdevplatform/plugins/projectfilter/projectfilterprovider.h
@@ -27,7 +27,7 @@
 
 #include "projectfilter.h"
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace KDevelop {
 
diff --git a/kdevplatform/plugins/projectmanagerview/projectbuildsetwidget.cpp b/kdevplatform/plugins/projectmanagerview/projectbuildsetwidget.cpp
index 264b9a4a..1b283975 100644
--- a/kdevplatform/plugins/projectmanagerview/projectbuildsetwidget.cpp
+++ b/kdevplatform/plugins/projectmanagerview/projectbuildsetwidget.cpp
@@ -26,7 +26,7 @@
 #include <QToolButton>
 #include <QItemSelectionModel>
 #include <QStringListModel>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStandardItemModel>
 
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/projectmanagerview/projectmanagerview.cpp b/kdevplatform/plugins/projectmanagerview/projectmanagerview.cpp
index b54f46a0..a39ef3be 100644
--- a/kdevplatform/plugins/projectmanagerview/projectmanagerview.cpp
+++ b/kdevplatform/plugins/projectmanagerview/projectmanagerview.cpp
@@ -22,7 +22,7 @@
 #include "projectmanagerview.h"
 
 #include <QtGui/QHeaderView>
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/projectmanagerview/projecttreeview.cpp b/kdevplatform/plugins/projectmanagerview/projecttreeview.cpp
index 49912b38..aff3735d 100644
--- a/kdevplatform/plugins/projectmanagerview/projecttreeview.cpp
+++ b/kdevplatform/plugins/projectmanagerview/projecttreeview.cpp
@@ -24,7 +24,7 @@
 
 #include <QtGui/QHeaderView>
 #include <QtCore/QDebug>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QAbstractProxyModel>
 #include <QItemDelegate>
diff --git a/kdevplatform/plugins/quickopen/documentationquickopenprovider.cpp b/kdevplatform/plugins/quickopen/documentationquickopenprovider.cpp
index 585826a4..c295226c 100644
--- a/kdevplatform/plugins/quickopen/documentationquickopenprovider.cpp
+++ b/kdevplatform/plugins/quickopen/documentationquickopenprovider.cpp
@@ -26,7 +26,7 @@
 #include <KLocalizedString>
 #include <QAbstractItemModel>
 #include <QDebug>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QIcon>
 
 using namespace KDevelop;
diff --git a/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.cpp b/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.cpp
index 963fb7c4..eb64ab86 100644
--- a/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.cpp
+++ b/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.cpp
@@ -21,10 +21,10 @@
 
 #include "expandingdelegate.h"
 
-#include <QtGui/QTextLine>
+#include <QtGui/qtextlayout.h>
 #include <QtGui/QPainter>
 #include <QtGui/QBrush>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QTreeView>
 #include <QApplication>
 
@@ -49,7 +49,7 @@ if (option.showDecorationSelected && (option.state & QStyle::State_Selected)) {
         return option.palette.brush(cg, QPalette::Highlight).color();
     } else {
         QVariant value = index.data(Qt::BackgroundRole);
-        if (qVariantCanConvert<QBrush>(value))
+        if (value.canConvert<QBrush>())
 	    return qvariant_cast<QBrush>(value).color();
     }
     
diff --git a/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.h b/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.h
index 7e971082..9894488e 100644
--- a/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.h
+++ b/kdevplatform/plugins/quickopen/expandingtree/expandingdelegate.h
@@ -24,8 +24,8 @@
 
 #include <QtGui/QItemDelegate>
 #include <QItemDelegate>
-#include <QtGui/QTextLine>
-#include <QModelIndex>
+#include <QtGui/qtextlayout.h>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPoint>
 
 class KateRenderer;
diff --git a/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp b/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
index a09d2b0d..fddcb332 100644
--- a/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
+++ b/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.cpp
@@ -21,7 +21,7 @@
 #include "expandingwidgetmodel.h"
 
 #include <QTreeView>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QBrush>
 
 #include <ktexteditor/codecompletionmodel.h>
diff --git a/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.h b/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.h
index 4c6eb99f..0a8b6567 100644
--- a/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.h
+++ b/kdevplatform/plugins/quickopen/expandingtree/expandingwidgetmodel.h
@@ -21,10 +21,10 @@
 #ifndef KDEVPLATFORM_PLUGIN_EXPANDING_WIDGET_MODEL_H
 #define KDEVPLATFORM_PLUGIN_EXPANDING_WIDGET_MODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QHash>
 #include <QIcon>
-#include <QPersistentModelIndex>
+
 #include <QPointer>
 
 class KWidget;
diff --git a/kdevplatform/plugins/quickopen/quickopenmodel.h b/kdevplatform/plugins/quickopen/quickopenmodel.h
index f9a0ae3f..0979e404 100644
--- a/kdevplatform/plugins/quickopen/quickopenmodel.h
+++ b/kdevplatform/plugins/quickopen/quickopenmodel.h
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_PLUGIN_QUICKOPENMODEL_H
 #define KDEVPLATFORM_PLUGIN_QUICKOPENMODEL_H
 
-#include <QMultiMap>
+#include <QtCore/qmap.h>
 #include <QString>
 #include <QAbstractItemModel>
 #include <QSet>
diff --git a/kdevplatform/plugins/quickopen/quickopenplugin.cpp b/kdevplatform/plugins/quickopen/quickopenplugin.cpp
index 879193a6..46e16250 100644
--- a/kdevplatform/plugins/quickopen/quickopenplugin.cpp
+++ b/kdevplatform/plugins/quickopen/quickopenplugin.cpp
@@ -26,12 +26,12 @@
 #include <QtGui/QTreeView>
 #include <QtGui/QHeaderView>
 #include <QDialog>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QScrollBar>
 #include <QCheckBox>
 #include <QMetaObject>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kbuttongroup.h>
 #include <klocale.h>
diff --git a/kdevplatform/plugins/reviewboard/reviewboardplugin.cpp b/kdevplatform/plugins/reviewboard/reviewboardplugin.cpp
index 4d7dbfa7..bb53283b 100644
--- a/kdevplatform/plugins/reviewboard/reviewboardplugin.cpp
+++ b/kdevplatform/plugins/reviewboard/reviewboardplugin.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "reviewboardplugin.h"
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <KPluginFactory>
 #include <KPluginLoader>
diff --git a/kdevplatform/plugins/reviewboard/reviewpatchdialog.cpp b/kdevplatform/plugins/reviewboard/reviewpatchdialog.cpp
index 1308e2ec..1999426b 100644
--- a/kdevplatform/plugins/reviewboard/reviewpatchdialog.cpp
+++ b/kdevplatform/plugins/reviewboard/reviewpatchdialog.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "reviewpatchdialog.h"
-#include <Qt>
+#include <QtCore/qnamespace.h>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <KDebug>
diff --git a/kdevplatform/plugins/snippet/legacy/snippet.h b/kdevplatform/plugins/snippet/legacy/snippet.h
index ab776461..d0dfbe51 100644
--- a/kdevplatform/plugins/snippet/legacy/snippet.h
+++ b/kdevplatform/plugins/snippet/legacy/snippet.h
@@ -12,7 +12,7 @@
 #ifndef __SNIPPET_H__
 #define __SNIPPET_H__
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 
 class SnippetRepository;
 class KAction;
diff --git a/kdevplatform/plugins/snippet/legacy/snippetrepository.cpp b/kdevplatform/plugins/snippet/legacy/snippetrepository.cpp
index b81c456c..440cc520 100644
--- a/kdevplatform/plugins/snippet/legacy/snippetrepository.cpp
+++ b/kdevplatform/plugins/snippet/legacy/snippetrepository.cpp
@@ -19,8 +19,8 @@
 #include <KIcon>
 #include <KDebug>
 
-#include <QDomDocument>
-#include <QDomElement>
+
+#include <QtXml/qdom.h>
 #include <KStandardDirs>
 
 #include <KMessageBox>
diff --git a/kdevplatform/plugins/snippet/legacy/snippetrepository.h b/kdevplatform/plugins/snippet/legacy/snippetrepository.h
index 29971a90..5ae4a7db 100644
--- a/kdevplatform/plugins/snippet/legacy/snippetrepository.h
+++ b/kdevplatform/plugins/snippet/legacy/snippetrepository.h
@@ -13,7 +13,7 @@
 #define __SNIPPETREPOSITORY_H__
 
 #include <QObject>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStringList>
 
 class Snippet;
diff --git a/kdevplatform/plugins/snippet/legacy/snippetview.cpp b/kdevplatform/plugins/snippet/legacy/snippetview.cpp
index d38311cf..e3351d6b 100644
--- a/kdevplatform/plugins/snippet/legacy/snippetview.cpp
+++ b/kdevplatform/plugins/snippet/legacy/snippetview.cpp
@@ -11,7 +11,7 @@
 
 #include "snippetview.h"
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <KMenu>
 #include <KMessageBox>
 #include <KAction>
diff --git a/kdevplatform/plugins/standardoutputview/tests/standardoutputviewtest.cpp b/kdevplatform/plugins/standardoutputview/tests/standardoutputviewtest.cpp
index e869cdb9..690db5a4 100644
--- a/kdevplatform/plugins/standardoutputview/tests/standardoutputviewtest.cpp
+++ b/kdevplatform/plugins/standardoutputview/tests/standardoutputviewtest.cpp
@@ -18,7 +18,7 @@
 
 #include <QAction>
 #include <QStackedWidget>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QItemDelegate>
 #include <QTreeView>
 
diff --git a/kdevplatform/plugins/subversion/svnaddjob.cpp b/kdevplatform/plugins/subversion/svnaddjob.cpp
index c5e81200..c1708755 100644
--- a/kdevplatform/plugins/subversion/svnaddjob.cpp
+++ b/kdevplatform/plugins/subversion/svnaddjob.cpp
@@ -21,7 +21,7 @@
 #include "svnaddjob.h"
 #include "svnaddjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svnblamejob.cpp b/kdevplatform/plugins/subversion/svnblamejob.cpp
index c67bfea3..2fc9993d 100644
--- a/kdevplatform/plugins/subversion/svnblamejob.cpp
+++ b/kdevplatform/plugins/subversion/svnblamejob.cpp
@@ -22,7 +22,7 @@
 
 #include "svnblamejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svncatjob.cpp b/kdevplatform/plugins/subversion/svncatjob.cpp
index 049786d5..ad34afa2 100644
--- a/kdevplatform/plugins/subversion/svncatjob.cpp
+++ b/kdevplatform/plugins/subversion/svncatjob.cpp
@@ -21,7 +21,7 @@
 #include "svncatjob.h"
 #include "svncatjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kdevplatform/plugins/subversion/svncheckoutjob.cpp b/kdevplatform/plugins/subversion/svncheckoutjob.cpp
index b71db9ad..59c272e0 100644
--- a/kdevplatform/plugins/subversion/svncheckoutjob.cpp
+++ b/kdevplatform/plugins/subversion/svncheckoutjob.cpp
@@ -21,7 +21,7 @@
 #include "svncheckoutjob.h"
 #include "svncheckoutjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svncommitjob.cpp b/kdevplatform/plugins/subversion/svncommitjob.cpp
index 54c0433c..c03936b2 100644
--- a/kdevplatform/plugins/subversion/svncommitjob.cpp
+++ b/kdevplatform/plugins/subversion/svncommitjob.cpp
@@ -22,7 +22,7 @@
 #include "svncommitjob.h"
 #include "svncommitjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <ThreadWeaver.h>
 #include <QStandardItemModel>
diff --git a/kdevplatform/plugins/subversion/svncopyjob.cpp b/kdevplatform/plugins/subversion/svncopyjob.cpp
index 061245eb..d22ea5be 100644
--- a/kdevplatform/plugins/subversion/svncopyjob.cpp
+++ b/kdevplatform/plugins/subversion/svncopyjob.cpp
@@ -21,7 +21,7 @@
 #include "svncopyjob.h"
 #include "svncopyjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svndiffjob.cpp b/kdevplatform/plugins/subversion/svndiffjob.cpp
index b316fbdb..d6088754 100644
--- a/kdevplatform/plugins/subversion/svndiffjob.cpp
+++ b/kdevplatform/plugins/subversion/svndiffjob.cpp
@@ -21,7 +21,7 @@
 #include "svndiffjob.h"
 #include "svndiffjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QWaitCondition>
 #include <QRegExp>
 #include <QStringList>
diff --git a/kdevplatform/plugins/subversion/svnimportjob.cpp b/kdevplatform/plugins/subversion/svnimportjob.cpp
index 7ceb2e8f..cad1cedc 100644
--- a/kdevplatform/plugins/subversion/svnimportjob.cpp
+++ b/kdevplatform/plugins/subversion/svnimportjob.cpp
@@ -21,7 +21,7 @@
 #include "svnimportjob.h"
 #include "svnimportjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QFileInfo>
 
 #include <klocale.h>
diff --git a/kdevplatform/plugins/subversion/svninfojob.cpp b/kdevplatform/plugins/subversion/svninfojob.cpp
index 06479d01..a4e1bea9 100644
--- a/kdevplatform/plugins/subversion/svninfojob.cpp
+++ b/kdevplatform/plugins/subversion/svninfojob.cpp
@@ -22,7 +22,7 @@
 
 #include "svninfojob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kdevplatform/plugins/subversion/svnlogjob.cpp b/kdevplatform/plugins/subversion/svnlogjob.cpp
index 576e9ada..5996569a 100644
--- a/kdevplatform/plugins/subversion/svnlogjob.cpp
+++ b/kdevplatform/plugins/subversion/svnlogjob.cpp
@@ -21,7 +21,7 @@
 #include "svnlogjob.h"
 #include "svnlogjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svnmovejob.cpp b/kdevplatform/plugins/subversion/svnmovejob.cpp
index b06d70b9..901768df 100644
--- a/kdevplatform/plugins/subversion/svnmovejob.cpp
+++ b/kdevplatform/plugins/subversion/svnmovejob.cpp
@@ -21,7 +21,7 @@
 #include "svnmovejob.h"
 #include "svnmovejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/subversion/svnremovejob.cpp b/kdevplatform/plugins/subversion/svnremovejob.cpp
index c2692dad..4eef628a 100644
--- a/kdevplatform/plugins/subversion/svnremovejob.cpp
+++ b/kdevplatform/plugins/subversion/svnremovejob.cpp
@@ -21,7 +21,7 @@
 #include "svnremovejob.h"
 #include "svnremovejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kdevplatform/plugins/subversion/svnrevertjob.cpp b/kdevplatform/plugins/subversion/svnrevertjob.cpp
index f7255014..546b9851 100644
--- a/kdevplatform/plugins/subversion/svnrevertjob.cpp
+++ b/kdevplatform/plugins/subversion/svnrevertjob.cpp
@@ -21,7 +21,7 @@
 #include "svnrevertjob.h"
 #include "svnrevertjob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kdevplatform/plugins/subversion/svnssldialog.cpp b/kdevplatform/plugins/subversion/svnssldialog.cpp
index 45553baa..0d83a2c4 100644
--- a/kdevplatform/plugins/subversion/svnssldialog.cpp
+++ b/kdevplatform/plugins/subversion/svnssldialog.cpp
@@ -9,7 +9,7 @@
  ***************************************************************************/
 
 #include "svnssldialog.h"
-#include <QtGui/QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <klocale.h>
 
 #include "ui_ssltrustdialog.h"
diff --git a/kdevplatform/plugins/subversion/svnstatusjob.cpp b/kdevplatform/plugins/subversion/svnstatusjob.cpp
index 78157d3c..f859302c 100644
--- a/kdevplatform/plugins/subversion/svnstatusjob.cpp
+++ b/kdevplatform/plugins/subversion/svnstatusjob.cpp
@@ -22,7 +22,7 @@
 #include "svnstatusjob_p.h"
 
 #include <QFileInfo>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <klocale.h>
 #include <kurl.h>
diff --git a/kdevplatform/plugins/subversion/svnupdatejob.cpp b/kdevplatform/plugins/subversion/svnupdatejob.cpp
index 9b742da3..a8d3d187 100644
--- a/kdevplatform/plugins/subversion/svnupdatejob.cpp
+++ b/kdevplatform/plugins/subversion/svnupdatejob.cpp
@@ -21,7 +21,7 @@
 #include "svnupdatejob.h"
 #include "svnupdatejob_p.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QDateTime>
 
 #include <kdebug.h>
diff --git a/kdevplatform/plugins/switchtobuddy/switchtobuddyplugin.h b/kdevplatform/plugins/switchtobuddy/switchtobuddyplugin.h
index e5c18375..dd041247 100644
--- a/kdevplatform/plugins/switchtobuddy/switchtobuddyplugin.h
+++ b/kdevplatform/plugins/switchtobuddy/switchtobuddyplugin.h
@@ -23,7 +23,7 @@
 #include <interfaces/iplugin.h>
 #include <interfaces/contextmenuextension.h>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 /**
  * @short Implements a context menu extension in an editor context which provides
diff --git a/kdevplatform/plugins/testview/testview.cpp b/kdevplatform/plugins/testview/testview.cpp
index 841aaea6..8048c1b7 100644
--- a/kdevplatform/plugins/testview/testview.cpp
+++ b/kdevplatform/plugins/testview/testview.cpp
@@ -47,7 +47,7 @@
 #include <KConfigGroup>
 
 #include <QStandardItemModel>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QHeaderView>
 #include <QVBoxLayout>
 
diff --git a/kdevplatform/plugins/testview/testviewplugin.h b/kdevplatform/plugins/testview/testviewplugin.h
index 22878405..c82246a4 100644
--- a/kdevplatform/plugins/testview/testviewplugin.h
+++ b/kdevplatform/plugins/testview/testviewplugin.h
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_PLUGIN_TESTVIEWPLUGIN_H
 
 #include "interfaces/iplugin.h"
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 class TestToolViewFactory;
 
diff --git a/kdevplatform/project/projectbuildsetmodel.h b/kdevplatform/project/projectbuildsetmodel.h
index c5143f08..482a44f5 100644
--- a/kdevplatform/project/projectbuildsetmodel.h
+++ b/kdevplatform/project/projectbuildsetmodel.h
@@ -23,7 +23,7 @@
 
 #include "projectexport.h"
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStringList>
 
 class KConfigGroup;
diff --git a/kdevplatform/project/projectmodel.cpp b/kdevplatform/project/projectmodel.cpp
index 75bcce5c..0ea22b54 100644
--- a/kdevplatform/project/projectmodel.cpp
+++ b/kdevplatform/project/projectmodel.cpp
@@ -39,7 +39,7 @@
 #include <KMessageBox>
 #include <kio/udsentry.h>
 #include <kio/netaccess.h>
-#include <QMetaClassInfo>
+#include <QtCore/qmetaobject.h>
 #include <QThread>
 
 #include "path.h"
diff --git a/kdevplatform/project/tests/projectmodeltest.h b/kdevplatform/project/tests/projectmodeltest.h
index 7301b72c..0a361be8 100644
--- a/kdevplatform/project/tests/projectmodeltest.h
+++ b/kdevplatform/project/tests/projectmodeltest.h
@@ -21,7 +21,7 @@
 #define KDEVELOP_PROJECT_PROJECTMODELTEST_INCLUDED
 
 #include <QtCore/QObject>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 class ProjectProxyModel;
 namespace KDevelop
diff --git a/kdevplatform/shell/CMakeLists.txt b/kdevplatform/shell/CMakeLists.txt
index efee4980..2dd3cc7f 100644
--- a/kdevplatform/shell/CMakeLists.txt
+++ b/kdevplatform/shell/CMakeLists.txt
@@ -97,7 +97,8 @@ target_link_libraries(kdevplatformshell LINK_PRIVATE
 )
 set_target_properties(kdevplatformshell PROPERTIES VERSION ${KDEVPLATFORM_LIB_VERSION} SOVERSION ${KDEVPLATFORM_LIB_SOVERSION})
 
-install(FILES
+install(
+    FILES
     mainwindow.h
     plugincontroller.h
     shellextension.h
@@ -119,7 +120,8 @@ install(FILES
     selectioncontroller.h
     runcontroller.h
     launchconfiguration.h
-    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/shell COMPONENT Devel
+    DESTINATION ${INCLUDE_INSTALL_DIR}/kdevplatform/shell
+    COMPONENT Devel
 )
 
 install(TARGETS kdevplatformshell EXPORT KDevPlatformTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/kdevplatform/shell/assistantpopup.cpp b/kdevplatform/shell/assistantpopup.cpp
index 21a72b71..aaca0aae 100644
--- a/kdevplatform/shell/assistantpopup.cpp
+++ b/kdevplatform/shell/assistantpopup.cpp
@@ -23,7 +23,7 @@
 #include "sublime/holdupdates.h"
 #include "util/kdevstringhandler.h"
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QDebug>
 #include <QTimer>
 #include <QDeclarativeContext>
diff --git a/kdevplatform/shell/core_p.h b/kdevplatform/shell/core_p.h
index e62bf94d..f07717e5 100644
--- a/kdevplatform/shell/core_p.h
+++ b/kdevplatform/shell/core_p.h
@@ -23,7 +23,7 @@
 
 #include <kcomponentdata.h>
 #include <core.h>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 namespace KDevelop
 {
diff --git a/kdevplatform/shell/debugcontroller.cpp b/kdevplatform/shell/debugcontroller.cpp
index 4c56d93a..e144bb69 100644
--- a/kdevplatform/shell/debugcontroller.cpp
+++ b/kdevplatform/shell/debugcontroller.cpp
@@ -24,7 +24,7 @@
 
 #include "debugcontroller.h"
 
-#include <QtCore/QMetaEnum>
+#include <QtCore/qmetaobject.h>
 
 #include <KDE/KLocale>
 #include <KDE/KDebug>
diff --git a/kdevplatform/shell/debugcontroller.h b/kdevplatform/shell/debugcontroller.h
index 095e7ddb..6922ec83 100644
--- a/kdevplatform/shell/debugcontroller.h
+++ b/kdevplatform/shell/debugcontroller.h
@@ -24,8 +24,8 @@
 #ifndef KDEVPLATFORM_DEBUGCONTROLLER_H
 #define KDEVPLATFORM_DEBUGCONTROLLER_H
 
-#include <QtCore/QVariantList>
-#include <QWeakPointer>
+#include <QtCore/qvariant.h>
+#include <QtCore/qsharedpointer.h>
 #include <KDE/KXMLGUIClient>
 #include <KDE/KTextEditor/MarkInterface>
 
diff --git a/kdevplatform/shell/languagecontroller.cpp b/kdevplatform/shell/languagecontroller.cpp
index 70910774..57070dcb 100644
--- a/kdevplatform/shell/languagecontroller.cpp
+++ b/kdevplatform/shell/languagecontroller.cpp
@@ -20,7 +20,7 @@
 #include "languagecontroller.h"
 
 #include <QHash>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 #include <kmimetype.h>
 
diff --git a/kdevplatform/shell/launchconfigurationdialog.h b/kdevplatform/shell/launchconfigurationdialog.h
index 98149e09..2e942963 100644
--- a/kdevplatform/shell/launchconfigurationdialog.h
+++ b/kdevplatform/shell/launchconfigurationdialog.h
@@ -23,7 +23,7 @@
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QMap>
 #include <QtCore/QList>
-#include <QtGui/QItemEditorCreatorBase>
+#include <QtGui/qitemeditorfactory.h>
 
 #include <kdialog.h>
 #include <kcombobox.h>
diff --git a/kdevplatform/shell/mainwindow.cpp b/kdevplatform/shell/mainwindow.cpp
index 431326e4..14c92f2f 100644
--- a/kdevplatform/shell/mainwindow.cpp
+++ b/kdevplatform/shell/mainwindow.cpp
@@ -24,8 +24,8 @@ Boston, MA 02110-1301, USA.
 
 #include <QtCore/QHash>
 #include <QtGui/QDockWidget>
-#include <QtGui/QDragEnterEvent>
-#include <QtGui/QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QtGui/QMenuBar>
 #include <QtDBus/QDBusConnection>
 
diff --git a/kdevplatform/shell/openprojectpage.cpp b/kdevplatform/shell/openprojectpage.cpp
index f0366178..4df2feb5 100644
--- a/kdevplatform/shell/openprojectpage.cpp
+++ b/kdevplatform/shell/openprojectpage.cpp
@@ -11,7 +11,7 @@
 #include "openprojectpage.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QHeaderView>
 
diff --git a/kdevplatform/shell/partcontroller.cpp b/kdevplatform/shell/partcontroller.cpp
index b32353d0..523a4b6a 100644
--- a/kdevplatform/shell/partcontroller.cpp
+++ b/kdevplatform/shell/partcontroller.cpp
@@ -25,7 +25,7 @@
 
 #include <QFile>
 #include <QTimer>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QApplication>
 
 #include <kdebug.h>
diff --git a/kdevplatform/shell/progresswidget/overlaywidget.cpp b/kdevplatform/shell/progresswidget/overlaywidget.cpp
index ab0cf62d..9ac7df2b 100644
--- a/kdevplatform/shell/progresswidget/overlaywidget.cpp
+++ b/kdevplatform/shell/progresswidget/overlaywidget.cpp
@@ -29,7 +29,7 @@
  */
 
 #include "overlaywidget.h"
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 #include <QEvent>
 
 using namespace KDevelop;
diff --git a/kdevplatform/shell/progresswidget/progressdialog.cpp b/kdevplatform/shell/progresswidget/progressdialog.cpp
index 548454d8..e742d141 100644
--- a/kdevplatform/shell/progresswidget/progressdialog.cpp
+++ b/kdevplatform/shell/progresswidget/progressdialog.cpp
@@ -38,7 +38,7 @@
 #include <KStandardGuiItem>
 
 #include <QApplication>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QEvent>
 #include <QFrame>
 #include <QLabel>
diff --git a/kdevplatform/shell/progresswidget/progressmanager.h b/kdevplatform/shell/progresswidget/progressmanager.h
index c7343e1a..22484040 100644
--- a/kdevplatform/shell/progresswidget/progressmanager.h
+++ b/kdevplatform/shell/progresswidget/progressmanager.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QMap>
 #include <QHash>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QPointer>
 namespace Akonadi {
 class AgentInstance;
diff --git a/kdevplatform/shell/progresswidget/statusbarprogresswidget.cpp b/kdevplatform/shell/progresswidget/statusbarprogresswidget.cpp
index 92e024ed..5e9f02e0 100644
--- a/kdevplatform/shell/progresswidget/statusbarprogresswidget.cpp
+++ b/kdevplatform/shell/progresswidget/statusbarprogresswidget.cpp
@@ -46,7 +46,7 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QProgressBar>
 #include <QPushButton>
 #include <QStackedWidget>
diff --git a/kdevplatform/shell/project.cpp b/kdevplatform/shell/project.cpp
index 59b3ad06..d78b7025 100644
--- a/kdevplatform/shell/project.cpp
+++ b/kdevplatform/shell/project.cpp
@@ -31,6 +31,7 @@
 #include <QFileInfo>
 #include <QtDBus/QtDBus>
 #include <QStandardItemModel>
+#include <QTimer>
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
diff --git a/kdevplatform/shell/savedialog.cpp b/kdevplatform/shell/savedialog.cpp
index 5865364a..007562ac 100644
--- a/kdevplatform/shell/savedialog.cpp
+++ b/kdevplatform/shell/savedialog.cpp
@@ -22,7 +22,7 @@
 
 #include <QLabel>
 #include <QListWidget>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QVBoxLayout>
 
 #include <klocale.h>
diff --git a/kdevplatform/shell/sessionchooserdialog.cpp b/kdevplatform/shell/sessionchooserdialog.cpp
index ca32a2ce..efe1e482 100644
--- a/kdevplatform/shell/sessionchooserdialog.cpp
+++ b/kdevplatform/shell/sessionchooserdialog.cpp
@@ -29,7 +29,7 @@
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <QListView>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
diff --git a/kdevplatform/shell/sessiondialog.h b/kdevplatform/shell/sessiondialog.h
index 500e9f64..55a6afda 100644
--- a/kdevplatform/shell/sessiondialog.h
+++ b/kdevplatform/shell/sessiondialog.h
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 #define KDEVPLATFORM_SESSIONDIALOG_H
 
 #include <kdialog.h>
-#include <QtCore/QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 namespace Ui
 {
diff --git a/kdevplatform/shell/settings/environmentgroupmodel.cpp b/kdevplatform/shell/settings/environmentgroupmodel.cpp
index 41232920..93b51218 100644
--- a/kdevplatform/shell/settings/environmentgroupmodel.cpp
+++ b/kdevplatform/shell/settings/environmentgroupmodel.cpp
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
 #include "environmentgroupmodel.h"
 #include <QtCore/QVariant>
 #include <QtCore/QStringList>
-#include <QtCore/QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include <kdebug.h>
 #include <KLocalizedString>
diff --git a/kdevplatform/shell/settings/environmentgroupmodel.h b/kdevplatform/shell/settings/environmentgroupmodel.h
index 3f6e8234..bc7f4c39 100644
--- a/kdevplatform/shell/settings/environmentgroupmodel.h
+++ b/kdevplatform/shell/settings/environmentgroupmodel.h
@@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA.
 #ifndef KDEVPLATFORM_ENVIRONMENTGROUPMODEL_H
 #define KDEVPLATFORM_ENVIRONMENTGROUPMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QStringList>
 #include "util/environmentgrouplist.h"
 
diff --git a/kdevplatform/shell/settings/sourceformattersettings.cpp b/kdevplatform/shell/settings/sourceformattersettings.cpp
index 46889ab1..206b7614 100644
--- a/kdevplatform/shell/settings/sourceformattersettings.cpp
+++ b/kdevplatform/shell/settings/sourceformattersettings.cpp
@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 
 #include <QVBoxLayout>
 #include <QList>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QInputDialog>
 #include <KMessageBox>
 #include <KIconLoader>
diff --git a/kdevplatform/shell/statusbar.h b/kdevplatform/shell/statusbar.h
index 0ac95085..a021ad8a 100644
--- a/kdevplatform/shell/statusbar.h
+++ b/kdevplatform/shell/statusbar.h
@@ -20,7 +20,7 @@
 #ifndef KDEVPLATFORM_STATUSBAR_H
 #define KDEVPLATFORM_STATUSBAR_H
 
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QMap>
 
 #include <KDE/KStatusBar>
diff --git a/kdevplatform/shell/workingsets/workingsetfilelabel.cpp b/kdevplatform/shell/workingsets/workingsetfilelabel.cpp
index 3abaa5c3..5c7551bc 100644
--- a/kdevplatform/shell/workingsets/workingsetfilelabel.cpp
+++ b/kdevplatform/shell/workingsets/workingsetfilelabel.cpp
@@ -18,7 +18,7 @@
 
 #include "workingsetfilelabel.h"
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
diff --git a/kdevplatform/shell/workingsets/workingsettoolbutton.cpp b/kdevplatform/shell/workingsets/workingsettoolbutton.cpp
index d3c0a224..c42963d7 100644
--- a/kdevplatform/shell/workingsets/workingsettoolbutton.cpp
+++ b/kdevplatform/shell/workingsets/workingsettoolbutton.cpp
@@ -19,7 +19,7 @@
 #include "workingsettoolbutton.h"
 
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KLocalizedString>
 #include <KColorUtils>
diff --git a/kdevplatform/sublime/aggregatemodel.cpp b/kdevplatform/sublime/aggregatemodel.cpp
index 0fd0a309..1e356d41 100644
--- a/kdevplatform/sublime/aggregatemodel.cpp
+++ b/kdevplatform/sublime/aggregatemodel.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 #include "aggregatemodel.h"
 
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 
 #include <kdebug.h>
diff --git a/kdevplatform/sublime/areaindex.h b/kdevplatform/sublime/areaindex.h
index dfeae3f6..251807b4 100644
--- a/kdevplatform/sublime/areaindex.h
+++ b/kdevplatform/sublime/areaindex.h
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_SUBLIMEAREAINDEX_H
 #define KDEVPLATFORM_SUBLIMEAREAINDEX_H
 
-#include <QtCore/Qt>
+#include <QtCore/qnamespace.h>
 #include <QtCore/QList>
 
 #include <KDE/KConfigGroup>
diff --git a/kdevplatform/sublime/container.cpp b/kdevplatform/sublime/container.cpp
index e7bee6e6..e0df641d 100644
--- a/kdevplatform/sublime/container.cpp
+++ b/kdevplatform/sublime/container.cpp
@@ -23,7 +23,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QStylePainter>
 #include <QtGui/QStackedWidget>
-#include <QtGui/QStyleOptionTabBarBase>
+#include <QtGui/qstyleoption.h>
 #include <QtGui/QToolButton>
 #include <QtGui/qstyle.h>
 
@@ -43,7 +43,7 @@
 #include "view.h"
 #include "document.h"
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include "urldocument.h"
 #include <ksqueezedtextlabel.h>
 
diff --git a/kdevplatform/sublime/controller.cpp b/kdevplatform/sublime/controller.cpp
index f6bb6aae..6fe6a72d 100644
--- a/kdevplatform/sublime/controller.cpp
+++ b/kdevplatform/sublime/controller.cpp
@@ -21,7 +21,7 @@
 #include <QMap>
 #include <QList>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 
 #include <kdebug.h>
diff --git a/kdevplatform/sublime/idealcontroller.h b/kdevplatform/sublime/idealcontroller.h
index 7cf0145e..45215484 100644
--- a/kdevplatform/sublime/idealcontroller.h
+++ b/kdevplatform/sublime/idealcontroller.h
@@ -24,7 +24,7 @@
 #define SUBLIME_IDEAL_H
 
 #include <QtGui/QAction>
-#include <QtGui/QActionEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QToolButton>
 #include <QtGui/QDockWidget>
 #include <QtGui/QStyleOption>
diff --git a/kdevplatform/sublime/idealdockwidget.cpp b/kdevplatform/sublime/idealdockwidget.cpp
index 31da011e..72898755 100644
--- a/kdevplatform/sublime/idealdockwidget.cpp
+++ b/kdevplatform/sublime/idealdockwidget.cpp
@@ -49,7 +49,7 @@ IdealDockWidget::IdealDockWidget(IdealController *controller, Sublime::MainWindo
             this, SLOT(contextMenuRequested(QPoint)));
 
     QAbstractButton *closeButton =
-    qFindChild<QAbstractButton *>(this, QLatin1String("qt_dockwidget_closebutton"));
+    this->findChild<QAbstractButton *>(QLatin1String("qt_dockwidget_closebutton"));
 
     if (closeButton) {
     disconnect(closeButton, SIGNAL(clicked()), 0, 0);
diff --git a/kdevplatform/sublime/mainwindow.cpp b/kdevplatform/sublime/mainwindow.cpp
index a874569b..1b4167e0 100644
--- a/kdevplatform/sublime/mainwindow.cpp
+++ b/kdevplatform/sublime/mainwindow.cpp
@@ -254,7 +254,7 @@ void MainWindow::loadSettings()
     // What follows is copy-paste from applyMainWindowSettings.  Unfortunately,
     // we don't really want that one to try restoring window size, and we also
     // cannot stop it from doing that in any clean way.
-    QStatusBar* sb = qFindChild<KStatusBar *>(this);
+    QStatusBar* sb = this->findChild<KStatusBar *>();
     if (sb) {
         QString entry = cg.readEntry("StatusBar", "Enabled");
         if ( entry == "Disabled" )
@@ -263,7 +263,7 @@ void MainWindow::loadSettings()
            sb->show();
     }
 
-    QMenuBar* mb = qFindChild<KMenuBar *>(this);
+    QMenuBar* mb = this->findChild<KMenuBar *>();
     if (mb) {
         QString entry = cg.readEntry ("MenuBar", "Enabled");
         if ( entry == "Disabled" )
diff --git a/kdevplatform/sublime/sublimedefs.h b/kdevplatform/sublime/sublimedefs.h
index f1139f14..d618a8b7 100644
--- a/kdevplatform/sublime/sublimedefs.h
+++ b/kdevplatform/sublime/sublimedefs.h
@@ -19,8 +19,8 @@
 #ifndef KDEVPLATFORM_SUBLIMESUBLIMEDEFS_H
 #define KDEVPLATFORM_SUBLIMESUBLIMEDEFS_H
 
-#include <QtCore/Qt>
-#include <QtCore/QFlags>
+#include <QtCore/qnamespace.h>
+#include <QtCore/qglobal.h>
 
 #include "sublimeexport.h"
 
diff --git a/kdevplatform/sublime/tests/aggregatemodeltest.cpp b/kdevplatform/sublime/tests/aggregatemodeltest.cpp
index a25006bf..da313646 100644
--- a/kdevplatform/sublime/tests/aggregatemodeltest.cpp
+++ b/kdevplatform/sublime/tests/aggregatemodeltest.cpp
@@ -19,7 +19,7 @@
 #include "aggregatemodeltest.h"
 
 #include <QtTest/QtTest>
-#include <QStandardItem>
+#include <QtGui/qstandarditemmodel.h>
 #include <QStandardItemModel>
 
 #include <sublime/aggregatemodel.h>
diff --git a/kdevplatform/sublime/tests/viewactivationtest.cpp b/kdevplatform/sublime/tests/viewactivationtest.cpp
index 13a07087..92fbf15d 100644
--- a/kdevplatform/sublime/tests/viewactivationtest.cpp
+++ b/kdevplatform/sublime/tests/viewactivationtest.cpp
@@ -23,7 +23,7 @@
 #include <QListView>
 #include <QTextEdit>
 #include <QDockWidget>
-#include <QFocusEvent>
+#include <QtGui/qevent.h>
 
 #include <sublime/view.h>
 #include <sublime/area.h>
diff --git a/kdevplatform/template/filters/kdevfilters.h b/kdevplatform/template/filters/kdevfilters.h
index 1a33fc63..e545c94f 100644
--- a/kdevplatform/template/filters/kdevfilters.h
+++ b/kdevplatform/template/filters/kdevfilters.h
@@ -24,7 +24,7 @@
 #include <grantlee/filter.h>
 
 #include <QObject>
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 namespace KDevelop {
 
diff --git a/kdevplatform/tests/json/testsuite.h b/kdevplatform/tests/json/testsuite.h
index 77eab87e..15009fbc 100644
--- a/kdevplatform/tests/json/testsuite.h
+++ b/kdevplatform/tests/json/testsuite.h
@@ -19,7 +19,7 @@
 #ifndef KDEVPLATFORM_TESTSUITE_H
 #define KDEVPLATFORM_TESTSUITE_H
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include "delayedoutput.h"
 #include <language/duchain/types/abstracttype.h>
 #include <QDebug>
diff --git a/kdevplatform/tests/modeltest.cpp b/kdevplatform/tests/modeltest.cpp
index fe1634e2..993ae2bc 100644
--- a/kdevplatform/tests/modeltest.cpp
+++ b/kdevplatform/tests/modeltest.cpp
@@ -391,27 +391,27 @@ void ModelTest::data()
     // General Purpose roles that should return a QString
     QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
     variant = model->data(model->index(0, 0), Qt::StatusTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
     variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert<QString>());
     }
 
     // General Purpose roles that should return a QSize
     variant = model->data(model->index(0, 0), Qt::SizeHintRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QSize>(variant));
+        Q_ASSERT(variant.canConvert<QSize>());
     }
 
     // General Purpose roles that should return a QFont
     QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole);
     if (fontVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QFont>(fontVariant));
+        Q_ASSERT(fontVariant.canConvert<QFont>());
     }
 
     // Check that the alignment is one we know about
@@ -424,12 +424,12 @@ void ModelTest::data()
     // General Purpose roles that should return a QColor
     QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert<QColor>());
     }
 
     colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert<QColor>());
     }
 
     // Check that the "check state" is one we know about.
diff --git a/kdevplatform/tests/testfile.cpp b/kdevplatform/tests/testfile.cpp
index 5e028d7d..773f8480 100644
--- a/kdevplatform/tests/testfile.cpp
+++ b/kdevplatform/tests/testfile.cpp
@@ -23,7 +23,7 @@
 #include "testproject.h"
 
 #include <KTemporaryFile>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTest>
 
 #include <language/duchain/duchainlock.h>
diff --git a/kdevplatform/util/activetooltip.cpp b/kdevplatform/util/activetooltip.cpp
index 0bbf163a..de9d6845 100644
--- a/kdevplatform/util/activetooltip.cpp
+++ b/kdevplatform/util/activetooltip.cpp
@@ -24,7 +24,7 @@
 #include <QPalette>
 #include <QApplication>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <limits>
 #include <kdebug.h>
 #include <qdesktopwidget.h>
diff --git a/kdevplatform/util/autoorientedsplitter.cpp b/kdevplatform/util/autoorientedsplitter.cpp
index 0de78822..c9a89143 100644
--- a/kdevplatform/util/autoorientedsplitter.cpp
+++ b/kdevplatform/util/autoorientedsplitter.cpp
@@ -19,7 +19,7 @@
 
 #include "autoorientedsplitter.h"
 
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 using namespace KDevelop;
 
diff --git a/kdevplatform/util/duchainify/main.h b/kdevplatform/util/duchainify/main.h
index dfa5a2cb..abb82995 100644
--- a/kdevplatform/util/duchainify/main.h
+++ b/kdevplatform/util/duchainify/main.h
@@ -21,7 +21,7 @@
 #define KDEVPLATFORM_MAIN_H
 
 #include <QObject>
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <language/duchain/topducontext.h>
 
 namespace KDevelop {
diff --git a/kdevplatform/util/richtextpushbutton.h b/kdevplatform/util/richtextpushbutton.h
index e0319121..5bd55d3a 100644
--- a/kdevplatform/util/richtextpushbutton.h
+++ b/kdevplatform/util/richtextpushbutton.h
@@ -23,7 +23,7 @@
  
 #include <QPushButton>
 #include <QString>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include "utilexport.h"
  
 namespace KDevelop {
diff --git a/kdevplatform/util/spinlock.h b/kdevplatform/util/spinlock.h
index cbdb904e..fd2f3401 100644
--- a/kdevplatform/util/spinlock.h
+++ b/kdevplatform/util/spinlock.h
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_SPINLOCK_H
 #define KDEVPLATFORM_SPINLOCK_H
 
-#include <QAtomicInt>
+#include <QtCore/qatomic.h>
 #include <QMutex>
 #include <QWaitCondition>
 #include <sys/time.h>
diff --git a/kdevplatform/vcs/models/vcseventmodel.cpp b/kdevplatform/vcs/models/vcseventmodel.cpp
index 0749c026..f2c5fb0a 100644
--- a/kdevplatform/vcs/models/vcseventmodel.cpp
+++ b/kdevplatform/vcs/models/vcseventmodel.cpp
@@ -20,7 +20,7 @@
 
 #include "vcseventmodel.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVariant>
 #include <QDateTime>
 #include <QList>
@@ -165,7 +165,7 @@ void VcsEventModel::jobReceivedResults(KJob* job)
     QList<KDevelop::VcsEvent> newevents;
     foreach( const QVariant &v, l )
     {
-        if( qVariantCanConvert<KDevelop::VcsEvent>( v ) )
+        if( v.canConvert<KDevelop::VcsEvent>( ) )
         {
             newevents << qvariant_cast<KDevelop::VcsEvent>( v );
         }
diff --git a/kdevplatform/vcs/models/vcseventmodel.h b/kdevplatform/vcs/models/vcseventmodel.h
index 5c9413ee..906edbd7 100644
--- a/kdevplatform/vcs/models/vcseventmodel.h
+++ b/kdevplatform/vcs/models/vcseventmodel.h
@@ -21,7 +21,7 @@
 #ifndef KDEVPLATFORM_VCSEVENTMODEL_H
 #define KDEVPLATFORM_VCSEVENTMODEL_H
 
-#include <QtCore/QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "../vcsexport.h"
 
diff --git a/kdevplatform/vcs/models/vcsitemeventmodel.cpp b/kdevplatform/vcs/models/vcsitemeventmodel.cpp
index 1df79489..5f8b863c 100644
--- a/kdevplatform/vcs/models/vcsitemeventmodel.cpp
+++ b/kdevplatform/vcs/models/vcsitemeventmodel.cpp
@@ -20,7 +20,7 @@
 
 #include "vcsitemeventmodel.h"
 
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVariant>
 #include <QList>
 
diff --git a/kfilemetadata/src/extractors/odfextractor.cpp b/kfilemetadata/src/extractors/odfextractor.cpp
index f09b3c3f..99c21906 100644
--- a/kfilemetadata/src/extractors/odfextractor.cpp
+++ b/kfilemetadata/src/extractors/odfextractor.cpp
@@ -24,8 +24,8 @@
 #include <KDebug>
 #include <KZip>
 
-#include <QDomDocument>
-#include <QXmlStreamReader>
+#include <QtXml/qdom.h>
+#include <QtCore/qxmlstream.h>
 
 using namespace KFileMetaData;
 
diff --git a/kfilemetadata/src/extractors/office2007extractor.cpp b/kfilemetadata/src/extractors/office2007extractor.cpp
index 16b84853..644ce333 100644
--- a/kfilemetadata/src/extractors/office2007extractor.cpp
+++ b/kfilemetadata/src/extractors/office2007extractor.cpp
@@ -23,8 +23,8 @@
 #include <KDebug>
 #include <KZip>
 
-#include <QDomDocument>
-#include <QXmlStreamReader>
+#include <QtXml/qdom.h>
+#include <QtCore/qxmlstream.h>
 
 using namespace KFileMetaData;
 
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 87a44e73..8110e7d1 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -34,8 +34,8 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
-#include <QKeyEvent>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
+
 #include <QtDBus/QtDBus>
 #include <kconfig.h>
 
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index d3fd1fb3..25e6223d 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -25,8 +25,8 @@
 #define FloppyData_included
 
 #include <kdialog.h>
-#include <QKeyEvent>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
+
 #include <kconfig.h>
 
 class QCheckBox;
diff --git a/kgpg/core/kgpgkey.h b/kgpg/core/kgpgkey.h
index 1e345f8d..73f6a9f1 100644
--- a/kgpg/core/kgpgkey.h
+++ b/kgpg/core/kgpgkey.h
@@ -16,7 +16,7 @@
 #define KGPGKEY_H
 
 #include <gpgme.h>
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QSharedData>
 #include <QPointer>
 #include <QObject>
diff --git a/kgpg/editor/kgpgtextedit.cpp b/kgpg/editor/kgpgtextedit.cpp
index d79b40db..84b04bfe 100644
--- a/kgpg/editor/kgpgtextedit.cpp
+++ b/kgpg/editor/kgpgtextedit.cpp
@@ -29,8 +29,8 @@
 
 #include <KLocale>
 #include <KMessageBox>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QFile>
 #include <QTextCodec>
 #include <QTextStream>
diff --git a/kgpg/keytreeview.cpp b/kgpg/keytreeview.cpp
index ada0819d..74a4458c 100644
--- a/kgpg/keytreeview.cpp
+++ b/kgpg/keytreeview.cpp
@@ -27,8 +27,8 @@
 #include <KConfigGroup>
 #include <KLocale>
 #include <KMessageBox>
-#include <QDragMoveEvent>
-#include <QDropEvent>
+
+#include <QtGui/qevent.h>
 #include <QHeaderView>
 
 KeyTreeView::KeyTreeView(QWidget *parent, KeyListProxyModel *model)
diff --git a/kgpg/kgpgkeygenerate.cpp b/kgpg/kgpgkeygenerate.cpp
index b63b10e7..2214f480 100644
--- a/kgpg/kgpgkeygenerate.cpp
+++ b/kgpg/kgpgkeygenerate.cpp
@@ -24,7 +24,7 @@
 #include <KLocale>
 #include <KMessageBox>
 #include <QGroupBox>
-#include <QIntValidator>
+#include <QtGui/qvalidator.h>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QWhatsThis>
diff --git a/kgpg/model/keylistproxymodel.cpp b/kgpg/model/keylistproxymodel.cpp
index 749fa008..6ee27b56 100644
--- a/kgpg/model/keylistproxymodel.cpp
+++ b/kgpg/model/keylistproxymodel.cpp
@@ -25,7 +25,7 @@
 #include "core/images.h"
 
 #include <KLocale>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 using namespace KgpgCore;
 
diff --git a/kgpg/transactions/kgpgdeluid.cpp b/kgpg/transactions/kgpgdeluid.cpp
index 604fbdde..1fd09be0 100644
--- a/kgpg/transactions/kgpgdeluid.cpp
+++ b/kgpg/transactions/kgpgdeluid.cpp
@@ -17,7 +17,7 @@
 #include "core/kgpgkey.h"
 #include "core/KGpgKeyNode.h"
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 KGpgDelUid::KGpgDelUid(QObject *parent, const KGpgSignableNode *uid)
 	: KGpgUidTransaction(parent, uid->getParentKeyNode()->getId(), uid->getId()),
diff --git a/kgpg/transactions/kgpgtransaction.cpp b/kgpg/transactions/kgpgtransaction.cpp
index 5d499d74..2c023dcb 100644
--- a/kgpg/transactions/kgpgtransaction.cpp
+++ b/kgpg/transactions/kgpgtransaction.cpp
@@ -26,7 +26,7 @@
 #include <QByteArray>
 #include <QPointer>
 #include <QStringList>
-#include <QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 #include <QWidget>
 
 class KGpgTransactionPrivate {
diff --git a/kmix/backends/mixer_backend.h b/kmix/backends/mixer_backend.h
index e6208e4c..5e9ef1d1 100644
--- a/kmix/backends/mixer_backend.h
+++ b/kmix/backends/mixer_backend.h
@@ -23,7 +23,7 @@
 #define MIXER_BACKEND_H
 
 #include <QString>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTimer>
 
 //#include "core/mixer.h"
diff --git a/kmix/backends/mixer_mpris2.h b/kmix/backends/mixer_mpris2.h
index ef61dcb2..307243f3 100644
--- a/kmix/backends/mixer_mpris2.h
+++ b/kmix/backends/mixer_mpris2.h
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QtDBus>
 #include <QDBusInterface>
-#include <QDBusPendingCallWatcher>
+#include <QtDBus/qdbuspendingcall.h>
 #include <QMap>
 #include <QMutex>
 #include <QWaitCondition>
diff --git a/kmix/core/ControlManager.cpp b/kmix/core/ControlManager.cpp
index 75464f0b..ba6da222 100644
--- a/kmix/core/ControlManager.cpp
+++ b/kmix/core/ControlManager.cpp
@@ -20,7 +20,7 @@
 #include "ControlManager.h"
 #include "core/GlobalConfig.h"
 
-#include <QMutableListIterator>
+#include <QtCore/qlist.h>
 
 #include <KDebug>
 
diff --git a/kmix/core/GlobalConfig.h b/kmix/core/GlobalConfig.h
index c561f3eb..2fc7ab51 100644
--- a/kmix/core/GlobalConfig.h
+++ b/kmix/core/GlobalConfig.h
@@ -20,7 +20,7 @@
 #ifndef GLOBALCONFIG_H
 #define GLOBALCONFIG_H
 
-#include <Qt>
+#include <QtCore/qnamespace.h>
 #include <QSet>
 
 #include <KConfigSkeleton>
diff --git a/kmix/gui/dialogviewconfiguration.h b/kmix/gui/dialogviewconfiguration.h
index 3a60f464..cdb178f8 100644
--- a/kmix/gui/dialogviewconfiguration.h
+++ b/kmix/gui/dialogviewconfiguration.h
@@ -32,7 +32,7 @@ class QScrollArea;
 class QVBoxLayout;
 
 // QT DND
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QMimeData>
 
 // KDE
diff --git a/kmix/gui/ksmallslider.cpp b/kmix/gui/ksmallslider.cpp
index 1f3ed21d..4dde3e74 100644
--- a/kmix/gui/ksmallslider.cpp
+++ b/kmix/gui/ksmallslider.cpp
@@ -30,9 +30,9 @@
 #include <qpainter.h>
 #include <QColor>
 #include <qbrush.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <qstyle.h>
-#include <QStyleOptionSlider>
+#include <QtGui/qstyleoption.h>
 
 #include "kglobalsettings.h"
 #include "core/mixer.h"
diff --git a/kmix/gui/mdwenum.cpp b/kmix/gui/mdwenum.cpp
index b4102dda..ae3caf18 100644
--- a/kmix/gui/mdwenum.cpp
+++ b/kmix/gui/mdwenum.cpp
@@ -39,7 +39,7 @@
 // Qt
 #include <QCursor>
 #include <QLabel>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QObject>
 #include <QBoxLayout>
 
diff --git a/kmix/gui/mdwslider.cpp b/kmix/gui/mdwslider.cpp
index 3764dc8e..697873da 100644
--- a/kmix/gui/mdwslider.cpp
+++ b/kmix/gui/mdwslider.cpp
@@ -36,7 +36,7 @@
 #include <QObject>
 #include <qcursor.h>
 #include <QCheckBox>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QLabel>
 #include <qpixmap.h>
 #include <qwmatrix.h>
diff --git a/kmix/gui/mdwswitch.cpp b/kmix/gui/mdwswitch.cpp
index 3a922f0b..ab1b8287 100644
--- a/kmix/gui/mdwswitch.cpp
+++ b/kmix/gui/mdwswitch.cpp
@@ -21,7 +21,7 @@
 //
 //#include <qcursor.h>
 //#include <QLabel>
-//#include <QMouseEvent>
+//#include <QtGui/qevent.h>
 //#include <QObject>
 //
 //#include <klocale.h>
diff --git a/kmix/gui/mixdevicewidget.cpp b/kmix/gui/mixdevicewidget.cpp
index ae5c224b..22eaaa53 100644
--- a/kmix/gui/mixdevicewidget.cpp
+++ b/kmix/gui/mixdevicewidget.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 
 #include <qcursor.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <qpixmap.h>
 #include <qwmatrix.h>
 
diff --git a/kmix/gui/viewbase.cpp b/kmix/gui/viewbase.cpp
index bcd76da3..1ba15817 100644
--- a/kmix/gui/viewbase.cpp
+++ b/kmix/gui/viewbase.cpp
@@ -23,7 +23,7 @@
 
 // QT
 #include <qcursor.h>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 // KDE
 #include <kaction.h>
diff --git a/kolourpaint/CMakeLists.txt b/kolourpaint/CMakeLists.txt
index f214b622..0a53661d 100644
--- a/kolourpaint/CMakeLists.txt
+++ b/kolourpaint/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(kolourpaint)
 
-find_package(KDE4 4.14.3 REQUIRED)
-include(KDE4Defaults)
-
 find_package(QImageBlitz REQUIRED)
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 
diff --git a/kolourpaint/commands/kpMacroCommand.cpp b/kolourpaint/commands/kpMacroCommand.cpp
index aa9031b0..b5ec76d2 100644
--- a/kolourpaint/commands/kpMacroCommand.cpp
+++ b/kolourpaint/commands/kpMacroCommand.cpp
@@ -34,7 +34,7 @@
 
 #include <climits>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 //---------------------------------------------------------------------
 
diff --git a/kolourpaint/imagelib/effects/kpEffectBlurSharpen.cpp b/kolourpaint/imagelib/effects/kpEffectBlurSharpen.cpp
index fa29f5b7..35a2fe7e 100644
--- a/kolourpaint/imagelib/effects/kpEffectBlurSharpen.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectBlurSharpen.cpp
@@ -42,7 +42,7 @@
 
 
 #if DEBUG_KP_EFFECT_BLUR_SHARPEN
-    #include <QTime>
+    #include <QtCore/qdatetime.h>
 #endif
 
 
diff --git a/kolourpaint/layers/selections/text/kpPreeditText.h b/kolourpaint/layers/selections/text/kpPreeditText.h
index 2870a19b..92200f63 100644
--- a/kolourpaint/layers/selections/text/kpPreeditText.h
+++ b/kolourpaint/layers/selections/text/kpPreeditText.h
@@ -30,7 +30,7 @@
 #define kpPreeditText_H
 
 #include <QColor>
-#include <QInputMethodEvent>
+#include <QtGui/qevent.h>
 #include <QPoint>
 
 class kpPreeditText
diff --git a/kolourpaint/layers/selections/text/kpTextSelection_Paint.cpp b/kolourpaint/layers/selections/text/kpTextSelection_Paint.cpp
index 94a8ec9c..42ef3001 100644
--- a/kolourpaint/layers/selections/text/kpTextSelection_Paint.cpp
+++ b/kolourpaint/layers/selections/text/kpTextSelection_Paint.cpp
@@ -39,7 +39,7 @@
 #include <QFont>
 #include <QList>
 #include <QPainter>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 #include <KDebug>
 
diff --git a/kolourpaint/layers/selections/text/kpTextStyle.cpp b/kolourpaint/layers/selections/text/kpTextStyle.cpp
index ce0b0ec0..9b4390ec 100644
--- a/kolourpaint/layers/selections/text/kpTextStyle.cpp
+++ b/kolourpaint/layers/selections/text/kpTextStyle.cpp
@@ -29,6 +29,7 @@
 #include <kpTextStyle.h>
 
 #include <qdatastream.h>
+#include <qrect.h>
 #include <qfont.h>
 #include <qfontmetrics.h>
 
diff --git a/kolourpaint/lgpl/generic/widgets/kpColorCellsBase.cpp b/kolourpaint/lgpl/generic/widgets/kpColorCellsBase.cpp
index f5f088f6..fb280784 100644
--- a/kolourpaint/lgpl/generic/widgets/kpColorCellsBase.cpp
+++ b/kolourpaint/lgpl/generic/widgets/kpColorCellsBase.cpp
@@ -25,12 +25,12 @@
 
 #include <kpColorCellsBase.h>
 
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
+
 #include <QHeaderView>
 #include <QItemDelegate>
-#include <QMouseEvent>
+
 #include <QPainter>
 #include <QImage>
 
diff --git a/kolourpaint/tools/kpTool_MouseEvents.cpp b/kolourpaint/tools/kpTool_MouseEvents.cpp
index 83f106c1..90a71f64 100644
--- a/kolourpaint/tools/kpTool_MouseEvents.cpp
+++ b/kolourpaint/tools/kpTool_MouseEvents.cpp
@@ -40,7 +40,7 @@
 #include <kpView.h>
 #include <kpViewManager.h>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QClipboard>
 
diff --git a/kolourpaint/views/kpView_Events.cpp b/kolourpaint/views/kpView_Events.cpp
index 95325615..604b621f 100644
--- a/kolourpaint/views/kpView_Events.cpp
+++ b/kolourpaint/views/kpView_Events.cpp
@@ -39,8 +39,8 @@
 #include <KDebug>
 #endif
 
-#include <QKeyEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 
 #include <kpTool.h>
 
diff --git a/kolourpaint/views/kpView_Paint.cpp b/kolourpaint/views/kpView_Paint.cpp
index 55468095..61780a78 100644
--- a/kolourpaint/views/kpView_Paint.cpp
+++ b/kolourpaint/views/kpView_Paint.cpp
@@ -34,8 +34,8 @@
 #include <kpViewPrivate.h>
 
 #include <QPainter>
-#include <QPaintEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QScrollBar>
 
 #include <KDebug>
diff --git a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
index 32b472ab..123d8fef 100644
--- a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
+++ b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.cpp
@@ -34,7 +34,7 @@
 #include <math.h>
 
 #include <QPainter>
-#include <QPolygonF>
+#include <QtGui/qpolygon.h>
 
 #include <kdebug.h>
 
diff --git a/kolourpaint/widgets/kpColorCells.cpp b/kolourpaint/widgets/kpColorCells.cpp
index 72d8259f..af8da8a0 100644
--- a/kolourpaint/widgets/kpColorCells.cpp
+++ b/kolourpaint/widgets/kpColorCells.cpp
@@ -31,8 +31,8 @@
 
 #include <kpColorCells.h>
 
-#include <QContextMenuEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QScrollBar>
 
 #include <KColorDialog>
diff --git a/kolourpaint/widgets/kpDualColorButton.cpp b/kolourpaint/widgets/kpDualColorButton.cpp
index b5c73669..5c53a64a 100644
--- a/kolourpaint/widgets/kpDualColorButton.cpp
+++ b/kolourpaint/widgets/kpDualColorButton.cpp
@@ -32,7 +32,7 @@
 #include <kpDualColorButton.h>
 
 #include <QBitmap>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 
 #include <KColorDialog>
diff --git a/kolourpaint/widgets/kpTransparentColorCell.cpp b/kolourpaint/widgets/kpTransparentColorCell.cpp
index 3f8af8ba..60ef9238 100644
--- a/kolourpaint/widgets/kpTransparentColorCell.cpp
+++ b/kolourpaint/widgets/kpTransparentColorCell.cpp
@@ -31,8 +31,8 @@
 
 #include <kpTransparentColorCell.h>
 
-#include <QContextMenuEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QPainter>
 
 #include <KIconLoader>
diff --git a/kolourpaint/widgets/toolbars/kpColorToolBar.cpp b/kolourpaint/widgets/toolbars/kpColorToolBar.cpp
index f883b3b9..891d6237 100644
--- a/kolourpaint/widgets/toolbars/kpColorToolBar.cpp
+++ b/kolourpaint/widgets/toolbars/kpColorToolBar.cpp
@@ -32,8 +32,8 @@
 #include <kpColorToolBar.h>
 
 #include <QBoxLayout>
-#include <QDragEnterEvent>
-#include <QDragMoveEvent>
+#include <QtGui/qevent.h>
+
 
 #include <KColorMimeData>
 #include <kdebug.h>
diff --git a/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.cpp b/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.cpp
index 22672d32..072675e8 100644
--- a/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.cpp
+++ b/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.cpp
@@ -34,7 +34,7 @@
 #include <qbitmap.h>
 #include <qcolor.h>
 #include <qevent.h>
-#include <QHelpEvent>
+#include <QtGui/qevent.h>
 #include <qimage.h>
 #include <qpainter.h>
 #include <qpixmap.h>
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index eb08329b..7cf58ce7 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -23,7 +23,7 @@
 
 #include <QtGui/QSplitter>
 #include <QtGui/QTreeWidget>
-#include <QtGui/QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 #include <kparts/part.h>
 #include <kompare.h>
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 0c4d3dd4..cc985ca8 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -22,7 +22,7 @@
 
 #include <kparts/factory.h>
 #include <kparts/part.h>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 #include <kompare.h>
 
 #include "kompareinterface.h"
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 7210b81c..2b6f79ae 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -24,9 +24,9 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QStyle>
 #include <QtCore/QTimer>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QFrame>
-#include <QtGui/QMouseEvent>
+
 
 #include <kdebug.h>
 
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index 03eb746c..9e67581e 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -22,8 +22,8 @@
 
 #include <QtGui/QWidget>
 #include <QtGui/QSplitter>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QMouseEvent>
+#include <QtGui/qevent.h>
+
 #include <QVBoxLayout>
 #include <QtGui/QLabel>
 
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 759d96aa..2a475841 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -23,9 +23,9 @@
 #include <QtGui/QPainter>
 #include <QtCore/QRegExp>
 #include <QtCore/QTimer>
-#include <QtGui/QResizeEvent>
-#include <QtGui/QMouseEvent>
-#include <QtGui/QWheelEvent>
+
+
+#include <QtGui/qevent.h>
 #include <QtGui/QScrollBar>
 
 #include <kdebug.h>
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index 7c5c26c3..128d529b 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -22,10 +22,10 @@
 
 #include <QHash>
 #include <QLabel>
-#include <QResizeEvent>
-#include <QWheelEvent>
+
+#include <QtGui/qevent.h>
 #include <QVBoxLayout>
-#include <QMouseEvent>
+
 #include <QFrame>
 #include <QTreeWidget>
 #include <QStyledItemDelegate>
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 4ea8930b..f13243a9 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -28,12 +28,12 @@
 #include <QtGui/QApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
-#include <QtGui/QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QGridLayout>
-#include <QtGui/QResizeEvent>
-#include <QtCore/QChildEvent>
+
+#include <QtCore/qcoreevent.h>
 #include <QtCore/QEvent>
-#include <QtGui/QWheelEvent>
+
 
 // kde
 #include <kdebug.h>
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index 949c4936..f5e76f1f 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -16,7 +16,7 @@
 **
 ***************************************************************************/
 #include "kompareurldialog.h"
-#include <QShowEvent>
+#include <QtGui/qevent.h>
 
 #include <QGroupBox>
 
diff --git a/krdc/config/hostpreferenceslist.h b/krdc/config/hostpreferenceslist.h
index 0b515638..050cae08 100644
--- a/krdc/config/hostpreferenceslist.h
+++ b/krdc/config/hostpreferenceslist.h
@@ -28,7 +28,7 @@
 
 #include <KConfigGroup>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QWidget>
 
 class KPushButton;
diff --git a/krdc/core/hostpreferences.h b/krdc/core/hostpreferences.h
index 21ed3b76..eb345ed6 100644
--- a/krdc/core/hostpreferences.h
+++ b/krdc/core/hostpreferences.h
@@ -30,7 +30,7 @@
 
 #include <KDialog>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 #include <QSize>
 
diff --git a/krdc/floatingtoolbar.cpp b/krdc/floatingtoolbar.cpp
index d04b7c37..e04c2ec2 100644
--- a/krdc/floatingtoolbar.cpp
+++ b/krdc/floatingtoolbar.cpp
@@ -31,7 +31,7 @@
 #include <QApplication>
 #include <QBitmap>
 #include <QDesktopWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPainter>
 #include <QTimer>
 
diff --git a/krdc/krdc_approver/approvermanager.cpp b/krdc/krdc_approver/approvermanager.cpp
index 5e78fca1..bf3ced73 100644
--- a/krdc/krdc_approver/approvermanager.cpp
+++ b/krdc/krdc_approver/approvermanager.cpp
@@ -25,7 +25,7 @@
 #include "approvermanager.h"
 #include "approver.h"
 
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 #include <QDBusConnection>
 
 #include <KApplication>
diff --git a/krdc/main.cpp b/krdc/main.cpp
index afc4531b..9a54011e 100644
--- a/krdc/main.cpp
+++ b/krdc/main.cpp
@@ -30,7 +30,7 @@
 #include <KAboutData>
 #include <KDebug>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 int main(int argc, char **argv)
 {
diff --git a/krdc/mainwindow.h b/krdc/mainwindow.h
index 7f15bb1b..e3a9266d 100644
--- a/krdc/mainwindow.h
+++ b/krdc/mainwindow.h
@@ -140,7 +140,7 @@ private:
 
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 class MinimizePixel : public QWidget
 {
diff --git a/krdc/nx/nxresumesessions.cpp b/krdc/nx/nxresumesessions.cpp
index 329b02a9..39bd8133 100644
--- a/krdc/nx/nxresumesessions.cpp
+++ b/krdc/nx/nxresumesessions.cpp
@@ -24,7 +24,7 @@
 #include "nxresumesessions.h"
 
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QVBoxLayout>
 
 #include <KTitleWidget>
diff --git a/krdc/nx/nxview.h b/krdc/nx/nxview.h
index 6a975f76..345573df 100644
--- a/krdc/nx/nxview.h
+++ b/krdc/nx/nxview.h
@@ -30,7 +30,7 @@
 #include "nxhostpreferences.h"
 #include "nxresumesessions.h"
 
-#include <QX11EmbedContainer>
+#include <QtGui/qx11embed_x11.h>
 
 #define TCP_PORT_NX 22
 
diff --git a/krdc/rdp/rdpview.cpp b/krdc/rdp/rdpview.cpp
index 3e6bb970..cbedf150 100644
--- a/krdc/rdp/rdpview.cpp
+++ b/krdc/rdp/rdpview.cpp
@@ -33,7 +33,7 @@
 #include <KShell>
 #include <KLocale>
 
-#include <QX11EmbedContainer>
+#include <QtGui/qx11embed_x11.h>
 #include <QEvent>
 
 RdpView::RdpView(QWidget *parent,
diff --git a/krdc/remotedesktopsmodel.h b/krdc/remotedesktopsmodel.h
index d7f1d84f..6bb2ac64 100644
--- a/krdc/remotedesktopsmodel.h
+++ b/krdc/remotedesktopsmodel.h
@@ -25,7 +25,7 @@
 #ifndef REMOTEDESKTOPSMODEL_H
 #define REMOTEDESKTOPSMODEL_H
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <KDateTime>
 
 #ifdef BUILD_ZEROCONF
diff --git a/krdc/vnc/vncclientthread.cpp b/krdc/vnc/vncclientthread.cpp
index e85898ea..ca2e8e40 100644
--- a/krdc/vnc/vncclientthread.cpp
+++ b/krdc/vnc/vncclientthread.cpp
@@ -28,7 +28,7 @@
 #include <netinet/tcp.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QThreadStorage>
 #include <QTimer>
 
diff --git a/krdc/vnc/vncview.cpp b/krdc/vnc/vncview.cpp
index a1e0b0a0..6f1630d1 100644
--- a/krdc/vnc/vncview.cpp
+++ b/krdc/vnc/vncview.cpp
@@ -26,7 +26,7 @@
 #include <QApplication>
 #include <QImage>
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #ifdef QTONLY
     #include <QMessageBox>
diff --git a/krfb/krfb/framebuffermanager.h b/krfb/krfb/framebuffermanager.h
index d018c6aa..2935bf00 100644
--- a/krfb/krfb/framebuffermanager.h
+++ b/krfb/krfb/framebuffermanager.h
@@ -28,7 +28,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
-#include <QtCore/QWeakPointer>
+#include <QtCore/qsharedpointer.h>
 
 #include <QtGui/QWidget>
 
diff --git a/krfb/krfb/framebufferplugin.h b/krfb/krfb/framebufferplugin.h
index 11ab081e..190354e1 100644
--- a/krfb/krfb/framebufferplugin.h
+++ b/krfb/krfb/framebufferplugin.h
@@ -23,7 +23,7 @@
 
 #include <kdemacros.h>
 
-#include <QtCore/QVariantList>
+#include <QtCore/qvariant.h>
 
 #include <QtGui/QWidget>
 
diff --git a/ksnapshot/freeregiongrabber.cpp b/ksnapshot/freeregiongrabber.cpp
index 07a66f7f..be96de59 100644
--- a/ksnapshot/freeregiongrabber.cpp
+++ b/ksnapshot/freeregiongrabber.cpp
@@ -21,7 +21,7 @@
 
 #include <QPainter>
 #include <QPaintEngine>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QToolTip>
diff --git a/ksnapshot/kbackgroundsnapshot.cpp b/ksnapshot/kbackgroundsnapshot.cpp
index 494540f6..e05db5d1 100644
--- a/ksnapshot/kbackgroundsnapshot.cpp
+++ b/ksnapshot/kbackgroundsnapshot.cpp
@@ -31,7 +31,7 @@
 #include <KGlobalSettings>
 #include <kio/netaccess.h>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPixmap>
 #include <QDesktopWidget>
 
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 24abed0e..7d69253d 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -31,11 +31,11 @@
 #include <QMenu>
 #include <QDesktopWidget>
 #include <QVarLengthArray>
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <QDrag>
-#include <QMouseEvent>
+
 #include <QPainter>
-#include <QtCore/QXmlStreamReader>
+#include <QtCore/qxmlstream.h>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
diff --git a/ksnapshot/ksnapshotpreview.cpp b/ksnapshot/ksnapshotpreview.cpp
index f2f45261..c377c4b7 100644
--- a/ksnapshot/ksnapshotpreview.cpp
+++ b/ksnapshot/ksnapshotpreview.cpp
@@ -21,7 +21,7 @@
 #include "ksnapshotpreview.h"
 
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QPixmap>
 
 #include <KDebug>
diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp
index e254be56..09509a21 100644
--- a/ksnapshot/regiongrabber.cpp
+++ b/ksnapshot/regiongrabber.cpp
@@ -19,7 +19,7 @@
 #include "regiongrabber.h"
 
 #include <QPainter>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QToolTip>
diff --git a/ksnapshot/snapshottimer.cpp b/ksnapshot/snapshottimer.cpp
index 843f06df..ecc5a8f9 100644
--- a/ksnapshot/snapshottimer.cpp
+++ b/ksnapshot/snapshottimer.cpp
@@ -19,7 +19,7 @@
 
 #include "snapshottimer.h"
 #include <QPainter>
-#include <QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QToolTip>
 #include <QApplication>
 #include <QDesktopWidget>
diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp
index 68f737f7..6a8be027 100644
--- a/ksnapshot/windowgrabber.cpp
+++ b/ksnapshot/windowgrabber.cpp
@@ -30,8 +30,8 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPoint>
-#include <QMouseEvent>
-#include <QWheelEvent>
+
+#include <QtGui/qevent.h>
 
 #ifdef Q_WS_X11
 #include <X11/Xlib.h>
diff --git a/ksystemlog/src/lib/logViewWidgetItem.cpp b/ksystemlog/src/lib/logViewWidgetItem.cpp
index ad467abe..f8ece695 100644
--- a/ksystemlog/src/lib/logViewWidgetItem.cpp
+++ b/ksystemlog/src/lib/logViewWidgetItem.cpp
@@ -23,7 +23,7 @@
 
 //Qt includes
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 
 #include <QBrush>
diff --git a/ksystemlog/src/lib/logViewWidgetItem.h b/ksystemlog/src/lib/logViewWidgetItem.h
index e13eae9c..a6a5b5f8 100644
--- a/ksystemlog/src/lib/logViewWidgetItem.h
+++ b/ksystemlog/src/lib/logViewWidgetItem.h
@@ -23,7 +23,7 @@
 #define LOG_VIEW_WIDGET_ITEM_H
 
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 
 
 #include "globals.h"
diff --git a/ksystemlog/src/lib/view.cpp b/ksystemlog/src/lib/view.cpp
index 3f4120fa..e3f97bce 100644
--- a/ksystemlog/src/lib/view.cpp
+++ b/ksystemlog/src/lib/view.cpp
@@ -23,8 +23,8 @@
 
 #include <QWidget>
 
-#include <QDropEvent>
-#include <QDragEnterEvent>
+
+#include <QtGui/qevent.h>
 #include <QFileInfo>
 
 #include <QPushButton>
diff --git a/ksystemlog/src/modes/base/logLevelFileList.cpp b/ksystemlog/src/modes/base/logLevelFileList.cpp
index 83693445..0e44c188 100644
--- a/ksystemlog/src/modes/base/logLevelFileList.cpp
+++ b/ksystemlog/src/modes/base/logLevelFileList.cpp
@@ -23,7 +23,7 @@
 
 #include <QString>
 #include <QStringList>
-#include <QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 
 #include <QPushButton>
 
diff --git a/ksystemlog/src/statusBar.cpp b/ksystemlog/src/statusBar.cpp
index e3a29deb..3f1a3e91 100644
--- a/ksystemlog/src/statusBar.cpp
+++ b/ksystemlog/src/statusBar.cpp
@@ -24,7 +24,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QComboBox>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kicon.h>
 #include <kglobal.h>
diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui
index 4449edf8..c1172fd1 100644
--- a/ktimer/prefwidget.ui
+++ b/ktimer/prefwidget.ui
@@ -131,7 +131,7 @@
         <property name="whatsThis">
          <string>This number is how many seconds are left for the selected countdown.</string>
         </property>
-        <property name="numDigits">
+        <property name="digitCount">
          <number>6</number>
         </property>
        </widget>
diff --git a/kuassel/src/client/abstractui.h b/kuassel/src/client/abstractui.h
index 9ae112fb..74c53866 100644
--- a/kuassel/src/client/abstractui.h
+++ b/kuassel/src/client/abstractui.h
@@ -22,7 +22,7 @@
 #define ABSTRACTUI_H
 
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 //#include "message.h"
 
 class MessageFilter;
diff --git a/kuassel/src/client/clientauthhandler.cpp b/kuassel/src/client/clientauthhandler.cpp
index 979def53..a34b530a 100644
--- a/kuassel/src/client/clientauthhandler.cpp
+++ b/kuassel/src/client/clientauthhandler.cpp
@@ -22,7 +22,7 @@
 
 // TODO: support system application proxy (new in Qt 4.6)
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 
 #ifdef HAVE_SSL
     #include <QSslSocket>
diff --git a/kuassel/src/client/coreaccount.h b/kuassel/src/client/coreaccount.h
index 22c2ee71..64fe12bd 100644
--- a/kuassel/src/client/coreaccount.h
+++ b/kuassel/src/client/coreaccount.h
@@ -24,7 +24,7 @@
 #include <QCoreApplication>
 #include <QNetworkProxy>
 #include <QUuid>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include <KLocale>
 
diff --git a/kuassel/src/client/coreaccountmodel.h b/kuassel/src/client/coreaccountmodel.h
index 2741f4f7..72e2b62f 100644
--- a/kuassel/src/client/coreaccountmodel.h
+++ b/kuassel/src/client/coreaccountmodel.h
@@ -21,7 +21,7 @@
 #ifndef COREACCOUNTMODEL_H_
 #define COREACCOUNTMODEL_H_
 
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUuid>
 
 #include "coreaccount.h"
diff --git a/kuassel/src/common/aliasmanager.h b/kuassel/src/common/aliasmanager.h
index a536fe12..5655d80f 100644
--- a/kuassel/src/common/aliasmanager.h
+++ b/kuassel/src/common/aliasmanager.h
@@ -21,7 +21,7 @@
 #ifndef ALIASMANAGER_H
 #define ALIASMANAGER_H
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "bufferinfo.h"
 #include "syncableobject.h"
diff --git a/kuassel/src/common/basichandler.cpp b/kuassel/src/common/basichandler.cpp
index ebddf1c8..d81a75df 100644
--- a/kuassel/src/common/basichandler.cpp
+++ b/kuassel/src/common/basichandler.cpp
@@ -20,7 +20,7 @@
 
 #include "basichandler.h"
 
-#include <QMetaMethod>
+#include <QtCore/qmetaobject.h>
 
 #include <KDebug>
 
diff --git a/kuassel/src/common/basichandler.h b/kuassel/src/common/basichandler.h
index bf57790b..8f31e890 100644
--- a/kuassel/src/common/basichandler.h
+++ b/kuassel/src/common/basichandler.h
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
-#include <QGenericArgument>
+#include <QtCore/qobjectdefs.h>
 
 class BasicHandler : public QObject
 {
diff --git a/kuassel/src/common/eventmanager.h b/kuassel/src/common/eventmanager.h
index e3b29800..98e927a5 100644
--- a/kuassel/src/common/eventmanager.h
+++ b/kuassel/src/common/eventmanager.h
@@ -21,7 +21,7 @@
 #ifndef EVENTMANAGER_H
 #define EVENTMANAGER_H
 
-#include <QMetaEnum>
+#include <QtCore/qmetaobject.h>
 
 #include "types.h"
 
diff --git a/kuassel/src/common/identity.cpp b/kuassel/src/common/identity.cpp
index d59afe5e..111227b2 100644
--- a/kuassel/src/common/identity.cpp
+++ b/kuassel/src/common/identity.cpp
@@ -20,8 +20,8 @@
 
 #include "identity.h"
 
-#include <QMetaProperty>
-#include <QVariantMap>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qvariant.h>
 #include <QString>
 
 #include <KLocale>
diff --git a/kuassel/src/common/ircchannel.cpp b/kuassel/src/common/ircchannel.cpp
index 4eb5bfef..5007acf1 100644
--- a/kuassel/src/common/ircchannel.cpp
+++ b/kuassel/src/common/ircchannel.cpp
@@ -24,8 +24,8 @@
 #include "ircuser.h"
 #include "util.h"
 
-#include <QMapIterator>
-#include <QHashIterator>
+#include <QtCore/qmap.h>
+#include <QtCore/qhash.h>
 #include <QTextCodec>
 
 #include <KDebug>
diff --git a/kuassel/src/common/ircchannel.h b/kuassel/src/common/ircchannel.h
index 693ed9c5..16aed349 100644
--- a/kuassel/src/common/ircchannel.h
+++ b/kuassel/src/common/ircchannel.h
@@ -25,7 +25,7 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "syncableobject.h"
 
diff --git a/kuassel/src/common/ircuser.h b/kuassel/src/common/ircuser.h
index 3424a63c..e7accfad 100644
--- a/kuassel/src/common/ircuser.h
+++ b/kuassel/src/common/ircuser.h
@@ -24,7 +24,7 @@
 #include <QSet>
 #include <QString>
 #include <QStringList>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include <QDateTime>
 
 #include "syncableobject.h"
diff --git a/kuassel/src/common/network.h b/kuassel/src/common/network.h
index b8210529..77949a4f 100644
--- a/kuassel/src/common/network.h
+++ b/kuassel/src/common/network.h
@@ -26,7 +26,7 @@
 #include <QList>
 #include <QNetworkProxy>
 #include <QHash>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 #include <QPointer>
 #include <QMutex>
 #include <QByteArray>
diff --git a/kuassel/src/common/networkevent.h b/kuassel/src/common/networkevent.h
index 82a4b8dd..d327acf9 100644
--- a/kuassel/src/common/networkevent.h
+++ b/kuassel/src/common/networkevent.h
@@ -22,7 +22,7 @@
 #define NETWORKEVENT_H
 
 #include <QStringList>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 #include "event.h"
 #include "network.h"
diff --git a/kuassel/src/common/protocol.h b/kuassel/src/common/protocol.h
index 1123107b..46b43d72 100644
--- a/kuassel/src/common/protocol.h
+++ b/kuassel/src/common/protocol.h
@@ -23,7 +23,7 @@
 
 #include <QByteArray>
 #include <QDateTime>
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 namespace Protocol {
 
diff --git a/kuassel/src/common/protocols/datastream/datastreampeer.cpp b/kuassel/src/common/protocols/datastream/datastreampeer.cpp
index 524c354a..44d9ff97 100644
--- a/kuassel/src/common/protocols/datastream/datastreampeer.cpp
+++ b/kuassel/src/common/protocols/datastream/datastreampeer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 #include <QDataStream>
 #include <QHostAddress>
 #include <QTcpSocket>
diff --git a/kuassel/src/common/remotepeer.cpp b/kuassel/src/common/remotepeer.cpp
index d311d208..3e895c98 100644
--- a/kuassel/src/common/remotepeer.cpp
+++ b/kuassel/src/common/remotepeer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 
 #include <QHostAddress>
 #include <QTimer>
diff --git a/kuassel/src/common/signalproxy.cpp b/kuassel/src/common/signalproxy.cpp
index 296e26f6..2185fd41 100644
--- a/kuassel/src/common/signalproxy.cpp
+++ b/kuassel/src/common/signalproxy.cpp
@@ -20,8 +20,8 @@
 
 #include <QCoreApplication>
 #include <QHostAddress>
-#include <QMetaMethod>
-#include <QMetaProperty>
+
+#include <QtCore/qmetaobject.h>
 #include <QThread>
 
 #ifdef HAVE_SSL
diff --git a/kuassel/src/common/syncableobject.cpp b/kuassel/src/common/syncableobject.cpp
index 38477f66..4b76a174 100644
--- a/kuassel/src/common/syncableobject.cpp
+++ b/kuassel/src/common/syncableobject.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QMetaProperty>
+#include <QtCore/qmetaobject.h>
 
 #include <KDebug>
 
diff --git a/kuassel/src/common/syncableobject.h b/kuassel/src/common/syncableobject.h
index 3ddef14c..c317b556 100644
--- a/kuassel/src/common/syncableobject.h
+++ b/kuassel/src/common/syncableobject.h
@@ -24,7 +24,7 @@
 #include <QDataStream>
 #include <QMetaType>
 #include <QObject>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "signalproxy.h"
 
diff --git a/kuassel/src/common/util.h b/kuassel/src/common/util.h
index aac83800..4ec17b76 100644
--- a/kuassel/src/common/util.h
+++ b/kuassel/src/common/util.h
@@ -24,7 +24,7 @@
 #include <QDir>
 #include <QVariant>
 #include <QString>
-#include <QMetaMethod>
+#include <QtCore/qmetaobject.h>
 
 // TODO Use versions from Network instead
 QString nickFromMask(QString mask);
diff --git a/kuassel/src/core/abstractsqlstorage.cpp b/kuassel/src/core/abstractsqlstorage.cpp
index 1316c043..836ed6b3 100644
--- a/kuassel/src/core/abstractsqlstorage.cpp
+++ b/kuassel/src/core/abstractsqlstorage.cpp
@@ -21,7 +21,7 @@
 #include "abstractsqlstorage.h"
 #include "quassel.h"
 
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QSqlDriver>
 #include <QSqlError>
 #include <QSqlField>
diff --git a/kuassel/src/core/coreauthhandler.cpp b/kuassel/src/core/coreauthhandler.cpp
index c00a5427..de479af2 100644
--- a/kuassel/src/core/coreauthhandler.cpp
+++ b/kuassel/src/core/coreauthhandler.cpp
@@ -23,6 +23,7 @@
 #ifdef HAVE_SSL
 #  include <QSslSocket>
 #endif
+#include <QtCore/qendian.h>
 
 #include "core.h"
 
diff --git a/kuassel/src/core/coretransfer.cpp b/kuassel/src/core/coretransfer.cpp
index 15458317..4f171072 100644
--- a/kuassel/src/core/coretransfer.cpp
+++ b/kuassel/src/core/coretransfer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QtEndian>
+#include <QtCore/qendian.h>
 #include <QCoreApplication>
 #include <QTcpSocket>
 
diff --git a/kuassel/src/core/coreusersettings.h b/kuassel/src/core/coreusersettings.h
index 54d45274..470ccfbf 100644
--- a/kuassel/src/core/coreusersettings.h
+++ b/kuassel/src/core/coreusersettings.h
@@ -26,7 +26,7 @@
 #include "network.h"
 #include "types.h"
 
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 class CoreUserSettings : public CoreSettings
 {
diff --git a/kuassel/src/qtui/bufferwidget.cpp b/kuassel/src/qtui/bufferwidget.cpp
index afebc80c..10185ff6 100644
--- a/kuassel/src/qtui/bufferwidget.cpp
+++ b/kuassel/src/qtui/bufferwidget.cpp
@@ -20,7 +20,7 @@
 
 #include <QIcon>
 #include <QLayout>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QScrollBar>
 
diff --git a/kuassel/src/qtui/chatitem.cpp b/kuassel/src/qtui/chatitem.cpp
index 4bac7a53..67501539 100644
--- a/kuassel/src/qtui/chatitem.cpp
+++ b/kuassel/src/qtui/chatitem.cpp
@@ -22,7 +22,7 @@
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QFontMetrics>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QIcon>
 #include <QPainter>
 #include <QPalette>
diff --git a/kuassel/src/qtui/chatline.cpp b/kuassel/src/qtui/chatline.cpp
index def2450b..f0b93489 100644
--- a/kuassel/src/qtui/chatline.cpp
+++ b/kuassel/src/qtui/chatline.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QDateTime>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QString>
 #include <QtGui>
 
diff --git a/kuassel/src/qtui/chatlinemodelitem.cpp b/kuassel/src/qtui/chatlinemodelitem.cpp
index eadbfa7e..e2740bf8 100644
--- a/kuassel/src/qtui/chatlinemodelitem.cpp
+++ b/kuassel/src/qtui/chatlinemodelitem.cpp
@@ -18,6 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QRect>
 #include <QFontMetrics>
 #include <QTextBoundaryFinder>
 
diff --git a/kuassel/src/qtui/chatmonitorview.cpp b/kuassel/src/qtui/chatmonitorview.cpp
index 9882fecc..087ded81 100644
--- a/kuassel/src/qtui/chatmonitorview.cpp
+++ b/kuassel/src/qtui/chatmonitorview.cpp
@@ -22,7 +22,7 @@
 
 #include <QAction>
 #include <QMenu>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 
 #include <KIcon>
 
diff --git a/kuassel/src/qtui/chatscene.cpp b/kuassel/src/qtui/chatscene.cpp
index 43ed45a3..de988d22 100644
--- a/kuassel/src/qtui/chatscene.cpp
+++ b/kuassel/src/qtui/chatscene.cpp
@@ -22,12 +22,12 @@
 #include <QClipboard>
 #include <QDesktopServices>
 #include <QDrag>
-#include <QGraphicsSceneMouseEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QIcon>
 #include <QMenu>
 #include <QMenuBar>
 #include <QMimeData>
-#include <QPersistentModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUrl>
 
 #  include <KMenuBar>
diff --git a/kuassel/src/qtui/chatview.cpp b/kuassel/src/qtui/chatview.cpp
index 20b25e0e..276caff1 100644
--- a/kuassel/src/qtui/chatview.cpp
+++ b/kuassel/src/qtui/chatview.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QGraphicsTextItem>
-#include <QKeyEvent>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QScrollBar>
 
diff --git a/kuassel/src/qtui/columnhandleitem.cpp b/kuassel/src/qtui/columnhandleitem.cpp
index 87dc351e..3e331cc8 100644
--- a/kuassel/src/qtui/columnhandleitem.cpp
+++ b/kuassel/src/qtui/columnhandleitem.cpp
@@ -23,7 +23,7 @@
 
 #include <QApplication>
 #include <QCursor>
-#include <QGraphicsSceneHoverEvent>
+#include <QtGui/qgraphicssceneevent.h>
 #include <QPainter>
 #include <QPalette>
 
diff --git a/kuassel/src/qtui/coreconfigwizard.h b/kuassel/src/qtui/coreconfigwizard.h
index 38350bce..f8566599 100644
--- a/kuassel/src/qtui/coreconfigwizard.h
+++ b/kuassel/src/qtui/coreconfigwizard.h
@@ -23,7 +23,7 @@
 
 #include <QHash>
 #include <QWizard>
-#include <QVariantMap>
+#include <QtCore/qvariant.h>
 
 #include "ui_coreconfigwizardintropage.h"
 #include "ui_coreconfigwizardadminuserpage.h"
diff --git a/kuassel/src/qtui/markerlineitem.h b/kuassel/src/qtui/markerlineitem.h
index 0981a092..78674f50 100644
--- a/kuassel/src/qtui/markerlineitem.h
+++ b/kuassel/src/qtui/markerlineitem.h
@@ -21,7 +21,7 @@
 #ifndef MARKERLINEITEM_H_
 #define MARKERLINEITEM_H_
 
-#include <QGraphicsObject>
+#include <QtGui/qgraphicsitem.h>
 
 #include "chatscene.h"
 
diff --git a/kuassel/src/qtui/settingspages/appearancesettingspage.h b/kuassel/src/qtui/settingspages/appearancesettingspage.h
index 3df67106..336f2080 100644
--- a/kuassel/src/qtui/settingspages/appearancesettingspage.h
+++ b/kuassel/src/qtui/settingspages/appearancesettingspage.h
@@ -23,7 +23,7 @@
 
 #include <QHash>
 #include <QList>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 #include "settings.h"
 #include "settingspage.h"
diff --git a/kuassel/src/qtui/settingspages/bufferviewsettingspage.h b/kuassel/src/qtui/settingspages/bufferviewsettingspage.h
index 91902bdc..4c3e501e 100644
--- a/kuassel/src/qtui/settingspages/bufferviewsettingspage.h
+++ b/kuassel/src/qtui/settingspages/bufferviewsettingspage.h
@@ -25,7 +25,7 @@
 #include "ui_bufferviewsettingspage.h"
 #include "ui_buffervieweditdlg.h"
 
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 class BufferViewConfig;
 
diff --git a/kuassel/src/qtui/settingspages/highlightsettingspage.h b/kuassel/src/qtui/settingspages/highlightsettingspage.h
index 4bd9a9af..459d666f 100644
--- a/kuassel/src/qtui/settingspages/highlightsettingspage.h
+++ b/kuassel/src/qtui/settingspages/highlightsettingspage.h
@@ -21,8 +21,8 @@
 #ifndef _HIGHLIGHTSETTINGSPAGE_H_
 #define _HIGHLIGHTSETTINGSPAGE_H_
 
-#include <QVariantList>
-#include <QTableWidgetItem>
+#include <QtCore/qvariant.h>
+#include <QtGui/qtablewidget.h>
 
 #include <KLocale>
 
diff --git a/kuassel/src/qtui/settingspages/identityeditwidget.cpp b/kuassel/src/qtui/settingspages/identityeditwidget.cpp
index b441aebf..0785dde0 100644
--- a/kuassel/src/qtui/settingspages/identityeditwidget.cpp
+++ b/kuassel/src/qtui/settingspages/identityeditwidget.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QFileDialog>
 #include <QMimeData>
 #include <QUrl>
diff --git a/kuassel/src/qtui/settingspages/ignorelistsettingspage.cpp b/kuassel/src/qtui/settingspages/ignorelistsettingspage.cpp
index 1eb011b0..c898e5c8 100644
--- a/kuassel/src/qtui/settingspages/ignorelistsettingspage.cpp
+++ b/kuassel/src/qtui/settingspages/ignorelistsettingspage.cpp
@@ -20,7 +20,7 @@
 
 #include <QHeaderView>
 #include <QItemSelectionModel>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPainter>
 #include <QMessageBox>
 #include <QString>
diff --git a/kuassel/src/qtui/statusnotifieritem.cpp b/kuassel/src/qtui/statusnotifieritem.cpp
index 17e18c8d..ecfacd56 100644
--- a/kuassel/src/qtui/statusnotifieritem.cpp
+++ b/kuassel/src/qtui/statusnotifieritem.cpp
@@ -23,9 +23,10 @@
 
 #ifdef HAVE_DBUS
 
+#include <QMetaObject>
 #include <QApplication>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QTextDocument>
 
 #include "quassel.h"
diff --git a/kuassel/src/uisupport/abstractitemview.h b/kuassel/src/uisupport/abstractitemview.h
index 13abb489..179ef6ce 100644
--- a/kuassel/src/uisupport/abstractitemview.h
+++ b/kuassel/src/uisupport/abstractitemview.h
@@ -24,8 +24,8 @@
 #include <QWidget>
 #include <QAbstractItemModel>
 #include <QItemSelectionModel>
-#include <QModelIndex>
-#include <QItemSelection>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtGui/qitemselectionmodel.h>
 #include <QAbstractItemDelegate>
 #include <QPointer>
 
diff --git a/kuassel/src/uisupport/bufferview.cpp b/kuassel/src/uisupport/bufferview.cpp
index 324858d9..4cce473d 100644
--- a/kuassel/src/uisupport/bufferview.cpp
+++ b/kuassel/src/uisupport/bufferview.cpp
@@ -22,7 +22,7 @@
 
 #include <QApplication>
 #include <QAction>
-#include <QFlags>
+#include <QtCore/qglobal.h>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QMenu>
diff --git a/kuassel/src/uisupport/bufferview.h b/kuassel/src/uisupport/bufferview.h
index 021df37c..e642e5b2 100644
--- a/kuassel/src/uisupport/bufferview.h
+++ b/kuassel/src/uisupport/bufferview.h
@@ -24,7 +24,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QDockWidget>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QStyledItemDelegate>
 #include <QTreeView>
 #include <QPointer>
diff --git a/kuassel/src/uisupport/bufferviewfilter.h b/kuassel/src/uisupport/bufferviewfilter.h
index 3c63467c..2fcd3504 100644
--- a/kuassel/src/uisupport/bufferviewfilter.h
+++ b/kuassel/src/uisupport/bufferviewfilter.h
@@ -22,8 +22,8 @@
 #define BUFFERVIEWFILTER_H_
 
 #include <QAction>
-#include <QDropEvent>
-#include <QFlags>
+#include <QtGui/qevent.h>
+#include <QtCore/qglobal.h>
 #include <QPointer>
 #include <QSet>
 #include <QSortFilterProxyModel>
diff --git a/kuassel/src/uisupport/clickable.cpp b/kuassel/src/uisupport/clickable.cpp
index 3b32f267..111fde68 100644
--- a/kuassel/src/uisupport/clickable.cpp
+++ b/kuassel/src/uisupport/clickable.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QDesktopServices>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QUrl>
 
 #include "buffermodel.h"
diff --git a/kuassel/src/uisupport/clickablelabel.cpp b/kuassel/src/uisupport/clickablelabel.cpp
index a7f2ec93..5de1a838 100644
--- a/kuassel/src/uisupport/clickablelabel.cpp
+++ b/kuassel/src/uisupport/clickablelabel.cpp
@@ -21,7 +21,7 @@
 #include "clickablelabel.h"
 
 #include <KDebug>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 ClickableLabel::ClickableLabel(QWidget *parent)
     : QLabel(parent)
diff --git a/kuassel/src/uisupport/colorbutton.cpp b/kuassel/src/uisupport/colorbutton.cpp
index fdab4721..238af976 100644
--- a/kuassel/src/uisupport/colorbutton.cpp
+++ b/kuassel/src/uisupport/colorbutton.cpp
@@ -22,7 +22,7 @@
 
 #include <QPainter>
 #include <QStyle>
-#include <QStyleOptionFrame>
+#include <QtGui/qstyleoption.h>
 
 #  include <KColorDialog>
 
diff --git a/kuassel/src/uisupport/flatproxymodel.cpp b/kuassel/src/uisupport/flatproxymodel.cpp
index b4f4ecb4..b0f77343 100644
--- a/kuassel/src/uisupport/flatproxymodel.cpp
+++ b/kuassel/src/uisupport/flatproxymodel.cpp
@@ -20,7 +20,7 @@
 
 #include "flatproxymodel.h"
 
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 #include <KDebug>
 
 FlatProxyModel::FlatProxyModel(QObject *parent)
diff --git a/kuassel/src/uisupport/multilineedit.h b/kuassel/src/uisupport/multilineedit.h
index 13890308..2d387c9d 100644
--- a/kuassel/src/uisupport/multilineedit.h
+++ b/kuassel/src/uisupport/multilineedit.h
@@ -21,7 +21,7 @@
 #ifndef MULTILINEEDIT_H_
 #define MULTILINEEDIT_H_
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QHash>
 
 #include <KTextEdit>
diff --git a/kuassel/src/uisupport/uistyle.h b/kuassel/src/uisupport/uistyle.h
index 0b515016..8a97d52b 100644
--- a/kuassel/src/uisupport/uistyle.h
+++ b/kuassel/src/uisupport/uistyle.h
@@ -22,10 +22,11 @@
 #define UISTYLE_H_
 
 #include <QDataStream>
-#include <QFontMetricsF>
+#include <QRect>
+#include <QFontMetrics>
 #include <QHash>
 #include <QIcon>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 #include <QTextLayout>
 #include <QPalette>
 #include <QVector>
diff --git a/kuser/ku_group.h b/kuser/ku_group.h
index ad29d828..9d5ab13a 100644
--- a/kuser/ku_group.h
+++ b/kuser/ku_group.h
@@ -25,7 +25,7 @@
 
 
 #include <QList>
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 #include "globals.h"
 #include "ku_prefs.h"
diff --git a/kuser/ku_groupmodel.h b/kuser/ku_groupmodel.h
index def2ecd4..d34ea1d0 100644
--- a/kuser/ku_groupmodel.h
+++ b/kuser/ku_groupmodel.h
@@ -20,7 +20,7 @@
 #ifndef _KU_GROUPMODEL_H_
 #define _KU_GROUPMODEL_H_
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 
 #include "ku_group.h"
diff --git a/kuser/ku_user.h b/kuser/ku_user.h
index b94bd636..14522187 100644
--- a/kuser/ku_user.h
+++ b/kuser/ku_user.h
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 
 
-#include <QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 
 #include "globals.h"
 #include "ku_prefs.h"
diff --git a/kuser/ku_usermodel.h b/kuser/ku_usermodel.h
index 0bb83fef..83d67f68 100644
--- a/kuser/ku_usermodel.h
+++ b/kuser/ku_usermodel.h
@@ -20,7 +20,7 @@
 #ifndef _KU_USERMODEL_H_
 #define _KU_USERMODEL_H_
 
-#include <QAbstractTableModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 
 #include "ku_user.h"
diff --git a/kvkbd/src/dragwidget.h b/kvkbd/src/dragwidget.h
index f4891edd..3fe24a51 100644
--- a/kvkbd/src/dragwidget.h
+++ b/kvkbd/src/dragwidget.h
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QPoint>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 class DragWidget : public QWidget
 {
diff --git a/kvkbd/src/kbddock.cpp b/kvkbd/src/kbddock.cpp
index 48000222..492336a1 100644
--- a/kvkbd/src/kbddock.cpp
+++ b/kvkbd/src/kbddock.cpp
@@ -24,7 +24,7 @@
 #include <QDBusConnection>
 #include <QPainter>
 #include <QWidget>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #include <KIconLoader>
 #include <KLocale>
diff --git a/kvkbd/src/kbddock.h b/kvkbd/src/kbddock.h
index 23fca77d..5c0f043d 100644
--- a/kvkbd/src/kbddock.h
+++ b/kvkbd/src/kbddock.h
@@ -25,7 +25,7 @@
 #include "dragwidget.h"
 
 #include <QPixmap>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 
 class KbdDock : public DragWidget
diff --git a/kvkbd/src/kvkbdapp.cpp b/kvkbd/src/kvkbdapp.cpp
index a15304f6..4e856dc4 100644
--- a/kvkbd/src/kvkbdapp.cpp
+++ b/kvkbd/src/kvkbdapp.cpp
@@ -22,7 +22,7 @@
 
 #include <QDebug>
 #include <QDesktopWidget>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QGridLayout>
 #include <QMessageBox>
diff --git a/kvkbd/src/kvkbdapp.h b/kvkbd/src/kvkbdapp.h
index 498f842b..8fba54a1 100644
--- a/kvkbd/src/kvkbdapp.h
+++ b/kvkbd/src/kvkbdapp.h
@@ -24,8 +24,8 @@
 #include <QAction>
 #include <QSignalMapper>
 #include <QGridLayout>
-#include <QDomNode>
-#include <QDomNamedNodeMap>
+
+#include <QtXml/qdom.h>
 
 #include "resizabledragwidget.h"
 #include "mainwidget.h"
diff --git a/kvkbd/src/mainwidget.cpp b/kvkbd/src/mainwidget.cpp
index 533b94c9..26b9b26b 100644
--- a/kvkbd/src/mainwidget.cpp
+++ b/kvkbd/src/mainwidget.cpp
@@ -1,6 +1,6 @@
 #include "mainwidget.h"
 
-#include <QObjectList>
+#include <QtCore/qobject.h>
 #include <QList>
 
 #include "vbutton.h"
diff --git a/kvkbd/src/mainwidget.h b/kvkbd/src/mainwidget.h
index c35a5f36..a62d4033 100644
--- a/kvkbd/src/mainwidget.h
+++ b/kvkbd/src/mainwidget.h
@@ -5,7 +5,7 @@
 #include <QString>
 #include <QFont>
 #include <QSize>
-#include <QResizeEvent>
+#include <QtGui/qevent.h>
 
 #include "vkeyboard.h"
 
diff --git a/kvkbd/src/resizabledragwidget.cpp b/kvkbd/src/resizabledragwidget.cpp
index 885e2154..cbc4eac6 100644
--- a/kvkbd/src/resizabledragwidget.cpp
+++ b/kvkbd/src/resizabledragwidget.cpp
@@ -23,7 +23,7 @@
 #include <QPoint>
 #include <QPainter>
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 
 #include <iostream>
diff --git a/kvkbd/src/themeloader.cpp b/kvkbd/src/themeloader.cpp
index 9151e226..fee8d32d 100644
--- a/kvkbd/src/themeloader.cpp
+++ b/kvkbd/src/themeloader.cpp
@@ -22,10 +22,10 @@
 #include <QMessageBox>
 #include <QString>
 #include <QFile>
-#include <QDomDocument>
-#include <QDomElement>
-#include <QDomNode>
-#include <QDomNodeList>
+
+
+
+#include <QtXml/qdom.h>
 #include <QFileInfo>
 #include <QDir>
 #include <QMenu>
diff --git a/kvkbd/src/themeloader.h b/kvkbd/src/themeloader.h
index f6733520..982269de 100644
--- a/kvkbd/src/themeloader.h
+++ b/kvkbd/src/themeloader.h
@@ -21,8 +21,8 @@
 #define THEMELOADER_H
 
 #include <QObject>
-#include <QDomNode>
-#include <QDomNamedNodeMap>
+
+#include <QtXml/qdom.h>
 #include <QVariant>
 #include <QMap>
 #include <QMenu>
diff --git a/kvkbd/src/vbutton.h b/kvkbd/src/vbutton.h
index 70e3f827..aca513ee 100644
--- a/kvkbd/src/vbutton.h
+++ b/kvkbd/src/vbutton.h
@@ -5,9 +5,9 @@
 #include <QRect>
 #include <QSize>
 #include <QString>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QTimer>
-#include <QDomNode>
+#include <QtXml/qdom.h>
 #include "x11keyboard.h"
 
 class VButton : public QPushButton
diff --git a/kvkbd/src/vkeyboard.h b/kvkbd/src/vkeyboard.h
index b96cc87e..320cce57 100644
--- a/kvkbd/src/vkeyboard.h
+++ b/kvkbd/src/vkeyboard.h
@@ -22,7 +22,7 @@
 
 #include <QObject>
 #include <QMap>
-#include <QMapIterator>
+#include <QtCore/qmap.h>
 #include <QList>
 #include <QChar>
 
diff --git a/libksane/libksane/ksane_preview_thread.cpp b/libksane/libksane/ksane_preview_thread.cpp
index 14329eca..78840910 100644
--- a/libksane/libksane/ksane_preview_thread.cpp
+++ b/libksane/libksane/ksane_preview_thread.cpp
@@ -29,7 +29,7 @@
 #include "moc_ksane_preview_thread.cpp"
 
 #include <KDebug>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 
 namespace KSaneIface
diff --git a/libksane/libksane/ksane_viewer.cpp b/libksane/libksane/ksane_viewer.cpp
index f6e42f33..0fe3a6c8 100644
--- a/libksane/libksane/ksane_viewer.cpp
+++ b/libksane/libksane/ksane_viewer.cpp
@@ -29,10 +29,10 @@
 #include "moc_ksane_viewer.cpp"
 #include "selectionitem.h"
 
-#include <QGraphicsPixmapItem>
+
 #include <QGraphicsScene>
-#include <QGraphicsRectItem>
-#include <QWheelEvent>
+#include <QtGui/qgraphicsitem.h>
+#include <QtGui/qevent.h>
 #include <QScrollBar>
 #include <QAction>
 #include <QList>
diff --git a/libksane/libksane/ksane_viewer.h b/libksane/libksane/ksane_viewer.h
index f7b47447..61b79101 100644
--- a/libksane/libksane/ksane_viewer.h
+++ b/libksane/libksane/ksane_viewer.h
@@ -29,7 +29,7 @@
 #define KSANE_VIEWER_H
 
 #include <QGraphicsView>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 
 namespace KSaneIface
 {
diff --git a/libksane/libksane/ksane_widget_private.h b/libksane/libksane/ksane_widget_private.h
index 8adf06f2..33c5895a 100644
--- a/libksane/libksane/ksane_widget_private.h
+++ b/libksane/libksane/ksane_widget_private.h
@@ -39,7 +39,7 @@ extern "C"
 #include <QtGui/QWidget>
 #include <QCheckBox>
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QProgressBar>
 
 // KDE includes
diff --git a/libksane/libksane/selectionitem.h b/libksane/libksane/selectionitem.h
index 17f6ab22..23724131 100644
--- a/libksane/libksane/selectionitem.h
+++ b/libksane/libksane/selectionitem.h
@@ -27,7 +27,7 @@
 #ifndef SELECTIONITEM_H
 #define SELECTIONITEM_H
 
-#include <QGraphicsPixmapItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QPainter>
 
 namespace KSaneIface
diff --git a/libksane/libksane/splittercollapser.cpp b/libksane/libksane/splittercollapser.cpp
index 67917790..8923818d 100644
--- a/libksane/libksane/splittercollapser.cpp
+++ b/libksane/libksane/splittercollapser.cpp
@@ -27,9 +27,9 @@ License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 #include <QApplication>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QSplitter>
-#include <QStyleOptionToolButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QTimeLine>
 
diff --git a/lokalize/src/alttransview.cpp b/lokalize/src/alttransview.cpp
index 0d7ac07a..3c571e44 100644
--- a/lokalize/src/alttransview.cpp
+++ b/lokalize/src/alttransview.cpp
@@ -24,7 +24,7 @@
 #define KDE_NO_DEBUG_OUTPUT
 
 #include "alttransview.h"
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 
 #include "diff.h"
 #include "catalog.h"
@@ -40,7 +40,7 @@
 #include <kaction.h>
 
 #include <QSignalMapper>
-//#include <QTime>
+//#include <QtCore/qdatetime.h>
 #include <QFileInfo>
 #include <QToolTip>
 
diff --git a/lokalize/src/binunitsview.cpp b/lokalize/src/binunitsview.cpp
index 11e09f1f..24e7b367 100644
--- a/lokalize/src/binunitsview.cpp
+++ b/lokalize/src/binunitsview.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <krun.h>
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <kfiledialog.h>
 #include <kdirwatch.h>
diff --git a/lokalize/src/binunitsview.h b/lokalize/src/binunitsview.h
index d01b71ee..1ba70f70 100644
--- a/lokalize/src/binunitsview.h
+++ b/lokalize/src/binunitsview.h
@@ -35,7 +35,7 @@ class MyTreeView;
 
 #include <QHash>
 #include <QDockWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 
 class BinUnitsView: public QDockWidget
 {
diff --git a/lokalize/src/catalog/cmd.h b/lokalize/src/catalog/cmd.h
index 6147df47..1d8ba374 100644
--- a/lokalize/src/catalog/cmd.h
+++ b/lokalize/src/catalog/cmd.h
@@ -25,7 +25,7 @@
 #ifndef CMD_H
 #define CMD_H
 
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 #include "pos.h"
 #include "note.h"
diff --git a/lokalize/src/catalog/gettext/catalogitem.cpp b/lokalize/src/catalog/gettext/catalogitem.cpp
index b13df5ee..6e56184a 100644
--- a/lokalize/src/catalog/gettext/catalogitem.cpp
+++ b/lokalize/src/catalog/gettext/catalogitem.cpp
@@ -37,7 +37,7 @@
 #include "catalogitem_private.h"
 
 #include <kdebug.h>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 
 using namespace GettextCatalog;
 
diff --git a/lokalize/src/catalog/gettext/gettextimport.cpp b/lokalize/src/catalog/gettext/gettextimport.cpp
index d337cec0..194b1ab8 100644
--- a/lokalize/src/catalog/gettext/gettextimport.cpp
+++ b/lokalize/src/catalog/gettext/gettextimport.cpp
@@ -40,7 +40,7 @@
 //#include <resources.h>
 
 #include <QFile>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFileInfo>
 #include <QRegExp>
 #include <QTextCodec>
diff --git a/lokalize/src/catalog/phase.h b/lokalize/src/catalog/phase.h
index 4ab5d672..31267105 100644
--- a/lokalize/src/catalog/phase.h
+++ b/lokalize/src/catalog/phase.h
@@ -28,7 +28,7 @@
 #include "projectlocal.h"
 
 #include <QString>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 class Catalog;
 struct Phase
diff --git a/lokalize/src/catalog/ts/tsstorage.cpp b/lokalize/src/catalog/ts/tsstorage.cpp
index 966b0b8f..ec3f6d8d 100644
--- a/lokalize/src/catalog/ts/tsstorage.cpp
+++ b/lokalize/src/catalog/ts/tsstorage.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QProcess>
 #include <QString>
 #include <QMap>
-#include <QDomDocument>
-#include <QTime>
+#include <QtXml/qdom.h>
+#include <QtCore/qdatetime.h>
 #include <QPair>
 #include <QList>
 
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdatetime.h>
-#include <QXmlSimpleReader>
+#include <QtXml/qxml.h>
 
 static const char* const noyes[]={"no","yes"};
 
diff --git a/lokalize/src/catalog/ts/tsstorage.h b/lokalize/src/catalog/ts/tsstorage.h
index 0a1eae50..07e6dc3c 100644
--- a/lokalize/src/catalog/ts/tsstorage.h
+++ b/lokalize/src/catalog/ts/tsstorage.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TSSTORAGE_H
 
 #include "catalogstorage.h"
-#include <QDomNodeList>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
+
 #include <QVector>
 #include <QMap>
 // class QDomDocument;
diff --git a/lokalize/src/catalog/xliff/xliffstorage.cpp b/lokalize/src/catalog/xliff/xliffstorage.cpp
index b663c466..6c07926b 100644
--- a/lokalize/src/catalog/xliff/xliffstorage.cpp
+++ b/lokalize/src/catalog/xliff/xliffstorage.cpp
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QProcess>
 #include <QString>
 #include <QMap>
-#include <QDomDocument>
-#include <QTime>
+#include <QtXml/qdom.h>
+#include <QtCore/qdatetime.h>
 #include <QPair>
 #include <QList>
 
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdatetime.h>
-#include <QXmlSimpleReader>
+#include <QtXml/qxml.h>
 
 static const QString noyes[]={"no","yes"};
 static const QString bintargettarget[]={"bin-target","target"};
diff --git a/lokalize/src/catalog/xliff/xliffstorage.h b/lokalize/src/catalog/xliff/xliffstorage.h
index 4a66bc28..403f715a 100644
--- a/lokalize/src/catalog/xliff/xliffstorage.h
+++ b/lokalize/src/catalog/xliff/xliffstorage.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define XLIFFSTORAGE_H
 
 #include "catalogstorage.h"
-#include <QDomNodeList>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
+
 #include <QVector>
 #include <QMap>
 // class QDomDocument;
diff --git a/lokalize/src/cataloglistview/cataloglistview.cpp b/lokalize/src/cataloglistview/cataloglistview.cpp
index 6ec93fd8..b49270b5 100644
--- a/lokalize/src/cataloglistview/cataloglistview.cpp
+++ b/lokalize/src/cataloglistview/cataloglistview.cpp
@@ -31,10 +31,10 @@
 #include <klineedit.h>
 #include <KConfigGroup>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTreeView>
 #include <QHeaderView>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QAction>
@@ -44,7 +44,7 @@
 #include <QMdiSubWindow>
 #include <QMdiArea>
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 class CatalogTreeView: public QTreeView
 {
diff --git a/lokalize/src/common/domroutines.h b/lokalize/src/common/domroutines.h
index e0b934e4..abc5ffb4 100644
--- a/lokalize/src/common/domroutines.h
+++ b/lokalize/src/common/domroutines.h
@@ -23,7 +23,7 @@
 
 #ifndef DOMROUTINES_H
 #define DOMROUTINES_H
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 void setText(QDomElement element, QString text);
 
diff --git a/lokalize/src/common/stemming.cpp b/lokalize/src/common/stemming.cpp
index a1115b79..bfef7c60 100644
--- a/lokalize/src/common/stemming.cpp
+++ b/lokalize/src/common/stemming.cpp
@@ -26,7 +26,7 @@
 #include <QMap>
 #include <QFileInfo>
 #include <QMutex>
-#include <QMutexLocker>
+#include <QtCore/qmutex.h>
 #include <QDebug>
 
 QString enhanceLangCode(const QString& langCode)
diff --git a/lokalize/src/common/termlabel.cpp b/lokalize/src/common/termlabel.cpp
index 249fe3a7..605f028a 100644
--- a/lokalize/src/common/termlabel.cpp
+++ b/lokalize/src/common/termlabel.cpp
@@ -32,10 +32,10 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <QMenu>
-#include <QMouseEvent>
+
 
 using namespace GlossaryNS;
-//#include <QShortcutEvent>
+//#include <QtGui/qevent.h>
 
 
 // TermLabel::TermLabel(QAction* action/*const QString& shortcutQWidget* parent,Qt::Key key,const QString& termTransl*/)
diff --git a/lokalize/src/editortab.cpp b/lokalize/src/editortab.cpp
index c7bc0f3a..0b1a3d13 100644
--- a/lokalize/src/editortab.cpp
+++ b/lokalize/src/editortab.cpp
@@ -89,7 +89,7 @@
 
 
 #include <QDir>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <threadweaver/ThreadWeaver.h>
 
 
diff --git a/lokalize/src/editorview.cpp b/lokalize/src/editorview.cpp
index 5a2e9ce3..3a79c5d9 100644
--- a/lokalize/src/editorview.cpp
+++ b/lokalize/src/editorview.cpp
@@ -42,7 +42,7 @@
 
 #include <QTimer>
 #include <QMenu>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 
 #include <QLabel>
 #include <QHBoxLayout>
diff --git a/lokalize/src/filesearch/filesearchtab.cpp b/lokalize/src/filesearch/filesearchtab.cpp
index 220a6cc1..5235b2f7 100644
--- a/lokalize/src/filesearch/filesearchtab.cpp
+++ b/lokalize/src/filesearch/filesearchtab.cpp
@@ -39,7 +39,7 @@
 #include <QTreeView>
 #include <QClipboard>
 #include <QShortcut>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
 #include <QStringBuilder>
diff --git a/lokalize/src/filesearch/filesearchtab.h b/lokalize/src/filesearch/filesearchtab.h
index b75d79eb..927ae5b3 100644
--- a/lokalize/src/filesearch/filesearchtab.h
+++ b/lokalize/src/filesearch/filesearchtab.h
@@ -33,7 +33,7 @@
 #include <KUrl>
 
 #include <QDockWidget>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <state.h>
 #include <phase.h>
 
diff --git a/lokalize/src/glossary/glossary.cpp b/lokalize/src/glossary/glossary.cpp
index b0b79db4..131b2a92 100644
--- a/lokalize/src/glossary/glossary.cpp
+++ b/lokalize/src/glossary/glossary.cpp
@@ -32,8 +32,8 @@
 #include <kdebug.h>
 
 #include <QFile>
-#include <QXmlSimpleReader>
-#include <QXmlStreamReader>
+#include <QtXml/qxml.h>
+#include <QtCore/qxmlstream.h>
 #include <QBuffer>
 #include <QApplication>
 
diff --git a/lokalize/src/glossary/glossary.h b/lokalize/src/glossary/glossary.h
index 5ee14286..4eece791 100644
--- a/lokalize/src/glossary/glossary.h
+++ b/lokalize/src/glossary/glossary.h
@@ -26,12 +26,12 @@
 
 #include <QStringList>
 #include <QMultiHash>
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSortFilterProxyModel>
 #include <QList>
 #include <QSet>
 
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 /**
  * Classes for TBX Glossary handling
diff --git a/lokalize/src/glossary/glossaryview.cpp b/lokalize/src/glossary/glossaryview.cpp
index ee69bab8..d5ccb7c3 100644
--- a/lokalize/src/glossary/glossaryview.cpp
+++ b/lokalize/src/glossary/glossaryview.cpp
@@ -46,11 +46,11 @@
 #include <kurl.h>
 #include <kaction.h>
 
-#include <QDragEnterEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QSet>
 #include <QScrollArea>
-// #include <QShortcutEvent>
+// 
 #include <QPushButton>
 
 
diff --git a/lokalize/src/glossary/tbxparser_obsolete.h b/lokalize/src/glossary/tbxparser_obsolete.h
index ad8366d8..b0abafd1 100644
--- a/lokalize/src/glossary/tbxparser_obsolete.h
+++ b/lokalize/src/glossary/tbxparser_obsolete.h
@@ -24,7 +24,7 @@
 #ifndef TBXPARSER_H
 #define TBXPARSER_H
 
-#include <QXmlDefaultHandler>
+#include <QtXml/qxml.h>
 
 #include "glossary.h"
 
diff --git a/lokalize/src/lokalizemainwindow.cpp b/lokalize/src/lokalizemainwindow.cpp
index f8fe608d..79ff79c9 100644
--- a/lokalize/src/lokalizemainwindow.cpp
+++ b/lokalize/src/lokalizemainwindow.cpp
@@ -51,8 +51,6 @@
 #include <kmessagebox.h>
 #include <knotification.h>
 #include <kapplication.h>
-
-
 #include <kio/netaccess.h>
 #include <kaction.h>
 #include <kactioncollection.h>
@@ -64,18 +62,15 @@
 #include <kurl.h>
 #include <kmenu.h>
 #include <kfiledialog.h>
-
+#include <kdialog.h>
 #include <kross/core/action.h>
-
 #include <threadweaver/ThreadWeaver.h>
 
-
+#include <QTimer>
 #include <QActionGroup>
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QMenuBar>
-#include <kdialog.h>
-
 
 
 LokalizeMainWindow::LokalizeMainWindow()
diff --git a/lokalize/src/lokalizemainwindow.h b/lokalize/src/lokalizemainwindow.h
index a8942399..b302c4ae 100644
--- a/lokalize/src/lokalizemainwindow.h
+++ b/lokalize/src/lokalizemainwindow.h
@@ -32,7 +32,7 @@
 
 #include <QPointer>
 #include <QMap>
-#include <QDBusObjectPath>
+#include <QtDBus/qdbusextratypes.h>
 
 
 class QMdiSubWindow;
diff --git a/lokalize/src/mergemode/mergecatalog.cpp b/lokalize/src/mergemode/mergecatalog.cpp
index c9096288..ca760786 100644
--- a/lokalize/src/mergemode/mergecatalog.cpp
+++ b/lokalize/src/mergemode/mergecatalog.cpp
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocalizedstring.h>
 #include <QMultiHash>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 
 
diff --git a/lokalize/src/mergemode/mergeview.cpp b/lokalize/src/mergemode/mergeview.cpp
index 02bbbf02..fac1243b 100644
--- a/lokalize/src/mergemode/mergeview.cpp
+++ b/lokalize/src/mergemode/mergeview.cpp
@@ -39,7 +39,7 @@
 #include <kaction.h>
 #include <threadweaver/ThreadWeaver.h>
 
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QFile>
 #include <QToolTip>
 
diff --git a/lokalize/src/msgctxtview.cpp b/lokalize/src/msgctxtview.cpp
index 9b3ba90c..02a2ee2b 100644
--- a/lokalize/src/msgctxtview.cpp
+++ b/lokalize/src/msgctxtview.cpp
@@ -38,7 +38,7 @@
 #include <kcombobox.h>
 #include <kpushbutton.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QTimer>
 #include <QBoxLayout>
 #include <QStackedLayout>
diff --git a/lokalize/src/noteeditor.cpp b/lokalize/src/noteeditor.cpp
index f32f22f3..8bda898b 100644
--- a/lokalize/src/noteeditor.cpp
+++ b/lokalize/src/noteeditor.cpp
@@ -39,7 +39,7 @@
 #include <QLabel>
 #include <QStringListModel>
 #include <QLineEdit>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 void TextEdit::keyPressEvent(QKeyEvent* keyEvent)
 {
diff --git a/lokalize/src/phaseswindow.cpp b/lokalize/src/phaseswindow.cpp
index 172d09b9..6387b71b 100644
--- a/lokalize/src/phaseswindow.cpp
+++ b/lokalize/src/phaseswindow.cpp
@@ -39,7 +39,7 @@
 
 
 //BEGIN PhasesModel
-#include <QAbstractListModel>
+#include <QtCore/qabstractitemmodel.h>
 #include <QSplitter>
 #include <QStackedLayout>
 
diff --git a/lokalize/src/phaseswindow.h b/lokalize/src/phaseswindow.h
index 5768144b..ba336aa7 100644
--- a/lokalize/src/phaseswindow.h
+++ b/lokalize/src/phaseswindow.h
@@ -29,7 +29,7 @@
 #include "note.h"
 
 #include <KDialog>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QVector>
 #include <QMap>
 
diff --git a/lokalize/src/prefs.cpp b/lokalize/src/prefs.cpp
index 025647d8..bbec39d8 100644
--- a/lokalize/src/prefs.cpp
+++ b/lokalize/src/prefs.cpp
@@ -54,8 +54,8 @@
 #include <threadweaver/ThreadWeaver.h>
 
 #include <QBoxLayout>
-#include <QDragEnterEvent>
-#include <QDropEvent>
+#include <QtGui/qevent.h>
+
 #include <QTimer>
 
 //#include <sonnet/configwidget.h>
diff --git a/lokalize/src/project.cpp b/lokalize/src/project.cpp
index d5742fa3..ea4045bf 100644
--- a/lokalize/src/project.cpp
+++ b/lokalize/src/project.cpp
@@ -37,7 +37,7 @@
 #include "qamodel.h"
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kurl.h>
 #include <kdirlister.h>
diff --git a/lokalize/src/project/project.cpp b/lokalize/src/project/project.cpp
index d5742fa3..ea4045bf 100644
--- a/lokalize/src/project/project.cpp
+++ b/lokalize/src/project/project.cpp
@@ -37,7 +37,7 @@
 #include "qamodel.h"
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kurl.h>
 #include <kdirlister.h>
diff --git a/lokalize/src/project/projectmodel.cpp b/lokalize/src/project/projectmodel.cpp
index 6531a5b9..dfb02805 100644
--- a/lokalize/src/project/projectmodel.cpp
+++ b/lokalize/src/project/projectmodel.cpp
@@ -33,9 +33,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFile>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QTimer>
 #include <QSqlDatabase>
 #include <QSqlQuery>
diff --git a/lokalize/src/project/projecttab.cpp b/lokalize/src/project/projecttab.cpp
index 4ebe2791..58d5b1e0 100644
--- a/lokalize/src/project/projecttab.cpp
+++ b/lokalize/src/project/projecttab.cpp
@@ -37,7 +37,7 @@
 #include <kstatusbar.h>
 #include <khbox.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QShortcut>
diff --git a/lokalize/src/project/projectwidget.cpp b/lokalize/src/project/projectwidget.cpp
index ae90bc08..0860aad8 100644
--- a/lokalize/src/project/projectwidget.cpp
+++ b/lokalize/src/project/projectwidget.cpp
@@ -35,10 +35,10 @@
 
 #include <QTreeView>
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
-#include <QLinearGradient>
+#include <QtGui/qbrush.h>
 #include <QHeaderView>
 #include <QItemDelegate>
 #include <QStyledItemDelegate>
diff --git a/lokalize/src/projectmodel.cpp b/lokalize/src/projectmodel.cpp
index 6531a5b9..dfb02805 100644
--- a/lokalize/src/projectmodel.cpp
+++ b/lokalize/src/projectmodel.cpp
@@ -33,9 +33,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QFile>
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QTimer>
 #include <QSqlDatabase>
 #include <QSqlQuery>
diff --git a/lokalize/src/projecttab.cpp b/lokalize/src/projecttab.cpp
index 4ebe2791..58d5b1e0 100644
--- a/lokalize/src/projecttab.cpp
+++ b/lokalize/src/projecttab.cpp
@@ -37,7 +37,7 @@
 #include <kstatusbar.h>
 #include <khbox.h>
 
-#include <QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <QShortcut>
diff --git a/lokalize/src/projectwidget.cpp b/lokalize/src/projectwidget.cpp
index ae90bc08..0860aad8 100644
--- a/lokalize/src/projectwidget.cpp
+++ b/lokalize/src/projectwidget.cpp
@@ -35,10 +35,10 @@
 
 #include <QTreeView>
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+
+#include <QtGui/qevent.h>
 #include <QPainter>
-#include <QLinearGradient>
+#include <QtGui/qbrush.h>
 #include <QHeaderView>
 #include <QItemDelegate>
 #include <QStyledItemDelegate>
diff --git a/lokalize/src/syntaxhighlighter.h b/lokalize/src/syntaxhighlighter.h
index 7e885d09..60ac6a5e 100644
--- a/lokalize/src/syntaxhighlighter.h
+++ b/lokalize/src/syntaxhighlighter.h
@@ -29,7 +29,7 @@
 #include <kcolorscheme.h>
 
 #include <QHash>
-#include <QTextCharFormat>
+#include <QtGui/qtextformat.h>
 
 
 class QTextDocument;
diff --git a/lokalize/src/tm/dbfilesmodel.h b/lokalize/src/tm/dbfilesmodel.h
index 868de34a..c7ce938b 100644
--- a/lokalize/src/tm/dbfilesmodel.h
+++ b/lokalize/src/tm/dbfilesmodel.h
@@ -27,7 +27,7 @@
 #include "jobs.h"
 
 #include <QSortFilterProxyModel>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 class QFileSystemModel;
 class QPersistentModelIndex;
 
diff --git a/lokalize/src/tm/jobs.cpp b/lokalize/src/tm/jobs.cpp
index ce325e60..ee7684c7 100644
--- a/lokalize/src/tm/jobs.cpp
+++ b/lokalize/src/tm/jobs.cpp
@@ -1658,8 +1658,8 @@ void UpdateJob::run ()
 
 //BEGIN TMX
 
-#include <QXmlDefaultHandler>
-#include <QXmlSimpleReader>
+
+#include <QtXml/qxml.h>
 
 /**
 	@author Nick Shaforostoff <shafff@ukr.net>
@@ -1912,7 +1912,7 @@ void ImportTmxJob::run()
 
 
 
-#include <QXmlStreamWriter>
+#include <QtCore/qxmlstream.h>
 
 ExportTmxJob::ExportTmxJob(const QString& filename,//const KUrl& url,
                      const QString& dbName,
diff --git a/lokalize/src/tm/qamodel.h b/lokalize/src/tm/qamodel.h
index 83dc3e04..695c6adf 100644
--- a/lokalize/src/tm/qamodel.h
+++ b/lokalize/src/tm/qamodel.h
@@ -26,8 +26,8 @@
 #define QAMODEL_H
 
 #include "rule.h"
-#include <QAbstractListModel>
-#include <QDomDocument>
+#include <QtCore/qabstractitemmodel.h>
+#include <QtXml/qdom.h>
 
 class QaModel: public QAbstractListModel
 {
diff --git a/lokalize/src/tm/qaview.cpp b/lokalize/src/tm/qaview.cpp
index 9dc0cf25..d5d03bec 100644
--- a/lokalize/src/tm/qaview.cpp
+++ b/lokalize/src/tm/qaview.cpp
@@ -27,7 +27,7 @@
 #include "project.h"
 
 #include <KLocale>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFile>
 #include <QAction>
 
diff --git a/lokalize/src/tm/qaview.h b/lokalize/src/tm/qaview.h
index ddc3e9e1..fa828a41 100644
--- a/lokalize/src/tm/qaview.h
+++ b/lokalize/src/tm/qaview.h
@@ -27,7 +27,7 @@
 
 #include <QDockWidget>
 #include <QTreeView>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 
 #include "rule.h"
 
diff --git a/lokalize/src/tm/tmentry.h b/lokalize/src/tm/tmentry.h
index f2b140a8..efe1d3d1 100644
--- a/lokalize/src/tm/tmentry.h
+++ b/lokalize/src/tm/tmentry.h
@@ -28,7 +28,7 @@
 #include "catalogstring.h"
 
 #include <QString>
-#include <QDate>
+#include <QtCore/qdatetime.h>
 
 namespace TM {
 
diff --git a/lokalize/src/tm/tmmanager.h b/lokalize/src/tm/tmmanager.h
index 91c05ce0..27cbdff5 100644
--- a/lokalize/src/tm/tmmanager.h
+++ b/lokalize/src/tm/tmmanager.h
@@ -34,7 +34,7 @@
 #define TMMANAGER_H
 
 #include <kmainwindow.h>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTimer>
 
 class QTreeView;
diff --git a/lokalize/src/tm/tmscanapi.h b/lokalize/src/tm/tmscanapi.h
index 4e4cc962..a7b413d5 100644
--- a/lokalize/src/tm/tmscanapi.h
+++ b/lokalize/src/tm/tmscanapi.h
@@ -28,7 +28,7 @@
 #include <kjob.h>
 #include <QDir>
 #include <QUrl>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QVector>
 
 namespace ThreadWeaver{class Job;}
diff --git a/lokalize/src/tm/tmtab.cpp b/lokalize/src/tm/tmtab.cpp
index 178bd6e9..d6d6dc8c 100644
--- a/lokalize/src/tm/tmtab.cpp
+++ b/lokalize/src/tm/tmtab.cpp
@@ -37,11 +37,13 @@
 #include <QButtonGroup>
 #include <QClipboard>
 #include <QShortcut>
-#include <QDragEnterEvent>
+#include <QtGui/qevent.h>
 #include <QSortFilterProxyModel>
 #include <QStyledItemDelegate>
 #include <QStringBuilder>
 #include <QTextDocument>
+#include <QTextCodec>
+#include <QStringListModel>
 
 #include <KColorScheme>
 #include <kactioncategory.h>
@@ -51,7 +53,6 @@
 #include <kxmlguifactory.h>
 #include <threadweaver/ThreadWeaver.h>
 #include <fastsizehintitemdelegate.h>
-#include <QStringListModel>
 
 
 using namespace TM;
diff --git a/lokalize/src/tm/tmview.cpp b/lokalize/src/tm/tmview.cpp
index c92e9b89..0d2377e7 100644
--- a/lokalize/src/tm/tmview.cpp
+++ b/lokalize/src/tm/tmview.cpp
@@ -42,8 +42,8 @@
 #include <kaction.h>
 #include <kmessagebox.h>
 
-#include <QTime>
-#include <QDragEnterEvent>
+#include <QtCore/qdatetime.h>
+#include <QtGui/qevent.h>
 #include <QFileInfo>
 #include <QDir>
 #include <QSignalMapper>
diff --git a/lokalize/src/webquery/webqueryview.cpp b/lokalize/src/webquery/webqueryview.cpp
index e7b5984f..997384b5 100644
--- a/lokalize/src/webquery/webqueryview.cpp
+++ b/lokalize/src/webquery/webqueryview.cpp
@@ -50,13 +50,13 @@
 #include <ktextbrowser.h>
 #include <kaction.h>
 
-#include <QDragEnterEvent>
-#include <QTime>
+#include <QtGui/qevent.h>
+#include <QtCore/qdatetime.h>
 #include <QSplitter>
 #include <QSignalMapper>
 #include <QTimer>
 
-// #include <QShortcutEvent>
+// 
 #include "myactioncollectionview.h"
 
 using namespace Kross;
diff --git a/lokalize/src/xlifftextedit.cpp b/lokalize/src/xlifftextedit.cpp
index 5538b7f9..ccda8b17 100644
--- a/lokalize/src/xlifftextedit.cpp
+++ b/lokalize/src/xlifftextedit.cpp
@@ -40,12 +40,12 @@
 #include <QPainter>
 #include <QStyle>
 #include <QApplication>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QMimeData>
 #include <QMetaType>
 
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 #include <QToolTip>
 
 // static int im_count=0;
diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index 16cb281c..83244bb4 100644
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -107,9 +107,13 @@ kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcf
 
 add_library(okularcore SHARED ${okularcore_SRCS})
 
-target_link_libraries(okularcore ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBRARY} ${MATH_LIB} ${KDE4_THREADWEAVER_LIBRARY} )
-
-target_link_libraries(okularcore kscreen)
+target_link_libraries(okularcore
+    ${KDE4_KIO_LIBS}
+    ${KDE4_PHONON_LIBRARY}
+    ${MATH_LIB}
+    ${KDE4_THREADWEAVER_LIBRARY}
+    kscreen
+)
 
 set_target_properties(okularcore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 
diff --git a/okular/conf/widgetannottools.cpp b/okular/conf/widgetannottools.cpp
index 6d05eed8..e5017ceb 100644
--- a/okular/conf/widgetannottools.cpp
+++ b/okular/conf/widgetannottools.cpp
@@ -24,10 +24,10 @@
 #include <QtGui/QGroupBox>
 #include <QtGui/QLabel>
 #include <QtGui/QListWidget>
-#include <QtGui/QListWidgetItem>
+#include <QtGui/qlistwidget.h>
 #include <QtGui/QStackedWidget>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include "core/annotations.h"
 #include "ui/annotationwidgets.h"
diff --git a/okular/core/annotations.h b/okular/core/annotations.h
index 4f107440..09b77ae1 100644
--- a/okular/core/annotations.h
+++ b/okular/core/annotations.h
@@ -15,8 +15,8 @@
 #include <QtCore/QLinkedList>
 #include <QtCore/QRect>
 #include <QtGui/QFont>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include "okular_export.h"
 #include "area.h"
diff --git a/okular/core/area.cpp b/okular/core/area.cpp
index bf2eb709..3d9f042e 100644
--- a/okular/core/area.cpp
+++ b/okular/core/area.cpp
@@ -10,7 +10,7 @@
 #include "area.h"
 
 #include <QtCore/QRect>
-#include <QtGui/QPolygonF>
+#include <QtGui/qpolygon.h>
 #include <kdebug.h>
 
 #include <math.h>
diff --git a/okular/core/document.cpp b/okular/core/document.cpp
index 55ea8ad2..836177cf 100644
--- a/okular/core/document.cpp
+++ b/okular/core/document.cpp
@@ -23,7 +23,7 @@
 #endif
 
 // qt/kde/system includes
-#include <QtCore/QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
@@ -34,7 +34,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QPrinter>
 #include <QtGui/QPrintDialog>
-#include <QUndoCommand>
+#include <QtGui/qundostack.h>
 
 #include <kaboutdata.h>
 #include <kauthorized.h>
diff --git a/okular/core/document.h b/okular/core/document.h
index 193de575..7efc1ef0 100644
--- a/okular/core/document.h
+++ b/okular/core/document.h
@@ -20,7 +20,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVector>
 #include <QtGui/QPrinter>
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 
 #include <kmimetype.h>
 
diff --git a/okular/core/documentcommands_p.h b/okular/core/documentcommands_p.h
index 17394f2a..25a26aae 100644
--- a/okular/core/documentcommands_p.h
+++ b/okular/core/documentcommands_p.h
@@ -10,8 +10,8 @@
 #ifndef _OKULAR_DOCUMENT_COMMANDS_P_H_
 #define _OKULAR_DOCUMENT_COMMANDS_P_H_
 
-#include <QtGui/QUndoCommand>
-#include <QDomNode>
+#include <QtGui/qundostack.h>
+#include <QtXml/qdom.h>
 
 #include "area.h"
 
diff --git a/okular/core/fileprinter.cpp b/okular/core/fileprinter.cpp
index c65bd121..6400b271 100644
--- a/okular/core/fileprinter.cpp
+++ b/okular/core/fileprinter.cpp
@@ -19,7 +19,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtGui/QLabel>
-#include <QtGui/QShowEvent>
+#include <QtGui/qevent.h>
 #include <QtNetwork/QTcpSocket>
 
 #include <KProcess>
diff --git a/okular/core/fontinfo.h b/okular/core/fontinfo.h
index d11b3b0a..adbda243 100644
--- a/okular/core/fontinfo.h
+++ b/okular/core/fontinfo.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QList>
 #include <QtCore/QMetaType>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtCore/QString>
 
 #include "okular_export.h"
diff --git a/okular/core/generator.h b/okular/core/generator.h
index 506f8a82..977a9025 100644
--- a/okular/core/generator.h
+++ b/okular/core/generator.h
@@ -20,8 +20,8 @@
 
 #include <QtCore/QList>
 #include <QtCore/QObject>
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QSizeF>
+#include <QtCore/qshareddata.h>
+#include <QtCore/qsize.h>
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
diff --git a/okular/core/global.h b/okular/core/global.h
index 92a922f6..68c7d578 100644
--- a/okular/core/global.h
+++ b/okular/core/global.h
@@ -10,7 +10,7 @@
 #ifndef OKULAR_GLOBAL_H
 #define OKULAR_GLOBAL_H
 
-#include <QtCore/QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 namespace Okular {
 
diff --git a/okular/core/page.cpp b/okular/core/page.cpp
index 16cc3a4a..dbed8797 100644
--- a/okular/core/page.cpp
+++ b/okular/core/page.cpp
@@ -16,8 +16,8 @@
 #include <QtCore/QVariant>
 #include <QtCore/QUuid>
 #include <QtGui/QPixmap>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 
 #include <kdebug.h>
 
@@ -45,7 +45,7 @@
 #include <limits>
 
 #ifdef PAGE_PROFILE
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #endif
 
 using namespace Okular;
diff --git a/okular/core/pagesize.h b/okular/core/pagesize.h
index 0619f06b..38c720be 100644
--- a/okular/core/pagesize.h
+++ b/okular/core/pagesize.h
@@ -11,7 +11,7 @@
 #define _OKULAR_PAGESIZE_H_
 
 #include <QtCore/QList>
-#include <QtCore/QSharedDataPointer>
+#include <QtCore/qshareddata.h>
 #include <QtCore/QString>
 
 #include "okular_export.h"
diff --git a/okular/core/textdocumentgenerator_p.h b/okular/core/textdocumentgenerator_p.h
index fba73ff6..f86c46a3 100644
--- a/okular/core/textdocumentgenerator_p.h
+++ b/okular/core/textdocumentgenerator_p.h
@@ -11,7 +11,7 @@
 #define _OKULAR_TEXTDOCUMENTGENERATOR_P_H_
 
 #include <QtGui/QAbstractTextDocumentLayout>
-#include <QtGui/QTextBlock>
+#include <QtGui/qtextobject.h>
 #include <QtGui/QTextDocument>
 
 #include "action.h"
diff --git a/okular/core/textpage.cpp b/okular/core/textpage.cpp
index 348dea08..9d2c0707 100644
--- a/okular/core/textpage.cpp
+++ b/okular/core/textpage.cpp
@@ -20,7 +20,7 @@
 
 #include <cstring>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 #include <QVarLengthArray>
 
 using namespace Okular;
diff --git a/okular/generators/dvi/bigEndianByteReader.h b/okular/generators/dvi/bigEndianByteReader.h
index 80ff009c..e7e54f06 100644
--- a/okular/generators/dvi/bigEndianByteReader.h
+++ b/okular/generators/dvi/bigEndianByteReader.h
@@ -18,7 +18,7 @@
 #ifndef _bigEndianByteReader_H
 #define _bigEndianByteReader_H
 
-#include <QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 
 class bigEndianByteReader {
diff --git a/okular/generators/dvi/dviFile.cpp b/okular/generators/dvi/dviFile.cpp
index d90ff1c6..e6b6db83 100644
--- a/okular/generators/dvi/dviFile.cpp
+++ b/okular/generators/dvi/dviFile.cpp
@@ -61,7 +61,7 @@
 #include <klocale.h>
 
 #include <QProcess>
-#include <QSysInfo>
+#include <QtCore/qglobal.h>
 #include <QTemporaryFile>
 
 #include <cstdlib>
@@ -378,7 +378,7 @@ QString dvifile::convertPDFtoPS(const QString &PDFFilename, QString *converrorms
 
   // Use pdf2ps to do the conversion
   QProcess pdf2ps;
-  pdf2ps.setReadChannelMode(QProcess::MergedChannels);
+  pdf2ps.setProcessChannelMode(QProcess::MergedChannels);
   pdf2ps.start("pdf2ps",
                QStringList() << PDFFilename << convertedFileName,
                QIODevice::ReadOnly|QIODevice::Text);
diff --git a/okular/generators/dvi/dviRenderer.cpp b/okular/generators/dvi/dviRenderer.cpp
index 0bb117df..028e6c1a 100644
--- a/okular/generators/dvi/dviRenderer.cpp
+++ b/okular/generators/dvi/dviRenderer.cpp
@@ -22,7 +22,7 @@
 #include "dviPageInfo.h"
 
 #include <math.h>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/okular/generators/dvi/fontEncoding.cpp b/okular/generators/dvi/fontEncoding.cpp
index 615cd6d4..36a4c9a7 100644
--- a/okular/generators/dvi/fontEncoding.cpp
+++ b/okular/generators/dvi/fontEncoding.cpp
@@ -29,7 +29,7 @@ fontEncoding::fontEncoding(const QString &encName)
   _isValid = false;
   // Use kpsewhich to find the encoding file.
   QProcess kpsewhich;
-  kpsewhich.setReadChannelMode(QProcess::MergedChannels);
+  kpsewhich.setProcessChannelMode(QProcess::MergedChannels);
 
   kpsewhich.start("kpsewhich",
                   QStringList() << encName,
diff --git a/okular/generators/dvi/pageNumber.h b/okular/generators/dvi/pageNumber.h
index 9da4e59f..2db86dd2 100644
--- a/okular/generators/dvi/pageNumber.h
+++ b/okular/generators/dvi/pageNumber.h
@@ -10,7 +10,7 @@
 #ifndef PAGENUMBER_H
 #define PAGENUMBER_H
 
-#include <QGlobalStatic>
+#include <QtCore/qglobal.h>
 
 
 /** \brief Class to represent a page number
diff --git a/okular/generators/epub/converter.cpp b/okular/generators/epub/converter.cpp
index 392947ea..44991318 100644
--- a/okular/generators/epub/converter.cpp
+++ b/okular/generators/epub/converter.cpp
@@ -11,7 +11,7 @@
 
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 #include <QTextDocumentFragment>
 #include <QFileInfo>
 #include <QApplication> // Because of the HACK
diff --git a/okular/generators/fictionbook/converter.cpp b/okular/generators/fictionbook/converter.cpp
index 0c723c49..64c468a7 100644
--- a/okular/generators/fictionbook/converter.cpp
+++ b/okular/generators/fictionbook/converter.cpp
@@ -9,14 +9,14 @@
 
 #include "converter.h"
 
-#include <QtCore/QDate>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QUrl>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomText>
+#include <QtGui/qtextobject.h>
+
+#include <QtXml/qdom.h>
 
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/okular/generators/fictionbook/document.h b/okular/generators/fictionbook/document.h
index 0abf5848..114ed6d5 100644
--- a/okular/generators/fictionbook/document.h
+++ b/okular/generators/fictionbook/document.h
@@ -13,7 +13,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 
 namespace FictionBook {
 
diff --git a/okular/generators/mobipocket/converter.cpp b/okular/generators/mobipocket/converter.cpp
index afc077a6..81fbfc9e 100644
--- a/okular/generators/mobipocket/converter.cpp
+++ b/okular/generators/mobipocket/converter.cpp
@@ -11,8 +11,8 @@
 
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
+
 #include <QtGui/QTextDocumentFragment>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
diff --git a/okular/generators/ooo/converter.cpp b/okular/generators/ooo/converter.cpp
index c70e370f..086c51b2 100644
--- a/okular/generators/ooo/converter.cpp
+++ b/okular/generators/ooo/converter.cpp
@@ -13,9 +13,9 @@
 #include <QtCore/QUrl>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 #include <QtGui/QTextList>
-#include <QtGui/QTextTableCell>
+#include <QtGui/qtexttable.h>
 #include <QtXml/qdom.h>
 #include <QtXml/qdom.h>
 #include <QtXml/qxml.h>
diff --git a/okular/generators/plucker/generator_plucker.h b/okular/generators/plucker/generator_plucker.h
index 8dac4b83..d8cc2d08 100644
--- a/okular/generators/plucker/generator_plucker.h
+++ b/okular/generators/plucker/generator_plucker.h
@@ -13,7 +13,7 @@
 #include <core/document.h>
 #include <core/generator.h>
 
-#include <QtGui/QTextBlock>
+#include <QtGui/qtextobject.h>
 
 #include "qunpluck.h"
 
diff --git a/okular/generators/plucker/unpluck/qunpluck.cpp b/okular/generators/plucker/unpluck/qunpluck.cpp
index 8363dd33..11539882 100644
--- a/okular/generators/plucker/unpluck/qunpluck.cpp
+++ b/okular/generators/plucker/unpluck/qunpluck.cpp
@@ -18,11 +18,11 @@
 #include <QtCore/QDateTime>
 #include <QtGui/QAbstractTextDocumentLayout>
 #include <QtGui/QFont>
-#include <QtGui/QTextBlock>
-#include <QtGui/QTextCharFormat>
+#include <QtGui/qtextobject.h>
+#include <QtGui/qtextformat.h>
 #include <QtGui/QTextCursor>
 #include <QtGui/QTextDocument>
-#include <QtGui/QTextFrame>
+
 
 #include <QtGui/QLabel>
 
diff --git a/okular/generators/txt/converter.cpp b/okular/generators/txt/converter.cpp
index 5c1abfc9..7ee9fca0 100644
--- a/okular/generators/txt/converter.cpp
+++ b/okular/generators/txt/converter.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 
 
-#include <QtGui/QTextFrame>
+#include <QtGui/qtextobject.h>
 
 #include "converter.h"
 #include "document.h"
diff --git a/okular/generators/xps/generator_xps.h b/okular/generators/xps/generator_xps.h
index 4c56e8c7..9bd7443f 100644
--- a/okular/generators/xps/generator_xps.h
+++ b/okular/generators/xps/generator_xps.h
@@ -24,11 +24,11 @@
 #include <core/textpage.h>
 
 #include <QColor>
-#include <QDomDocument>
+#include <QtXml/qdom.h>
 #include <QFontDatabase>
 #include <QImage>
-#include <QXmlStreamReader>
-#include <QXmlDefaultHandler>
+#include <QtCore/qxmlstream.h>
+#include <QtXml/qxml.h>
 #include <QStack>
 #include <QVariant>
 
diff --git a/okular/plasma/components/pageitem.cpp b/okular/plasma/components/pageitem.cpp
index efd2cb89..bc08e6e5 100644
--- a/okular/plasma/components/pageitem.cpp
+++ b/okular/plasma/components/pageitem.cpp
@@ -22,7 +22,7 @@
 
 #include <QPainter>
 #include <QTimer>
-#include <QStyleOptionGraphicsItem>
+#include <QtGui/qstyleoption.h>
 
 #include <core/bookmarkmanager.h>
 #include <core/document.h>
diff --git a/okular/shell/okular_main.cpp b/okular/shell/okular_main.cpp
index ef2a5de0..dc27c7e9 100644
--- a/okular/shell/okular_main.cpp
+++ b/okular/shell/okular_main.cpp
@@ -17,6 +17,7 @@
 #include "shell.h"
 #include <kapplication.h>
 #include <klocale.h>
+#include <QTemporaryFile>
 #include <QtDBus/qdbusinterface.h>
 #include <QTextStream>
 #include <kwindowsystem.h>
diff --git a/okular/shell/shell.cpp b/okular/shell/shell.cpp
index e12f60ee..1adef4ab 100644
--- a/okular/shell/shell.cpp
+++ b/okular/shell/shell.cpp
@@ -44,7 +44,7 @@
 #include <kwindowsystem.h>
 #include <ktabwidget.h>
 #include <kxmlguifactory.h>
-#include <QDragMoveEvent>
+#include <QtGui/qevent.h>
 #include <QTabBar>
 
 // local includes
diff --git a/okular/ui/annotationproxymodels.cpp b/okular/ui/annotationproxymodels.cpp
index 27e747ca..c3e76ee5 100644
--- a/okular/ui/annotationproxymodels.cpp
+++ b/okular/ui/annotationproxymodels.cpp
@@ -10,7 +10,7 @@
 #include "annotationproxymodels.h"
 
 #include <QtCore/QList>
-#include <QtGui/QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 
 #include <kicon.h>
 
diff --git a/okular/ui/fileprinterpreview.cpp b/okular/ui/fileprinterpreview.cpp
index 9fca338c..cd441e64 100644
--- a/okular/ui/fileprinterpreview.cpp
+++ b/okular/ui/fileprinterpreview.cpp
@@ -16,7 +16,7 @@
 #include <QSize>
 #include <QtCore/QFile>
 #include <QtGui/QLabel>
-#include <QtGui/QShowEvent>
+#include <QtGui/qevent.h>
 
 #include <kmimetypetrader.h>
 #include <kparts/part.h>
diff --git a/okular/ui/formwidgets.cpp b/okular/ui/formwidgets.cpp
index a7f7ffdd..22d07d1b 100644
--- a/okular/ui/formwidgets.cpp
+++ b/okular/ui/formwidgets.cpp
@@ -11,7 +11,7 @@
 #include "pageviewutils.h"
 
 #include <qbuttongroup.h>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QMenu>
 #include <QEvent>
 #include <klineedit.h>
diff --git a/okular/ui/ktreeviewsearchline.cpp b/okular/ui/ktreeviewsearchline.cpp
index cfd340a4..5bd46112 100644
--- a/okular/ui/ktreeviewsearchline.cpp
+++ b/okular/ui/ktreeviewsearchline.cpp
@@ -25,7 +25,7 @@
 #include <QtCore/QTimer>
 #include <QtCore/QRegExp>
 #include <QtGui/QApplication>
-#include <QtGui/QContextMenuEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
diff --git a/okular/ui/minibar.cpp b/okular/ui/minibar.cpp
index 56b18d4c..571a1143 100644
--- a/okular/ui/minibar.cpp
+++ b/okular/ui/minibar.cpp
@@ -17,7 +17,7 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QStylePainter>
 #include <QtGui/QToolButton>
 #include <qvalidator.h>
diff --git a/okular/ui/pageitemdelegate.cpp b/okular/ui/pageitemdelegate.cpp
index 069ac6cb..ce629d27 100644
--- a/okular/ui/pageitemdelegate.cpp
+++ b/okular/ui/pageitemdelegate.cpp
@@ -12,7 +12,7 @@
 // qt/kde includes
 #include <qapplication.h>
 #include <QItemDelegate>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QTextDocument>
 #include <qvariant.h>
 
diff --git a/okular/ui/side_reviews.cpp b/okular/ui/side_reviews.cpp
index 48c9d987..6f962283 100644
--- a/okular/ui/side_reviews.cpp
+++ b/okular/ui/side_reviews.cpp
@@ -13,7 +13,7 @@
 #include <QtCore/QStringList>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLayout>
-#include <QtGui/QPaintEvent>
+#include <QtGui/qevent.h>
 #include <QtGui/QPainter>
 #include <QtGui/QSizePolicy>
 #include <QtGui/QTextDocument>
diff --git a/okular/ui/side_reviews.h b/okular/ui/side_reviews.h
index 0b0befcc..9d1f9b08 100644
--- a/okular/ui/side_reviews.h
+++ b/okular/ui/side_reviews.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_SIDE_REVIEWS_H_
 #define _OKULAR_SIDE_REVIEWS_H_
 
-#include <QtCore/QModelIndexList>
+#include <QtCore/qabstractitemmodel.h>
 #include <QtCore/QVector>
 #include <QtGui/QWidget>
 
diff --git a/okular/ui/toc.h b/okular/ui/toc.h
index e6fda3ca..3338c8d7 100644
--- a/okular/ui/toc.h
+++ b/okular/ui/toc.h
@@ -12,7 +12,7 @@
 
 #include <qwidget.h>
 #include "core/observer.h"
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 
 #include "okular_part_export.h"
 
diff --git a/partitionmanager/CMakeLists.txt b/partitionmanager/CMakeLists.txt
index 4158a038..08ab7d19 100644
--- a/partitionmanager/CMakeLists.txt
+++ b/partitionmanager/CMakeLists.txt
@@ -20,13 +20,6 @@ project(partitionmanager)
 set(CMAKE_USE_RELATIVE_PATHS OFF)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
-set(VERSION_MAJOR "1")
-set(VERSION_MINOR "1")
-set(VERSION_RELEASE "1")
-set(VERSION_SUFFIX "")
-set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
-add_definitions(-DVERSION="${VERSION}")
-
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(BLKID REQUIRED blkid)
 pkg_check_modules(LIBATASMART REQUIRED libatasmart)
diff --git a/partitionmanager/src/core/operationstack.cpp b/partitionmanager/src/core/operationstack.cpp
index 30cedbf7..55f00030 100644
--- a/partitionmanager/src/core/operationstack.cpp
+++ b/partitionmanager/src/core/operationstack.cpp
@@ -43,8 +43,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <QReadLocker>
-#include <QWriteLocker>
+#include <QtCore/qreadwritelock.h>
+#include <QtCore/qreadwritelock.h>
 
 /** Constructs a new OperationStack */
 OperationStack::OperationStack(QObject* parent) :
diff --git a/partitionmanager/src/gui/applyprogressdialog.cpp b/partitionmanager/src/gui/applyprogressdialog.cpp
index 3af263c0..0b679d2a 100644
--- a/partitionmanager/src/gui/applyprogressdialog.cpp
+++ b/partitionmanager/src/gui/applyprogressdialog.cpp
@@ -31,10 +31,10 @@
 #include "util/report.h"
 #include "util/htmlreport.h"
 
-#include <QCloseEvent>
-#include <QTime>
+
+#include <QtCore/qdatetime.h>
 #include <QFont>
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 #include <QFile>
 
 #include <kapplication.h>
diff --git a/partitionmanager/src/gui/applyprogressdialog.h b/partitionmanager/src/gui/applyprogressdialog.h
index e326784f..2691e913 100644
--- a/partitionmanager/src/gui/applyprogressdialog.h
+++ b/partitionmanager/src/gui/applyprogressdialog.h
@@ -24,7 +24,7 @@
 #include <kdialog.h>
 
 #include <QTimer>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QString>
 
 class OperationRunner;
diff --git a/partitionmanager/src/gui/devicepropsdialog.cpp b/partitionmanager/src/gui/devicepropsdialog.cpp
index 158051a1..31b1e9d6 100644
--- a/partitionmanager/src/gui/devicepropsdialog.cpp
+++ b/partitionmanager/src/gui/devicepropsdialog.cpp
@@ -36,7 +36,7 @@
 #include <kglobal.h>
 #include <kglobalsettings.h>
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QPointer>
 
 /** Creates a new DevicePropsDialog
diff --git a/partitionmanager/src/gui/editmountpointdialogwidget.cpp b/partitionmanager/src/gui/editmountpointdialogwidget.cpp
index c5059c94..cfa94d2c 100644
--- a/partitionmanager/src/gui/editmountpointdialogwidget.cpp
+++ b/partitionmanager/src/gui/editmountpointdialogwidget.cpp
@@ -201,7 +201,7 @@ bool EditMountPointDialogWidget::readMountpoints(const QString& filename)
 			device = findBlkIdDevice("LABEL", QString(device).remove("LABEL="));
 		}
 		else if (device.startsWith('/'))
-			device = QFile::symLinkTarget(device);
+			device = QFile::readLink(device);
 
 		if (!device.isEmpty())
 		{
diff --git a/partitionmanager/src/gui/mainwindow.cpp b/partitionmanager/src/gui/mainwindow.cpp
index ef29b836..6c7cf38c 100644
--- a/partitionmanager/src/gui/mainwindow.cpp
+++ b/partitionmanager/src/gui/mainwindow.cpp
@@ -69,8 +69,8 @@
 #include <kio/copyjob.h>
 #include <ktemporaryfile.h>
 
-#include <QCloseEvent>
-#include <QReadLocker>
+#include <QtGui/qevent.h>
+#include <QtCore/qreadwritelock.h>
 #include <QPointer>
 #include <QFile>
 #include <QDateTime>
diff --git a/partitionmanager/src/gui/newdialog.cpp b/partitionmanager/src/gui/newdialog.cpp
index fef4adf3..da4995e1 100644
--- a/partitionmanager/src/gui/newdialog.cpp
+++ b/partitionmanager/src/gui/newdialog.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 /** Creates a NewDialog
 	@param parent the parent widget
diff --git a/partitionmanager/src/gui/partitionmanagerwidget.cpp b/partitionmanager/src/gui/partitionmanagerwidget.cpp
index 873d27c9..178af466 100644
--- a/partitionmanager/src/gui/partitionmanagerwidget.cpp
+++ b/partitionmanager/src/gui/partitionmanagerwidget.cpp
@@ -57,7 +57,7 @@
 
 #include <QCursor>
 #include <QPointer>
-#include <QReadLocker>
+#include <QtCore/qreadwritelock.h>
 
 #include <config.h>
 
diff --git a/partitionmanager/src/gui/partpropsdialog.cpp b/partitionmanager/src/gui/partpropsdialog.cpp
index 2d0ff7e7..e7ee8937 100644
--- a/partitionmanager/src/gui/partpropsdialog.cpp
+++ b/partitionmanager/src/gui/partpropsdialog.cpp
@@ -35,7 +35,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 
-#include <QtAlgorithms>
+#include <QtCore/qalgorithms.h>
 
 /** Creates a new PartPropsDialog
 	@param parent pointer to the parent widget
diff --git a/partitionmanager/src/gui/partresizerwidget.cpp b/partitionmanager/src/gui/partresizerwidget.cpp
index 3fb069ff..54ed7e53 100644
--- a/partitionmanager/src/gui/partresizerwidget.cpp
+++ b/partitionmanager/src/gui/partresizerwidget.cpp
@@ -28,12 +28,12 @@
 #include "fs/filesystem.h"
 
 #include <QPainter>
-#include <QMouseEvent>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QStyleOptionToolBar>
-#include <QStyleOptionFrameV3>
-#include <QStyleOptionButton>
+
+#include <QtGui/qevent.h>
+
+#include <QtGui/qstyleoption.h>
+#include <QtGui/qstyleoption.h>
+
 
 #include <kdebug.h>
 #include <kcolorscheme.h>
diff --git a/partitionmanager/src/gui/parttablewidget.cpp b/partitionmanager/src/gui/parttablewidget.cpp
index 39c505d8..f135eafe 100644
--- a/partitionmanager/src/gui/parttablewidget.cpp
+++ b/partitionmanager/src/gui/parttablewidget.cpp
@@ -22,7 +22,7 @@
 
 #include "core/partitiontable.h"
 
-#include <QMouseEvent>
+#include <QtGui/qevent.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/partitionmanager/src/gui/partwidget.cpp b/partitionmanager/src/gui/partwidget.cpp
index 9f83c068..3e246e27 100644
--- a/partitionmanager/src/gui/partwidget.cpp
+++ b/partitionmanager/src/gui/partwidget.cpp
@@ -26,7 +26,7 @@
 #include "fs/filesystem.h"
 
 #include <QPainter>
-#include <QStyleOptionButton>
+#include <QtGui/qstyleoption.h>
 #include <QApplication>
 #include <QPlastiqueStyle>
 
diff --git a/partitionmanager/src/gui/smartdialog.cpp b/partitionmanager/src/gui/smartdialog.cpp
index c480cb02..466e2e27 100644
--- a/partitionmanager/src/gui/smartdialog.cpp
+++ b/partitionmanager/src/gui/smartdialog.cpp
@@ -41,7 +41,7 @@
 #include <kglobalsettings.h>
 #include <kglobal.h>
 
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QTextStream>
 #include <QTextDocument>
 #include <qglobal.h>
diff --git a/partitionmanager/src/gui/treelog.cpp b/partitionmanager/src/gui/treelog.cpp
index 32316957..90a8df54 100644
--- a/partitionmanager/src/gui/treelog.cpp
+++ b/partitionmanager/src/gui/treelog.cpp
@@ -38,7 +38,7 @@
 
 #include <QFile>
 #include <QTreeWidget>
-#include <QTreeWidgetItem>
+#include <QtGui/qtreewidget.h>
 #include <QDateTime>
 #include <QTextStream>
 
diff --git a/partitionmanager/src/jobs/job.cpp b/partitionmanager/src/jobs/job.cpp
index 6e480a8f..c56e2478 100644
--- a/partitionmanager/src/jobs/job.cpp
+++ b/partitionmanager/src/jobs/job.cpp
@@ -28,7 +28,7 @@
 #include "util/report.h"
 
 #include <QIcon>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/partitionmanager/src/plugins/dummy/dummybackend.cpp b/partitionmanager/src/plugins/dummy/dummybackend.cpp
index 59af190f..5dde0259 100644
--- a/partitionmanager/src/plugins/dummy/dummybackend.cpp
+++ b/partitionmanager/src/plugins/dummy/dummybackend.cpp
@@ -45,7 +45,7 @@ static KAboutData createPluginAboutData()
 		"pmdummybackendplugin",
 		NULL,
 		ki18nc("@title", "Dummy Backend Plugin"),
-		QString(VERSION).toUtf8(),
+		KDE_VERSION_STRING,
 		ki18n("KDE Partition Manager dummy backend."),
 		KAboutData::License_GPL,
 		ki18n("Copyright 2010 Volker Lanz"));
diff --git a/partitionmanager/src/plugins/libparted/libpartedbackend.cpp b/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
index 3e7b8d20..5199b51a 100644
--- a/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
+++ b/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
@@ -61,7 +61,7 @@ static KAboutData createPluginAboutData()
 		"pmlibpartedbackendplugin",
 		NULL,
 		ki18nc("@title", "LibParted Backend Plugin"),
-		QString("%1, libparted version: %2").arg(VERSION).arg(ped_get_version()).toUtf8(),
+		QString("%1, libparted version: %2").arg(KDE_VERSION_STRING).arg(ped_get_version()).toUtf8(),
 		ki18n("KDE Partition Manager backend for libparted."),
 		KAboutData::License_GPL,
 		ki18n("Copyright 2008,2009,2010 Volker Lanz"));
diff --git a/partitionmanager/src/util/helpers.cpp b/partitionmanager/src/util/helpers.cpp
index 2b0010d6..f8d9520e 100644
--- a/partitionmanager/src/util/helpers.cpp
+++ b/partitionmanager/src/util/helpers.cpp
@@ -119,7 +119,7 @@ KAboutData* createPartitionManagerAboutData()
 		"partitionmanager",
 		NULL,
 		ki18nc("@title", "<application>KDE Partition Manager</application>"),
-		VERSION,
+		KDE_VERSION_STRING,
 		ki18nc("@title", "Manage your disks, partitions and file systems"),
 		KAboutData::License_GPL,
 		ki18nc("@info:credit", "© 2008-2013 Volker Lanz")
diff --git a/print-manager/configure-printer/ConfigureDialog.h b/print-manager/configure-printer/ConfigureDialog.h
index 9994edb4..49688194 100644
--- a/print-manager/configure-printer/ConfigureDialog.h
+++ b/print-manager/configure-printer/ConfigureDialog.h
@@ -21,7 +21,7 @@
 #ifndef CONFIGURE_DIALOG_H
 #define CONFIGURE_DIALOG_H
 
-#include <QCloseEvent>
+#include <QtGui/qevent.h>
 #include <KPageDialog>
 
 class PrinterPage;
diff --git a/print-manager/configure-printer/ConfigurePrinterInterface.cpp b/print-manager/configure-printer/ConfigurePrinterInterface.cpp
index e4ddcab3..a84160e0 100644
--- a/print-manager/configure-printer/ConfigurePrinterInterface.cpp
+++ b/print-manager/configure-printer/ConfigurePrinterInterface.cpp
@@ -26,6 +26,7 @@
 
 #include <QtDBus/QDBusConnection>
 #include <QtCore/QTimer>
+#include <QtCore/QPointer>
 #include <QtGui/QLayout>
 #include <KWindowSystem>
 #include <KDialog>
diff --git a/print-manager/libkcups/KCupsConnection.h b/print-manager/libkcups/KCupsConnection.h
index e83ef6ac..c61e25a2 100644
--- a/print-manager/libkcups/KCupsConnection.h
+++ b/print-manager/libkcups/KCupsConnection.h
@@ -23,7 +23,7 @@
 
 #include <QThread>
 #include <QTimer>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 #include <QStringList>
 #include <QWidget>
 
diff --git a/print-manager/libkcups/PPDModel.h b/print-manager/libkcups/PPDModel.h
index 76853317..0317981f 100644
--- a/print-manager/libkcups/PPDModel.h
+++ b/print-manager/libkcups/PPDModel.h
@@ -22,7 +22,7 @@
 #define PPD_MODEL_H
 
 #include <QStandardItemModel>
-#include <QVariantHash>
+#include <QtCore/qvariant.h>
 
 struct DriverMatch{
     QString ppd;
diff --git a/print-manager/libkcups/SelectMakeModel.cpp b/print-manager/libkcups/SelectMakeModel.cpp
index 60772bb4..8ee3bfd8 100644
--- a/print-manager/libkcups/SelectMakeModel.cpp
+++ b/print-manager/libkcups/SelectMakeModel.cpp
@@ -28,7 +28,7 @@
 
 #include <QStandardItemModel>
 #include <QLineEdit>
-#include <QItemSelection>
+#include <QtGui/qitemselectionmodel.h>
 #include <QStringBuilder>
 
 #include <QtDBus/QDBusMessage>
diff --git a/print-manager/plasmoid/KPrintManagerConfigPlugin.cpp b/print-manager/plasmoid/KPrintManagerConfigPlugin.cpp
index 22a516cc..556dbb70 100644
--- a/print-manager/plasmoid/KPrintManagerConfigPlugin.cpp
+++ b/print-manager/plasmoid/KPrintManagerConfigPlugin.cpp
@@ -20,7 +20,7 @@
 #include "KPrintManagerConfigPlugin.h"
 #include "ClassListWidget.h"
 
-#include <QtPlugin>
+#include <QtCore/qplugin.h>
 
 #include <KGlobal>
 
diff --git a/print-manager/plasmoid/KPrintManagerConfigPlugin.h b/print-manager/plasmoid/KPrintManagerConfigPlugin.h
index 3abade83..4c6d4df7 100644
--- a/print-manager/plasmoid/KPrintManagerConfigPlugin.h
+++ b/print-manager/plasmoid/KPrintManagerConfigPlugin.h
@@ -21,7 +21,11 @@
 #define KPRINT_MANAGER_CONFIG_H
 
 #include <QObject>
-#include <QDesignerCustomWidgetInterface>
+#ifdef QT_KATIE
+#include <QtUiTools/customwidget.h>
+#else
+#include <QtDesigner/customwidget.h>
+#endif
 
 class KPrintManagerConfigPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
diff --git a/print-manager/print-manager-kded/NewPrinterNotification.cpp b/print-manager/print-manager-kded/NewPrinterNotification.cpp
index 7fc00ae8..aa1be150 100644
--- a/print-manager/print-manager-kded/NewPrinterNotification.cpp
+++ b/print-manager/print-manager-kded/NewPrinterNotification.cpp
@@ -30,6 +30,7 @@
 #include <KCupsRequest.h>
 
 #include <QThread>
+#include <QPointer>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusServiceWatcher>
diff --git a/print-manager/print-manager-kded/PrintManagerKded.h b/print-manager/print-manager-kded/PrintManagerKded.h
index fa238cc1..388bb72f 100644
--- a/print-manager/print-manager-kded/PrintManagerKded.h
+++ b/print-manager/print-manager-kded/PrintManagerKded.h
@@ -23,7 +23,7 @@
 
 #include <KDEDModule>
 
-#include <QVariantList>
+#include <QtCore/qvariant.h>
 
 class NewPrinterNotification;
 class PrintManagerKded : public KDEDModule
diff --git a/print-manager/printqueue/PrintQueueUi.h b/print-manager/printqueue/PrintQueueUi.h
index afa8dfa1..335794dd 100644
--- a/print-manager/printqueue/PrintQueueUi.h
+++ b/print-manager/printqueue/PrintQueueUi.h
@@ -22,7 +22,7 @@
 #define PRINT_QUEUE_UI_H
 
 #include <KDialog>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QToolButton>
 
 namespace Ui {
diff --git a/skanlite/src/ImageViewer.cpp b/skanlite/src/ImageViewer.cpp
index d3e2a879..d1711aab 100644
--- a/skanlite/src/ImageViewer.cpp
+++ b/skanlite/src/ImageViewer.cpp
@@ -25,7 +25,7 @@
 #include "ImageViewer.h"
 #include "moc_ImageViewer.cpp"
 
-#include <QGraphicsPixmapItem>
+#include <QtGui/qgraphicsitem.h>
 #include <QGraphicsScene>
 #include <QScrollBar>
 #include <QAction>
diff --git a/skanlite/src/ImageViewer.h b/skanlite/src/ImageViewer.h
index 890ca989..1aaf2040 100644
--- a/skanlite/src/ImageViewer.h
+++ b/skanlite/src/ImageViewer.h
@@ -26,7 +26,7 @@
 #define IMAGE_VIEWER_H
 
 #include <QGraphicsView>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 
 class ImageViewer : public QGraphicsView
 {
diff --git a/syndication/atom/atomtools.cpp b/syndication/atom/atomtools.cpp
index 46c1d0ea..4d0053bf 100644
--- a/syndication/atom/atomtools.cpp
+++ b/syndication/atom/atomtools.cpp
@@ -25,7 +25,7 @@
 #include <syndication/elementwrapper.h>
 #include <syndication/tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/atom/category.cpp b/syndication/atom/category.cpp
index f27f5270..5c2fa472 100644
--- a/syndication/atom/category.cpp
+++ b/syndication/atom/category.cpp
@@ -23,7 +23,7 @@
 #include "category.h"
 #include "constants.h"
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/atom/content.cpp b/syndication/atom/content.cpp
index 53876a12..79fe8605 100644
--- a/syndication/atom/content.cpp
+++ b/syndication/atom/content.cpp
@@ -25,7 +25,7 @@
 #include <tools.h>
 
 #include <QtCore/QByteArray>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/syndication/atom/document.cpp b/syndication/atom/document.cpp
index 843b866a..c9bbda2a 100644
--- a/syndication/atom/document.cpp
+++ b/syndication/atom/document.cpp
@@ -32,7 +32,7 @@
 #include <documentvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
diff --git a/syndication/atom/entry.cpp b/syndication/atom/entry.cpp
index 9141a80e..671d97dc 100644
--- a/syndication/atom/entry.cpp
+++ b/syndication/atom/entry.cpp
@@ -31,7 +31,7 @@
 #include <specificitemvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/atom/parser.cpp b/syndication/atom/parser.cpp
index 2338f812..332991ee 100644
--- a/syndication/atom/parser.cpp
+++ b/syndication/atom/parser.cpp
@@ -27,12 +27,12 @@
 
 #include <documentsource.h>
 
-#include <QtXml/QDomAttr>
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNamedNodeMap>
-#include <QtXml/QDomNode>
-#include <QtXml/QDomNodeList>
+
+
+
+#include <QtXml/qdom.h>
+
+#include <QtXml/qdom.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QRegExp>
diff --git a/syndication/atom/source.cpp b/syndication/atom/source.cpp
index 26f72452..06aac8da 100644
--- a/syndication/atom/source.cpp
+++ b/syndication/atom/source.cpp
@@ -30,7 +30,7 @@
 
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
diff --git a/syndication/documentsource.cpp b/syndication/documentsource.cpp
index d6081643..39122867 100644
--- a/syndication/documentsource.cpp
+++ b/syndication/documentsource.cpp
@@ -24,8 +24,8 @@
 #include "tools.h"
 
 #include <QtCore/QByteArray>
-#include <QtXml/QDomDocument>
-#include <QtXml/QXmlSimpleReader>
+#include <QtXml/qdom.h>
+#include <QtXml/qxml.h>
 
 namespace Syndication {
 
diff --git a/syndication/elementwrapper.cpp b/syndication/elementwrapper.cpp
index a3983387..b394fe35 100644
--- a/syndication/elementwrapper.cpp
+++ b/syndication/elementwrapper.cpp
@@ -24,8 +24,8 @@
 
 #include <kurl.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 #include <QtCore/QTextStream>
diff --git a/syndication/mapper/feedatomimpl.cpp b/syndication/mapper/feedatomimpl.cpp
index 93f786bc..36cb9678 100644
--- a/syndication/mapper/feedatomimpl.cpp
+++ b/syndication/mapper/feedatomimpl.cpp
@@ -30,9 +30,9 @@
 #include <atom/link.h>
 #include <atom/person.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/mapper/feedrdfimpl.cpp b/syndication/mapper/feedrdfimpl.cpp
index 166d3a53..2d5ea4ad 100644
--- a/syndication/mapper/feedrdfimpl.cpp
+++ b/syndication/mapper/feedrdfimpl.cpp
@@ -30,9 +30,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/syndication/mapper/feedrss2impl.cpp b/syndication/mapper/feedrss2impl.cpp
index 52075036..230361d2 100644
--- a/syndication/mapper/feedrss2impl.cpp
+++ b/syndication/mapper/feedrss2impl.cpp
@@ -29,9 +29,9 @@
 #include <rss2/item.h>
 
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 
 namespace Syndication {
 
diff --git a/syndication/mapper/imageatomimpl.h b/syndication/mapper/imageatomimpl.h
index cd6378ba..c71b2d91 100644
--- a/syndication/mapper/imageatomimpl.h
+++ b/syndication/mapper/imageatomimpl.h
@@ -25,7 +25,7 @@
 
 #include <image.h>
 
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/mapper/itematomimpl.cpp b/syndication/mapper/itematomimpl.cpp
index 254ef659..5ed493d9 100644
--- a/syndication/mapper/itematomimpl.cpp
+++ b/syndication/mapper/itematomimpl.cpp
@@ -34,9 +34,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 using Syndication::Atom::Content;
diff --git a/syndication/mapper/itemrdfimpl.cpp b/syndication/mapper/itemrdfimpl.cpp
index e8838d30..1104d1d7 100644
--- a/syndication/mapper/itemrdfimpl.cpp
+++ b/syndication/mapper/itemrdfimpl.cpp
@@ -33,9 +33,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/syndication/mapper/itemrss2impl.cpp b/syndication/mapper/itemrss2impl.cpp
index daff48fb..1350446d 100644
--- a/syndication/mapper/itemrss2impl.cpp
+++ b/syndication/mapper/itemrss2impl.cpp
@@ -31,9 +31,9 @@
 #include <personimpl.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
-#include <QtCore/QMultiMap>
+#include <QtCore/qmap.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/parsercollectionimpl.h b/syndication/parsercollectionimpl.h
index ad2b20cd..08aa371a 100644
--- a/syndication/parsercollectionimpl.h
+++ b/syndication/parsercollectionimpl.h
@@ -31,7 +31,7 @@
 #include <syndication/global.h>
 #include <syndication/mapper.h>
 
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 #include <QtCore/QHash>
 #include <QtCore/QString>
 
diff --git a/syndication/rdf/modelmaker.cpp b/syndication/rdf/modelmaker.cpp
index daf0546c..5c3815e1 100644
--- a/syndication/rdf/modelmaker.cpp
+++ b/syndication/rdf/modelmaker.cpp
@@ -29,7 +29,7 @@
 #include "sequence.h"
 #include "statement.h"
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/rdf/parser.cpp b/syndication/rdf/parser.cpp
index f675236a..dcb27f1f 100644
--- a/syndication/rdf/parser.cpp
+++ b/syndication/rdf/parser.cpp
@@ -32,8 +32,8 @@
 
 #include <documentsource.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomNodeList>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QMap>
diff --git a/syndication/rss2/document.cpp b/syndication/rss2/document.cpp
index 086088e3..68515dae 100644
--- a/syndication/rss2/document.cpp
+++ b/syndication/rss2/document.cpp
@@ -31,7 +31,7 @@
 #include <documentvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomDocument>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QSet>
 #include <QtCore/QString>
diff --git a/syndication/rss2/item.cpp b/syndication/rss2/item.cpp
index 47b57955..05f1ab0e 100644
--- a/syndication/rss2/item.cpp
+++ b/syndication/rss2/item.cpp
@@ -30,7 +30,7 @@
 #include <specificitemvisitor.h>
 #include <tools.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 #include <QtCore/QList>
 
diff --git a/syndication/rss2/parser.cpp b/syndication/rss2/parser.cpp
index 8660a983..a9541547 100644
--- a/syndication/rss2/parser.cpp
+++ b/syndication/rss2/parser.cpp
@@ -25,8 +25,8 @@
 
 #include <documentsource.h>
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
+
+#include <QtXml/qdom.h>
 #include <QtCore/QString>
 
 namespace Syndication {
diff --git a/syndication/rss2/tools_p.cpp b/syndication/rss2/tools_p.cpp
index fe6525c6..f6db8952 100644
--- a/syndication/rss2/tools_p.cpp
+++ b/syndication/rss2/tools_p.cpp
@@ -24,7 +24,7 @@
 #include <constants.h>
 #include <elementwrapper.h>
 
-#include <QtXml/QDomElement>
+#include <QtXml/qdom.h>
 #include <QtCore/QList>
 #include <QtCore/QString>
 
diff --git a/syndication/tests/benchmark.cpp b/syndication/tests/benchmark.cpp
index 850d535e..ca547102 100644
--- a/syndication/tests/benchmark.cpp
+++ b/syndication/tests/benchmark.cpp
@@ -31,7 +31,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include <QtCore/QTime>
+#include <QtCore/qdatetime.h>
 #include <QtCore/QTextStream>
 
 #include <iostream>
diff --git a/thumbnailers/po/pocreator.cpp b/thumbnailers/po/pocreator.cpp
index 3f16de04..3c7f0408 100644
--- a/thumbnailers/po/pocreator.cpp
+++ b/thumbnailers/po/pocreator.cpp
@@ -24,7 +24,7 @@
 #include <gettext-po.h>
 #include <QColor>
 #include <QImage>
-#include <QLatin1String>
+#include <QtCore/qstring.h>
 #include <QPainter>
 #include <QWidget>
 #include <kdemacros.h>
diff --git a/yakuake/app/config/skinlistdelegate.cpp b/yakuake/app/config/skinlistdelegate.cpp
index 7bd63b75..d189bee1 100644
--- a/yakuake/app/config/skinlistdelegate.cpp
+++ b/yakuake/app/config/skinlistdelegate.cpp
@@ -23,7 +23,7 @@
 #include "appearancesettings.h"
 
 #include <QApplication>
-#include <QModelIndex>
+#include <QtCore/qabstractitemmodel.h>
 #include <QPainter>
 
 #include <KLocale>
diff --git a/yakuake/app/mainwindow.cpp b/yakuake/app/mainwindow.cpp
index 3f519114..b43d6c9c 100644
--- a/yakuake/app/mainwindow.cpp
+++ b/yakuake/app/mainwindow.cpp
@@ -52,6 +52,7 @@
 #include <QDesktopWidget>
 #include <QPainter>
 #include <QWhatsThis>
+#include <QVarLengthArray>
 #include <QtDBus/QtDBus>
 
 #if defined(Q_WS_X11)
@@ -726,7 +727,7 @@ void MainWindow::applySettings()
 
     m_animationTimer.setInterval(10);
 
-    m_tabBar->setShown(Settings::showTabBar());
+    m_tabBar->setVisible(Settings::showTabBar());
 
     setKeepOpen(Settings::keepOpen());
 
diff --git a/yakuake/app/tabbar.cpp b/yakuake/app/tabbar.cpp
index 3f918330..ac7bfe91 100644
--- a/yakuake/app/tabbar.cpp
+++ b/yakuake/app/tabbar.cpp
@@ -38,7 +38,7 @@
 #include <QPainter>
 #include <QtDBus/QtDBus>
 #include <QToolButton>
-#include <QWheelEvent>
+#include <QtGui/qevent.h>
 #include <QWhatsThis>
 
 #include <QMimeData>
diff --git a/yakuake/app/terminal.cpp b/yakuake/app/terminal.cpp
index e7163f76..176f2d98 100644
--- a/yakuake/app/terminal.cpp
+++ b/yakuake/app/terminal.cpp
@@ -38,7 +38,7 @@
 #include <QLabel>
 #include <QWidget>
 
-#include <QKeyEvent>
+#include <QtGui/qevent.h>
 
 
 int Terminal::m_availableTerminalId = 0;
diff --git a/yakuake/app/visualeventoverlay.h b/yakuake/app/visualeventoverlay.h
index c5cd7185..4a1c3ace 100644
--- a/yakuake/app/visualeventoverlay.h
+++ b/yakuake/app/visualeventoverlay.h
@@ -23,7 +23,7 @@
 
 
 #include <QRect>
-#include <QTime>
+#include <QtCore/qdatetime.h>
 #include <QWidget>