diff --git a/akonadi/asapcat/session.h b/akonadi/asapcat/session.h
index 0edc04c1..80866448 100644
--- a/akonadi/asapcat/session.h
+++ b/akonadi/asapcat/session.h
@@ -24,8 +24,8 @@
 #include <QLocalSocket>
 #include <QTime>
 
-class QIODevice;
-class QSocketNotifier;
+#include <QIODevice>
+#include <QSocketNotifier>
 
 /** ASAP CLI session. */
 class Session : public QObject
diff --git a/akonadi/libs/xdgbasedirs_p.h b/akonadi/libs/xdgbasedirs_p.h
index 208b4e99..073d2c3b 100644
--- a/akonadi/libs/xdgbasedirs_p.h
+++ b/akonadi/libs/xdgbasedirs_p.h
@@ -27,7 +27,7 @@
 #include "akonadiprotocolinternals_export.h"
 
 // forward declarations
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/akonadi/qsqlite/src/QtSql/private/qsqlcachedresult_p.h b/akonadi/qsqlite/src/QtSql/private/qsqlcachedresult_p.h
index ce15cfe7..131c571b 100644
--- a/akonadi/qsqlite/src/QtSql/private/qsqlcachedresult_p.h
+++ b/akonadi/qsqlite/src/QtSql/private/qsqlcachedresult_p.h
@@ -57,8 +57,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QVariant;
-template <typename T> class QVector;
+#include <QVariant>
+#include <QVector>
 
 class QSqlCachedResultPrivate;
 
diff --git a/akonadi/qsqlite/src/qsql_sqlite.h b/akonadi/qsqlite/src/qsql_sqlite.h
index fcf91570..54472138 100644
--- a/akonadi/qsqlite/src/qsql_sqlite.h
+++ b/akonadi/qsqlite/src/qsql_sqlite.h
@@ -63,7 +63,7 @@ class QSQLiteDriver;
 
 class QSQLiteResult : public QSqlCachedResult
 {
-    friend class QSQLiteDriver;
+    friend class <QSQLiteDriver>
     friend class QSQLiteResultPrivate;
 public:
     explicit QSQLiteResult(const QSQLiteDriver* db);
diff --git a/akonadi/rds/bridgeconnection.h b/akonadi/rds/bridgeconnection.h
index 22306462..4f942857 100644
--- a/akonadi/rds/bridgeconnection.h
+++ b/akonadi/rds/bridgeconnection.h
@@ -22,8 +22,8 @@
 
 #include <QObject>
 
-class QTcpSocket;
-class QIODevice;
+#include <QTcpSocket>
+#include <QIODevice>
 
 class BridgeConnection : public QObject
 {
diff --git a/akonadi/server/control/agentmanager.h b/akonadi/server/control/agentmanager.h
index a0c1df5e..0425951a 100644
--- a/akonadi/server/control/agentmanager.h
+++ b/akonadi/server/control/agentmanager.h
@@ -28,9 +28,9 @@
 #include "agenttype.h"
 #include "agentinstance.h"
 
-class QDir;
+#include <QDir>
 #ifndef QT_NO_DEBUG
-class QFileSystemWatcher;
+#include <QFileSystemWatcher>
 #endif
 
 namespace Akonadi {
diff --git a/akonadi/server/control/agenttype.h b/akonadi/server/control/agenttype.h
index b9ad8b48..5ec7794c 100644
--- a/akonadi/server/control/agenttype.h
+++ b/akonadi/server/control/agenttype.h
@@ -30,7 +30,7 @@ namespace Akonadi {
 }
 
 class AgentManager;
-class QSettings;
+#include <QSettings>
 
 class AgentType
 {
diff --git a/akonadi/server/src/akonadi.h b/akonadi/server/src/akonadi.h
index 17b4db29..7a03cbd6 100644
--- a/akonadi/server/src/akonadi.h
+++ b/akonadi/server/src/akonadi.h
@@ -25,7 +25,7 @@
 
 #include <QtNetwork/QLocalServer>
 
-class QProcess;
+#include <QProcess>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/filetracer.h b/akonadi/server/src/filetracer.h
index dc840a62..ff8aee06 100644
--- a/akonadi/server/src/filetracer.h
+++ b/akonadi/server/src/filetracer.h
@@ -22,7 +22,7 @@
 
 #include "tracerinterface.h"
 
-class QFile;
+#include <QFile>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/handler/akappend.h b/akonadi/server/src/handler/akappend.h
index eb5597a4..920f9714 100644
--- a/akonadi/server/src/handler/akappend.h
+++ b/akonadi/server/src/handler/akappend.h
@@ -25,7 +25,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QVector>
 
-class QTemporaryFile;
+#include <QTemporaryFile>
 namespace Akonadi {
 namespace Server {
 
diff --git a/akonadi/server/src/handler/list.h b/akonadi/server/src/handler/list.h
index 56401b31..1c19cd7f 100644
--- a/akonadi/server/src/handler/list.h
+++ b/akonadi/server/src/handler/list.h
@@ -24,7 +24,7 @@
 #include <handler.h>
 #include <scope.h>
 
-template <typename T> class QStack;
+#include <QStack>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/imapstreamparser.h b/akonadi/server/src/imapstreamparser.h
index 706ca71e..bc5b6f93 100644
--- a/akonadi/server/src/imapstreamparser.h
+++ b/akonadi/server/src/imapstreamparser.h
@@ -33,7 +33,7 @@
 
 AKONADI_EXCEPTION_MAKE_INSTANCE( ImapParserException );
 
-class QIODevice;
+#include <QIODevice>
 
 class ImapStreamParserTest;
 
diff --git a/akonadi/server/src/nepomuk/queryserviceclient.h b/akonadi/server/src/nepomuk/queryserviceclient.h
index 46ed84df..0ddaea46 100644
--- a/akonadi/server/src/nepomuk/queryserviceclient.h
+++ b/akonadi/server/src/nepomuk/queryserviceclient.h
@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QHash>
 
-class QUrl;
+#include <QUrl>
 
 namespace Nepomuk {
     namespace Query {
diff --git a/akonadi/server/src/preprocessormanager.h b/akonadi/server/src/preprocessormanager.h
index ee1ed327..f9486ce9 100644
--- a/akonadi/server/src/preprocessormanager.h
+++ b/akonadi/server/src/preprocessormanager.h
@@ -31,8 +31,8 @@
 
 #include <deque>
 
-class QTimer;
-class QMutex;
+#include <QTimer>
+#include <QMutex>
 
 #include "preprocessorinstance.h"
 
diff --git a/akonadi/server/src/search/agentsearchinstance.h b/akonadi/server/src/search/agentsearchinstance.h
index 78ef5aaa..2bd7212e 100644
--- a/akonadi/server/src/search/agentsearchinstance.h
+++ b/akonadi/server/src/search/agentsearchinstance.h
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QString>
 
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 class OrgFreedesktopAkonadiAgentSearchInterface;
 
 namespace Akonadi {
diff --git a/akonadi/server/src/search/searchmanager.h b/akonadi/server/src/search/searchmanager.h
index 867c80a0..b3df627d 100644
--- a/akonadi/server/src/search/searchmanager.h
+++ b/akonadi/server/src/search/searchmanager.h
@@ -28,8 +28,8 @@
 
 #include <libs/notificationmessagev3_p.h>
 
-class QWaitCondition;
-class QTimer;
+#include <QWaitCondition>
+#include <QTimer>
 
 namespace Akonadi {
 
diff --git a/akonadi/server/src/storage/datastore.h b/akonadi/server/src/storage/datastore.h
index 395b227c..026a7a1a 100644
--- a/akonadi/server/src/storage/datastore.h
+++ b/akonadi/server/src/storage/datastore.h
@@ -28,8 +28,8 @@
 #include <QtCore/QThreadStorage>
 #include <QtSql/QSqlDatabase>
 
-class QSqlQuery;
-class QTimer;
+#include <QSqlQuery>
+#include <QTimer>
 
 #include "entities.h"
 #include "notificationcollector.h"
diff --git a/akonadi/server/src/storage/dbconfigmysql.h b/akonadi/server/src/storage/dbconfigmysql.h
index 77b3cc19..6e1ec462 100644
--- a/akonadi/server/src/storage/dbconfigmysql.h
+++ b/akonadi/server/src/storage/dbconfigmysql.h
@@ -22,7 +22,7 @@
 
 #include "dbconfig.h"
 
-class QProcess;
+#include <QProcess>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/dbconfigpostgresql.h b/akonadi/server/src/storage/dbconfigpostgresql.h
index cb3d6182..38cda6f0 100644
--- a/akonadi/server/src/storage/dbconfigpostgresql.h
+++ b/akonadi/server/src/storage/dbconfigpostgresql.h
@@ -22,7 +22,7 @@
 
 #include "dbconfig.h"
 
-class QProcess;
+#include <QProcess>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/dbconfigsqlite.h b/akonadi/server/src/storage/dbconfigsqlite.h
index 0070e975..4caa970f 100644
--- a/akonadi/server/src/storage/dbconfigsqlite.h
+++ b/akonadi/server/src/storage/dbconfigsqlite.h
@@ -22,7 +22,7 @@
 
 #include "dbconfig.h"
 
-class QProcess;
+#include <QProcess>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/dbexception.h b/akonadi/server/src/storage/dbexception.h
index 586ae44e..3e15831d 100644
--- a/akonadi/server/src/storage/dbexception.h
+++ b/akonadi/server/src/storage/dbexception.h
@@ -22,8 +22,8 @@
 
 #include "exception.h"
 
-class QSqlError;
-class QSqlQuery;
+#include <QSqlError>
+#include <QSqlQuery>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/dbupdater.h b/akonadi/server/src/storage/dbupdater.h
index 0e0dabaf..6f9622e4 100644
--- a/akonadi/server/src/storage/dbupdater.h
+++ b/akonadi/server/src/storage/dbupdater.h
@@ -25,7 +25,7 @@
 #include <QtCore/QStringList>
 #include <QtSql/QSqlDatabase>
 
-class QDomElement;
+#include <QDomElement>
 class DbUpdaterTest;
 
 namespace Akonadi {
diff --git a/akonadi/server/src/storage/entity.h b/akonadi/server/src/storage/entity.h
index eb180e45..328d2218 100644
--- a/akonadi/server/src/storage/entity.h
+++ b/akonadi/server/src/storage/entity.h
@@ -26,8 +26,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-class QVariant;
-class QSqlDatabase;
+#include <QVariant>
+#include <QSqlDatabase>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/itemretrievaljob.h b/akonadi/server/src/storage/itemretrievaljob.h
index 26505484..fd984fd1 100644
--- a/akonadi/server/src/storage/itemretrievaljob.h
+++ b/akonadi/server/src/storage/itemretrievaljob.h
@@ -22,8 +22,8 @@
 
 #include <QObject>
 
-class QDBusAbstractInterface;
-class QDBusError;
+#include <QDBusAbstractInterface>
+#include <QDBusError>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/itemretrievalmanager.h b/akonadi/server/src/storage/itemretrievalmanager.h
index b8ad30ed..7611ce76 100644
--- a/akonadi/server/src/storage/itemretrievalmanager.h
+++ b/akonadi/server/src/storage/itemretrievalmanager.h
@@ -27,8 +27,8 @@
 #include <QObject>
 #include <QDBusConnection>
 
-class QReadWriteLock;
-class QWaitCondition;
+#include <QReadWriteLock>
+#include <QWaitCondition>
 class OrgFreedesktopAkonadiResourceInterface;
 
 namespace Akonadi {
diff --git a/akonadi/server/src/storage/parthelper.h b/akonadi/server/src/storage/parthelper.h
index 45d613c9..47b09d1e 100644
--- a/akonadi/server/src/storage/parthelper.h
+++ b/akonadi/server/src/storage/parthelper.h
@@ -24,9 +24,9 @@
 #include "entities.h"
 #include "../exception.h"
 
-class QString;
-class QVariant;
-class QFile;
+#include <QString>
+#include <QVariant>
+#include <QFile>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/querycache.h b/akonadi/server/src/storage/querycache.h
index cff16b2d..6459f76c 100644
--- a/akonadi/server/src/storage/querycache.h
+++ b/akonadi/server/src/storage/querycache.h
@@ -20,8 +20,8 @@
 #ifndef AKONADI_QUERYCACHE_H
 #define AKONADI_QUERYCACHE_H
 
-class QString;
-class QSqlQuery;
+#include <QString>
+#include <QSqlQuery>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/storage/storagedebugger.h b/akonadi/server/src/storage/storagedebugger.h
index e87e6506..b29905c0 100644
--- a/akonadi/server/src/storage/storagedebugger.h
+++ b/akonadi/server/src/storage/storagedebugger.h
@@ -32,7 +32,7 @@
 #endif
 
 
-class QSqlQuery;
+#include <QSqlQuery>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/src/tracerinterface.h b/akonadi/server/src/tracerinterface.h
index 67ec97de..4bf6d2e7 100644
--- a/akonadi/server/src/tracerinterface.h
+++ b/akonadi/server/src/tracerinterface.h
@@ -20,8 +20,8 @@
 #ifndef AKONADI_TRACERINTERFACE_H
 #define AKONADI_TRACERINTERFACE_H
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/server/tests/unittest/fakeakonadiserver.h b/akonadi/server/tests/unittest/fakeakonadiserver.h
index d6e4d0ca..439083bc 100644
--- a/akonadi/server/tests/unittest/fakeakonadiserver.h
+++ b/akonadi/server/tests/unittest/fakeakonadiserver.h
@@ -26,8 +26,8 @@
 #include <QSignalSpy>
 
 
-class QLocalServer;
-class QEventLoop;
+#include <QLocalServer>
+#include <QEventLoop>
 
 Q_DECLARE_METATYPE(QList<QByteArray>)
 
diff --git a/akonadi/server/tests/unittest/fakeclient.h b/akonadi/server/tests/unittest/fakeclient.h
index d71bc737..4b81e27d 100644
--- a/akonadi/server/tests/unittest/fakeclient.h
+++ b/akonadi/server/tests/unittest/fakeclient.h
@@ -23,7 +23,7 @@
 #include <QThread>
 #include <QMutex>
 
-class QLocalSocket;
+#include <QLocalSocket>
 
 namespace Akonadi {
 namespace Server {
diff --git a/akonadi/shared/akapplication.h b/akonadi/shared/akapplication.h
index ffe8ee5c..fc29d875 100644
--- a/akonadi/shared/akapplication.h
+++ b/akonadi/shared/akapplication.h
@@ -26,8 +26,8 @@
 #include <boost/program_options.hpp>
 #endif
 
-class QCoreApplication;
-class QApplication;
+#include <QCoreApplication>
+#include <QApplication>
 
 /**
  * D-Bus session bus monitoring and command line handling.
diff --git a/akonadi/shared/akdbus.h b/akonadi/shared/akdbus.h
index abb4a440..c3e01d4e 100644
--- a/akonadi/shared/akdbus.h
+++ b/akonadi/shared/akdbus.h
@@ -20,7 +20,7 @@
 #ifndef AKDBUS_H
 #define AKDBUS_H
 
-class QString;
+#include <QString>
 
 /**
  * Helper methods for obtaining D-Bus identifiers.
diff --git a/boombox/src/bbcollectiontab.h b/boombox/src/bbcollectiontab.h
index 5ef71415..f4bfe126 100644
--- a/boombox/src/bbcollectiontab.h
+++ b/boombox/src/bbcollectiontab.h
@@ -29,8 +29,8 @@
 
 #include <KSharedConfig>
 
-class QHBoxLayout;
-class QComboBox;
+#include <QHBoxLayout>
+#include <QComboBox>
 
 class KUiServerJobTracker;
 class KActionCollection;
diff --git a/boombox/src/bbfilesystemtab.h b/boombox/src/bbfilesystemtab.h
index 3f39743a..5de5bb11 100644
--- a/boombox/src/bbfilesystemtab.h
+++ b/boombox/src/bbfilesystemtab.h
@@ -27,10 +27,10 @@
 #include <KDirOperator>
 #include <KFileItem>
 
-class QFileSystemModel;
-class QHBoxLayout;
-class QModelIndex;
-class QVBoxLayout;
+#include <QFileSystemModel>
+#include <QHBoxLayout>
+#include <QModelIndex>
+#include <QVBoxLayout>
 class KCategorizedSortFilterProxyModel;
 class KDirModel;
 class KFilePlacesModel;
diff --git a/boombox/src/bbfilterdock.h b/boombox/src/bbfilterdock.h
index c620574e..0225bd57 100644
--- a/boombox/src/bbfilterdock.h
+++ b/boombox/src/bbfilterdock.h
@@ -27,11 +27,11 @@
 
 #include "bblistitem.h"
 
-class QListView;
+#include <QListView>
 class BBStringSetModel;
 class KPushButton;
 class BBCollectionTab;
-class QMenu;
+#include <QMenu>
 
 class BBFilterDock: public QDockWidget
 {
diff --git a/boombox/src/bbmainwindow.h b/boombox/src/bbmainwindow.h
index 24905ceb..afe415d9 100644
--- a/boombox/src/bbmainwindow.h
+++ b/boombox/src/bbmainwindow.h
@@ -46,7 +46,7 @@ class BBPlaylistSystem;
 class Mpris2Player;
 class KActionCollection;
 class KAction;
-class QToolButton;
+#include <QToolButton>
 
 class BBTitleLabel : public QLabel
 {
diff --git a/boombox/src/bbresultview.h b/boombox/src/bbresultview.h
index 9c24afb5..d69245ea 100644
--- a/boombox/src/bbresultview.h
+++ b/boombox/src/bbresultview.h
@@ -24,9 +24,9 @@
 #include <QModelIndex>
 #include <KDE/KLineEdit>
 
-class QTreeView;
-class QPushButton;
-class QMenu;
+#include <QTreeView>
+#include <QPushButton>
+#include <QMenu>
 class BBCollectionTab;
 class BBAlbumSongModel;
 class BBSongListItem;
diff --git a/boombox/src/bbstreamstab.h b/boombox/src/bbstreamstab.h
index 21bdb4dc..443fb3a5 100644
--- a/boombox/src/bbstreamstab.h
+++ b/boombox/src/bbstreamstab.h
@@ -25,8 +25,8 @@
 #include <QAbstractItemModel>
 #include <QDomDocument>
 
-class QHBoxLayout;
-class QTreeView;
+#include <QHBoxLayout>
+#include <QTreeView>
 class KActionCollection;
 class KToolBar;
 
diff --git a/kaffeine/dtvdaemon/connection.h b/kaffeine/dtvdaemon/connection.h
index d735f812..ca60f6df 100644
--- a/kaffeine/dtvdaemon/connection.h
+++ b/kaffeine/dtvdaemon/connection.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-class QLocalSocket;
+#include <QLocalSocket>
 
 class Connection : public QObject
 {
diff --git a/kaffeine/dtvdaemon/dtvdaemon.h b/kaffeine/dtvdaemon/dtvdaemon.h
index 1ce2fafe..a57770d2 100644
--- a/kaffeine/dtvdaemon/dtvdaemon.h
+++ b/kaffeine/dtvdaemon/dtvdaemon.h
@@ -23,7 +23,7 @@
 
 #include <QLocalServer>
 
-class QFile;
+#include <QFile>
 
 class DtvDaemon : public QObject
 {
diff --git a/kaffeine/src/configurationdialog.h b/kaffeine/src/configurationdialog.h
index db542a12..f1bdfa66 100644
--- a/kaffeine/src/configurationdialog.h
+++ b/kaffeine/src/configurationdialog.h
@@ -23,7 +23,7 @@
 
 #include <KPageDialog>
 
-class QSpinBox;
+#include <QSpinBox>
 class KComboBox;
 
 class ConfigurationDialog : public KPageDialog
diff --git a/kaffeine/src/configurationdialog_p.h b/kaffeine/src/configurationdialog_p.h
index cd5c2f07..ff16fdcb 100644
--- a/kaffeine/src/configurationdialog_p.h
+++ b/kaffeine/src/configurationdialog_p.h
@@ -23,8 +23,8 @@
 
 #include <KDialog>
 
-class QPlainTextEdit;
-class QProcess;
+#include <QPlainTextEdit>
+#include <QProcess>
 
 class DmesgDialog : public KDialog
 {
diff --git a/kaffeine/src/dvb/dvbcam_linux.h b/kaffeine/src/dvb/dvbcam_linux.h
index 05af2059..3e12b8a4 100644
--- a/kaffeine/src/dvb/dvbcam_linux.h
+++ b/kaffeine/src/dvb/dvbcam_linux.h
@@ -24,7 +24,7 @@
 #include <QMap>
 #include <QTimer>
 
-class QSocketNotifier;
+#include <QSocketNotifier>
 class DvbLinuxCamService;
 class DvbPmtSection;
 
diff --git a/kaffeine/src/dvb/dvbchanneldialog_p.h b/kaffeine/src/dvb/dvbchanneldialog_p.h
index bc4d6026..0739af07 100644
--- a/kaffeine/src/dvb/dvbchanneldialog_p.h
+++ b/kaffeine/src/dvb/dvbchanneldialog_p.h
@@ -24,8 +24,8 @@
 #include <KDialog>
 #include "dvbchannel.h"
 
-class QCheckBox;
-class QSpinBox;
+#include <QCheckBox>
+#include <QSpinBox>
 class KComboBox;
 class KLineEdit;
 class DvbChannelTableModel;
diff --git a/kaffeine/src/dvb/dvbconfigdialog.h b/kaffeine/src/dvb/dvbconfigdialog.h
index d77f61b3..94c23e08 100644
--- a/kaffeine/src/dvb/dvbconfigdialog.h
+++ b/kaffeine/src/dvb/dvbconfigdialog.h
@@ -23,14 +23,14 @@
 
 #include <KDialog>
 
-class QBoxLayout;
-class QButtonGroup;
-class QCheckBox;
-class QGridLayout;
-class QLabel;
-class QProgressBar;
-class QSpinBox;
-class QTreeWidget;
+#include <QBoxLayout>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QSpinBox>
+#include <QTreeWidget>
 class KComboBox;
 class KJob;
 class KLineEdit;
diff --git a/kaffeine/src/dvb/dvbepgdialog.h b/kaffeine/src/dvb/dvbepgdialog.h
index e2fe1aeb..70df4ac1 100644
--- a/kaffeine/src/dvb/dvbepgdialog.h
+++ b/kaffeine/src/dvb/dvbepgdialog.h
@@ -24,9 +24,9 @@
 #include <KDialog>
 #include "dvbchannel.h"
 
-class QLabel;
-class QModelIndex;
-class QTreeView;
+#include <QLabel>
+#include <QModelIndex>
+#include <QTreeView>
 class DvbEpgChannelTableModel;
 class DvbEpgTableModel;
 class DvbManager;
diff --git a/kaffeine/src/dvb/dvbliveview_p.h b/kaffeine/src/dvb/dvbliveview_p.h
index 18051bf6..1cef2d46 100644
--- a/kaffeine/src/dvb/dvbliveview_p.h
+++ b/kaffeine/src/dvb/dvbliveview_p.h
@@ -27,7 +27,7 @@
 #include "dvbepg.h"
 #include "dvbsi.h"
 
-class QSocketNotifier;
+#include <QSocketNotifier>
 
 class DvbOsd : public OsdObject
 {
diff --git a/kaffeine/src/dvb/dvbmanager.h b/kaffeine/src/dvb/dvbmanager.h
index 14e4789e..66e30daf 100644
--- a/kaffeine/src/dvb/dvbmanager.h
+++ b/kaffeine/src/dvb/dvbmanager.h
@@ -27,7 +27,7 @@
 #include <QStringList>
 #include "dvbtransponder.h"
 
-class QTreeView;
+#include <QTreeView>
 class DvbBackendDevice;
 class DvbChannelModel;
 class DvbConfig;
diff --git a/kaffeine/src/dvb/dvbrecordingdialog.h b/kaffeine/src/dvb/dvbrecordingdialog.h
index 60088e94..de3ac88e 100644
--- a/kaffeine/src/dvb/dvbrecordingdialog.h
+++ b/kaffeine/src/dvb/dvbrecordingdialog.h
@@ -23,7 +23,7 @@
 
 #include <KDialog>
 
-class QTreeView;
+#include <QTreeView>
 class DvbManager;
 class DvbRecordingTableModel;
 
diff --git a/kaffeine/src/dvb/dvbrecordingdialog_p.h b/kaffeine/src/dvb/dvbrecordingdialog_p.h
index a8e7baca..dfbf5aa1 100644
--- a/kaffeine/src/dvb/dvbrecordingdialog_p.h
+++ b/kaffeine/src/dvb/dvbrecordingdialog_p.h
@@ -25,7 +25,7 @@
 #include "../tablemodel.h"
 #include "dvbrecording.h"
 
-class QCheckBox;
+#include <QCheckBox>
 class KComboBox;
 class KLineEdit;
 class DateTimeEdit;
diff --git a/kaffeine/src/dvb/dvbscandialog.h b/kaffeine/src/dvb/dvbscandialog.h
index 802b53c6..d27008ef 100644
--- a/kaffeine/src/dvb/dvbscandialog.h
+++ b/kaffeine/src/dvb/dvbscandialog.h
@@ -25,9 +25,9 @@
 #include <QTimer>
 #include <KDialog>
 
-class QCheckBox;
-class QProgressBar;
-class QTreeView;
+#include <QCheckBox>
+#include <QProgressBar>
+#include <QTreeView>
 class KComboBox;
 class KLed;
 class DvbChannelModel;
diff --git a/kaffeine/src/dvb/dvbtab.h b/kaffeine/src/dvb/dvbtab.h
index 6886dfcc..63826c8f 100644
--- a/kaffeine/src/dvb/dvbtab.h
+++ b/kaffeine/src/dvb/dvbtab.h
@@ -27,8 +27,8 @@
 #include "../tabbase.h"
 #include "dvbrecording.h"
 
-class QModelIndex;
-class QSplitter;
+#include <QModelIndex>
+#include <QSplitter>
 class KAction;
 class KActionCollection;
 class KMenu;
diff --git a/kaffeine/src/dvb/dvbtransponder.h b/kaffeine/src/dvb/dvbtransponder.h
index 78e8d492..ed6f1ce7 100644
--- a/kaffeine/src/dvb/dvbtransponder.h
+++ b/kaffeine/src/dvb/dvbtransponder.h
@@ -23,8 +23,8 @@
 
 #include <string.h>
 
-class QDataStream;
-class QString;
+#include <QDataStream>
+#include <QString>
 class DvbTransponder;
 
 class DvbTransponderBase
diff --git a/kaffeine/src/mainwindow.h b/kaffeine/src/mainwindow.h
index 6b5c0cdd..08d5a3dd 100644
--- a/kaffeine/src/mainwindow.h
+++ b/kaffeine/src/mainwindow.h
@@ -24,7 +24,7 @@
 #include <KMainWindow>
 #include "mediawidget.h"
 
-class QStackedLayout;
+#include <QStackedLayout>
 class KCmdLineOptions;
 class KRecentFilesAction;
 class KTabBar;
diff --git a/kaffeine/src/mediawidget.h b/kaffeine/src/mediawidget.h
index bebaf840..f0af4b2f 100644
--- a/kaffeine/src/mediawidget.h
+++ b/kaffeine/src/mediawidget.h
@@ -25,10 +25,10 @@
 #include <KIcon>
 #include <KUrl>
 
-class QActionGroup;
-class QPushButton;
-class QSlider;
-class QStringListModel;
+#include <QActionGroup>
+#include <QPushButton>
+#include <QSlider>
+#include <QStringListModel>
 class KAction;
 class KActionCollection;
 class KComboBox;
diff --git a/kaffeine/src/mediawidget_p.h b/kaffeine/src/mediawidget_p.h
index 11e1026b..1e0fc4d0 100644
--- a/kaffeine/src/mediawidget_p.h
+++ b/kaffeine/src/mediawidget_p.h
@@ -25,7 +25,7 @@
 #include <KDialog>
 #include "mediawidget.h"
 
-class QTimeEdit;
+#include <QTimeEdit>
 
 class JumpToPositionDialog : public KDialog
 {
diff --git a/kaffeine/src/playlist/playlisttab.h b/kaffeine/src/playlist/playlisttab.h
index ebfc2dbf..fc86d71b 100644
--- a/kaffeine/src/playlist/playlisttab.h
+++ b/kaffeine/src/playlist/playlisttab.h
@@ -25,7 +25,7 @@
 #include "../mediawidget.h"
 #include "../tabbase.h"
 
-class QSplitter;
+#include <QSplitter>
 class Playlist;
 class PlaylistBrowserView;
 class PlaylistModel;
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index a91149db..a37cfa6f 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -27,11 +27,11 @@
 #include <gphoto2.h>
 #include <KPluginFactory>
 
-class QWidget;
-class QPushButton;
-class QListView;
-class QStandardItemModel;
-class QModelIndex;
+#include <QWidget>
+#include <QPushButton>
+#include <QListView>
+#include <QStandardItemModel>
+#include <QModelIndex>
 
 class KCamera;
 class KameraDeviceSelectDialog;
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 828eda4d..b13c0f55 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -27,15 +27,15 @@
 #include <kdialog.h>
 
 class KConfig;
-class QString;
-class QListView;
-class QStackedWidget;
-class QComboBox;
-class QLineEdit;
-class QRadioButton;
-class QGroupBox;
-class QStandardItemModel;
-class QModelIndex;
+#include <QString>
+#include <QListView>
+#include <QStackedWidget>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QGroupBox>
+#include <QStandardItemModel>
+#include <QModelIndex>
 
 class KCamera : public QObject {
 	friend class KameraDeviceSelectDialog;
diff --git a/kamoso/src/countdownwidget.h b/kamoso/src/countdownwidget.h
index 2937180f..a125078d 100644
--- a/kamoso/src/countdownwidget.h
+++ b/kamoso/src/countdownwidget.h
@@ -22,7 +22,7 @@
 
 #include <QWidget>
 
-class QTimeLine;
+#include <QTimeLine>
 class CountdownWidget : public QWidget
 {
 Q_OBJECT
diff --git a/kamoso/src/kamoso.h b/kamoso/src/kamoso.h
index da9d5117..e22037a4 100644
--- a/kamoso/src/kamoso.h
+++ b/kamoso/src/kamoso.h
@@ -29,19 +29,19 @@
 
 class KDirModel;
 class KamosoJobTracker;
-class QToolButton;
-class QRadioButton;
+#include <QToolButton>
+#include <QRadioButton>
 class ShootMode;
 class WhiteWidgetManager;
 class WebcamWidget;
 class WebcamRetriever;
 class CountdownWidget;
-class QItemSelection;
-class QStackedLayout;
-class QSplitter;
-class QPushButton;
-class QToolButton;
-class QModelIndex;
+#include <QItemSelection>
+#include <QStackedLayout>
+#include <QSplitter>
+#include <QPushButton>
+#include <QToolButton>
+#include <QModelIndex>
 class ThumbnailView;
 class KFileItem;
 class WebcamWidget;
diff --git a/kamoso/src/kamosoplugin.h b/kamoso/src/kamosoplugin.h
index 03f27678..640a0732 100644
--- a/kamoso/src/kamosoplugin.h
+++ b/kamoso/src/kamosoplugin.h
@@ -24,7 +24,7 @@
 #include <QVariantList>
 #include "kdemacros.h"
 
-class QAction;
+#include <QAction>
 class KUrl;
 class KamosoJob;
 
diff --git a/kamoso/src/photoshootmode.h b/kamoso/src/photoshootmode.h
index 8e099438..e0d66e00 100644
--- a/kamoso/src/photoshootmode.h
+++ b/kamoso/src/photoshootmode.h
@@ -23,7 +23,7 @@
 #include "shootmode.h"
 #include <QPointer>
 
-class QPushButton;
+#include <QPushButton>
 
 class PhotoShootMode : public ShootMode
 {
diff --git a/kamoso/src/webcamwidget.h b/kamoso/src/webcamwidget.h
index 1bf97295..3989b19b 100644
--- a/kamoso/src/webcamwidget.h
+++ b/kamoso/src/webcamwidget.h
@@ -26,11 +26,11 @@
 class KJob;
 class Device;
 class KUrl;
-class QVBoxLayout;
-class QPushButton;
-class QTimer;
-class QFrame;
-class QSlider;
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QTimer>
+#include <QFrame>
+#include <QSlider>
 
 class WebcamWidget : public QGst::Ui::VideoWidget
 {
diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h
index e92df34d..260b9b12 100644
--- a/kcachegrind/kcachegrind/toplevel.h
+++ b/kcachegrind/kcachegrind/toplevel.h
@@ -35,11 +35,11 @@
 #include "toplevelbase.h"
 
 class MultiView;
-class QLineEdit;
-class QDockWidget;
-class QLabel;
-class QProgressBar;
-class QMenu;
+#include <QLineEdit>
+#include <QDockWidget>
+#include <QLabel>
+#include <QProgressBar>
+#include <QMenu>
 
 class KUrl;
 class KSelectAction;
diff --git a/kcachegrind/libcore/loader.h b/kcachegrind/libcore/loader.h
index d4a79c7e..414d2c29 100644
--- a/kcachegrind/libcore/loader.h
+++ b/kcachegrind/libcore/loader.h
@@ -26,7 +26,7 @@
 #include <QList>
 #include <QString>
 
-class QIODevice;
+#include <QIODevice>
 class TraceData;
 class Loader;
 class Logger;
diff --git a/kcachegrind/libcore/tracedata.h b/kcachegrind/libcore/tracedata.h
index 4a362ee8..8887427b 100644
--- a/kcachegrind/libcore/tracedata.h
+++ b/kcachegrind/libcore/tracedata.h
@@ -36,7 +36,7 @@
 #include "context.h"
 #include "eventtype.h"
 
-class QFile;
+#include <QFile>
 
 /**
  * All cost items are classes prefixed with "Trace".
diff --git a/kcachegrind/libcore/utils.h b/kcachegrind/libcore/utils.h
index b7adb097..6c8a38a6 100644
--- a/kcachegrind/libcore/utils.h
+++ b/kcachegrind/libcore/utils.h
@@ -25,7 +25,7 @@
 
 #include <qstring.h>
 
-class QIODevice;
+#include <QIODevice>
 
 typedef unsigned long long uint64;
 typedef long long int64;
diff --git a/kcachegrind/libviews/callgraphview.h b/kcachegrind/libviews/callgraphview.h
index c8e7bf6d..47a71fe2 100644
--- a/kcachegrind/libviews/callgraphview.h
+++ b/kcachegrind/libviews/callgraphview.h
@@ -45,9 +45,9 @@
 #include "tracedata.h"
 #include "traceitemview.h"
 
-class QProcess;
-class QTemporaryFile;
-class QIODevice;
+#include <QProcess>
+#include <QTemporaryFile>
+#include <QIODevice>
 
 class CanvasNode;
 class CanvasEdge;
diff --git a/kcachegrind/libviews/callmapview.h b/kcachegrind/libviews/callmapview.h
index 0b4ad9b6..aebc2c9d 100644
--- a/kcachegrind/libviews/callmapview.h
+++ b/kcachegrind/libviews/callmapview.h
@@ -29,8 +29,8 @@
 #include "tracedata.h"
 #include "traceitemview.h"
 
-class QAction;
-class QMenu;
+#include <QAction>
+#include <QMenu>
 
 class CallMapView: public TreeMapWidget, public TraceItemView
 {
diff --git a/kcachegrind/libviews/functionselection.h b/kcachegrind/libviews/functionselection.h
index 0cfc2c9e..d4d69ee9 100644
--- a/kcachegrind/libviews/functionselection.h
+++ b/kcachegrind/libviews/functionselection.h
@@ -33,14 +33,14 @@
 #include "listutils.h"
 #include "toplevelbase.h"
 
-class QAction;
-class QMenu;
-class QLabel;
-class QComboBox;
-class QLineEdit;
-class QTreeView;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QAction>
+#include <QMenu>
+#include <QLabel>
+#include <QComboBox>
+#include <QLineEdit>
+#include <QTreeView>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class FunctionListModel;
 
 class FunctionSelection: public QWidget, public TraceItemView
diff --git a/kcachegrind/libviews/partselection.h b/kcachegrind/libviews/partselection.h
index fce3e6cd..a1f8b303 100644
--- a/kcachegrind/libviews/partselection.h
+++ b/kcachegrind/libviews/partselection.h
@@ -30,7 +30,7 @@
 #include "tracedata.h"
 #include "traceitemview.h"
 
-class QLabel;
+#include <QLabel>
 class TraceData;
 class TreeMapItem;
 class PartAreaWidget;
diff --git a/kcachegrind/libviews/stackselection.h b/kcachegrind/libviews/stackselection.h
index 42280648..eca1ebfe 100644
--- a/kcachegrind/libviews/stackselection.h
+++ b/kcachegrind/libviews/stackselection.h
@@ -28,8 +28,8 @@
 #include <QWidget>
 #include "tracedata.h"
 
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class TraceFunction;
 class TraceData;
 class StackBrowser;
diff --git a/kcachegrind/libviews/tabview.h b/kcachegrind/libviews/tabview.h
index f5b4e978..c0fff370 100644
--- a/kcachegrind/libviews/tabview.h
+++ b/kcachegrind/libviews/tabview.h
@@ -38,7 +38,7 @@
 
 #include "traceitemview.h"
 
-class QLabel;
+#include <QLabel>
 class TabView;
 
 /**
diff --git a/kcachegrind/libviews/toplevelbase.h b/kcachegrind/libviews/toplevelbase.h
index 091b4a2d..f7f5f7f5 100644
--- a/kcachegrind/libviews/toplevelbase.h
+++ b/kcachegrind/libviews/toplevelbase.h
@@ -29,7 +29,7 @@
 #include "tracedata.h"
 #include "traceitemview.h"
 
-class QMenu;
+#include <QMenu>
 
 class TopLevelBase
 {
diff --git a/kcachegrind/libviews/traceitemview.h b/kcachegrind/libviews/traceitemview.h
index 9854df39..ee2aee31 100644
--- a/kcachegrind/libviews/traceitemview.h
+++ b/kcachegrind/libviews/traceitemview.h
@@ -27,8 +27,8 @@
 
 #include "tracedata.h"
 
-class QWidget;
-class QMenu;
+#include <QWidget>
+#include <QMenu>
 
 class TopLevelBase;
 class TraceItemView;
diff --git a/kcachegrind/libviews/treemap.h b/kcachegrind/libviews/treemap.h
index 436554af..618f5dc5 100644
--- a/kcachegrind/libviews/treemap.h
+++ b/kcachegrind/libviews/treemap.h
@@ -40,7 +40,7 @@
 #include <QContextMenuEvent>
 #include <QMouseEvent>
 
-class QMenu;
+#include <QMenu>
 class TreeMapWidget;
 class TreeMapItem;
 class TreeMapItemList;
diff --git a/kcachegrind/qcachegrind/colorsettings.h b/kcachegrind/qcachegrind/colorsettings.h
index eddd88f7..cf68cd29 100644
--- a/kcachegrind/qcachegrind/colorsettings.h
+++ b/kcachegrind/qcachegrind/colorsettings.h
@@ -28,7 +28,7 @@
 #include "ui_colorsettings.h"
 
 class TraceData;
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 class ColorSettings: public ConfigPage
 {
diff --git a/kcachegrind/qcachegrind/configdialog.h b/kcachegrind/qcachegrind/configdialog.h
index 3f777612..5119fa93 100644
--- a/kcachegrind/qcachegrind/configdialog.h
+++ b/kcachegrind/qcachegrind/configdialog.h
@@ -30,10 +30,10 @@
 
 #include "configpage.h"
 
-class QWidget;
-class QLabel;
-class QListWidget;
-class QStackedWidget;
+#include <QWidget>
+#include <QLabel>
+#include <QListWidget>
+#include <QStackedWidget>
 
 class TraceData;
 
diff --git a/kcachegrind/qcachegrind/qcgconfig.h b/kcachegrind/qcachegrind/qcgconfig.h
index a97db2a9..bbeef3bf 100644
--- a/kcachegrind/qcachegrind/qcgconfig.h
+++ b/kcachegrind/qcachegrind/qcgconfig.h
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-class QSettings;
+#include <QSettings>
 class QCGConfigStorage;
 
 class QCGConfigGroup: public ConfigGroup
diff --git a/kcachegrind/qcachegrind/qcgtoplevel.h b/kcachegrind/qcachegrind/qcgtoplevel.h
index 0aa64753..8d3f8102 100644
--- a/kcachegrind/qcachegrind/qcgtoplevel.h
+++ b/kcachegrind/qcachegrind/qcgtoplevel.h
@@ -35,11 +35,11 @@
 #include "toplevelbase.h"
 
 class MultiView;
-class QDockWidget;
-class QLabel;
-class QComboBox;
-class QProgressBar;
-class QMenu;
+#include <QDockWidget>
+#include <QLabel>
+#include <QComboBox>
+#include <QProgressBar>
+#include <QMenu>
 
 class TraceData;
 class MainWidget;
diff --git a/kcachegrind/qcachegrind/sourcesettings.h b/kcachegrind/qcachegrind/sourcesettings.h
index 9dacc2f1..abfdb636 100644
--- a/kcachegrind/qcachegrind/sourcesettings.h
+++ b/kcachegrind/qcachegrind/sourcesettings.h
@@ -27,7 +27,7 @@
 #include "ui_sourcesettings.h"
 
 class TraceData;
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 class SourceSettings: public ConfigPage
 {
diff --git a/kdbg/kdbg/dbgdriver.h b/kdbg/kdbg/dbgdriver.h
index db6ed625..214004aa 100644
--- a/kdbg/kdbg/dbgdriver.h
+++ b/kdbg/kdbg/dbgdriver.h
@@ -18,7 +18,7 @@ class VarTree;
 class ExprValue;
 class ExprWnd;
 class KDebugger;
-class QStringList;
+#include <QStringList>
 
 
 /**
diff --git a/kdbg/kdbg/dbgmainwnd.h b/kdbg/kdbg/dbgmainwnd.h
index 9d5531e7..e58f9800 100644
--- a/kdbg/kdbg/dbgmainwnd.h
+++ b/kdbg/kdbg/dbgmainwnd.h
@@ -12,13 +12,13 @@
 #include <kxmlguiwindow.h>
 #include "regwnd.h"
 
-class QDockWidget;
-class QProcess;
+#include <QDockWidget>
+#include <QProcess>
 class KAnimatedButton;
 class KRecentFilesAction;
 class KUrl;
 class WinStack;
-class QListWidget;
+#include <QListWidget>
 class ExprWnd;
 class BreakpointTable;
 class ThreadList;
diff --git a/kdbg/kdbg/debugger.h b/kdbg/kdbg/debugger.h
index 487dd34a..6fc3bdf2 100644
--- a/kdbg/kdbg/debugger.h
+++ b/kdbg/kdbg/debugger.h
@@ -22,7 +22,7 @@ class KTreeViewItem;
 class KConfig;
 class KConfigBase;
 class KConfigGroup;
-class QListWidget;
+#include <QListWidget>
 class RegisterInfo;
 class ThreadInfo;
 class DebuggerDriver;
diff --git a/kdbg/kdbg/envvar.h b/kdbg/kdbg/envvar.h
index 020c1a6f..9b4b84b9 100644
--- a/kdbg/kdbg/envvar.h
+++ b/kdbg/kdbg/envvar.h
@@ -12,7 +12,7 @@
  * is given as the key in the map, so we don't repeat it here.
  */
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 struct EnvVar {
     QString value;
diff --git a/kdbg/kdbg/exprwnd.h b/kdbg/kdbg/exprwnd.h
index 7e7ecd29..9312bf36 100644
--- a/kdbg/kdbg/exprwnd.h
+++ b/kdbg/kdbg/exprwnd.h
@@ -16,7 +16,7 @@ class ProgramTypeTable;
 class TypeInfo;
 struct ExprValue;
 class ExprWnd;
-class QStringList;
+#include <QStringList>
 
 /*! \brief a variable's value is the tree of sub-variables */
 class VarTree : public QTreeWidgetItem
diff --git a/kdbg/kdbg/pgmargs.h b/kdbg/kdbg/pgmargs.h
index 27c55b44..46cd7a77 100644
--- a/kdbg/kdbg/pgmargs.h
+++ b/kdbg/kdbg/pgmargs.h
@@ -13,7 +13,7 @@
 #include <map>
 #include "envvar.h"
 
-class QStringList;
+#include <QStringList>
 
 class PgmArgs : public QDialog, private Ui::PgmArgsBase
 {
diff --git a/kdbg/kdbg/pgmsettings.h b/kdbg/kdbg/pgmsettings.h
index ae0ccadc..807d06cf 100644
--- a/kdbg/kdbg/pgmsettings.h
+++ b/kdbg/kdbg/pgmsettings.h
@@ -9,8 +9,8 @@
 
 #include <KPageDialog>
 
-class QButtonGroup;
-class QLineEdit;
+#include <QButtonGroup>
+#include <QLineEdit>
 
 
 class ChooseDriver : public QWidget
diff --git a/kdbg/kdbg/procattach.h b/kdbg/kdbg/procattach.h
index 36eb0bce..3ca5344a 100644
--- a/kdbg/kdbg/procattach.h
+++ b/kdbg/kdbg/procattach.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 
-class QProcess;
+#include <QProcess>
 
 /*
  * This is the full-featured version of the dialog. It is used when the
diff --git a/kdbg/kdbg/regwnd.h b/kdbg/kdbg/regwnd.h
index 20486d89..12d47aef 100644
--- a/kdbg/kdbg/regwnd.h
+++ b/kdbg/kdbg/regwnd.h
@@ -11,10 +11,10 @@
 #include <list>
 #include <map>
 
-class QMenu;
+#include <QMenu>
 class RegisterViewItem;
 class GroupingViewItem;
-class QContextMenuEvent;
+#include <QContextMenuEvent>
 struct RegisterInfo;
 
 
diff --git a/kdbg/kdbg/ttywnd.h b/kdbg/kdbg/ttywnd.h
index a12a9809..41257471 100644
--- a/kdbg/kdbg/ttywnd.h
+++ b/kdbg/kdbg/ttywnd.h
@@ -9,7 +9,7 @@
 
 #include <QPlainTextEdit>
 
-class QSocketNotifier;
+#include <QSocketNotifier>
 
 /**
  * This class is cortesy Judin Max <novaprint@mtu-net.ru>.
diff --git a/kdepim-runtime/accountwizard/ispdb/ispdb.h b/kdepim-runtime/accountwizard/ispdb/ispdb.h
index c29ef6a5..66375a9c 100644
--- a/kdepim-runtime/accountwizard/ispdb/ispdb.h
+++ b/kdepim-runtime/accountwizard/ispdb/ispdb.h
@@ -25,7 +25,7 @@
 #include <kio/job.h>
 #include <kmime/kmime_header_parsing.h>
 
-class QDomElement;
+#include <QDomElement>
 
 struct server;
 
diff --git a/kdepim-runtime/accountwizard/setuppage.h b/kdepim-runtime/accountwizard/setuppage.h
index 2354d8a1..b55150e0 100644
--- a/kdepim-runtime/accountwizard/setuppage.h
+++ b/kdepim-runtime/accountwizard/setuppage.h
@@ -23,7 +23,7 @@
 #include "page.h"
 #include "ui_setuppage.h"
 
-class QStandardItemModel;
+#include <QStandardItemModel>
 
 class SetupPage : public Page
 {
diff --git a/kdepim-runtime/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h b/kdepim-runtime/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
index c24eb93a..df295ff4 100644
--- a/kdepim-runtime/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
+++ b/kdepim-runtime/agents/newmailnotifier/newmailnotifierselectcollectionwidget.h
@@ -24,13 +24,13 @@
 #include <Akonadi/Collection>
 #include <QModelIndex>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 class KRecursiveFilterProxyModel;
 namespace Akonadi {
 class EntityTreeModel;
 class ChangeRecorder;
 }
-class QTreeView;
+#include <QTreeView>
 class KCheckableProxyModel;
 class KJob;
 
diff --git a/kdepim-runtime/agents/newmailnotifier/newmailnotifiersettingsdialog.h b/kdepim-runtime/agents/newmailnotifier/newmailnotifiersettingsdialog.h
index a4570f70..60e8e199 100644
--- a/kdepim-runtime/agents/newmailnotifier/newmailnotifiersettingsdialog.h
+++ b/kdepim-runtime/agents/newmailnotifier/newmailnotifiersettingsdialog.h
@@ -24,7 +24,7 @@
 #include <Akonadi/Collection>
 
 class KNotifyConfigWidget;
-class QCheckBox;
+#include <QCheckBox>
 class KLineEdit;
 class KAboutData;
 class NewMailNotifierSelectCollectionWidget;
diff --git a/kdepim-runtime/kcm/serverconfigmodule.h b/kdepim-runtime/kcm/serverconfigmodule.h
index fef1aa55..616a894f 100644
--- a/kdepim-runtime/kcm/serverconfigmodule.h
+++ b/kdepim-runtime/kcm/serverconfigmodule.h
@@ -27,8 +27,8 @@
 
 #include <KCModule>
 
-class QComboBox;
-class QStackedWidget;
+#include <QComboBox>
+#include <QStackedWidget>
 
 class ServerConfigModule : public KCModule
 {
diff --git a/kdepim-runtime/kresources/kabc/resourceakonadi.h b/kdepim-runtime/kresources/kabc/resourceakonadi.h
index 747a0c1b..c3455e2e 100644
--- a/kdepim-runtime/kresources/kabc/resourceakonadi.h
+++ b/kdepim-runtime/kresources/kabc/resourceakonadi.h
@@ -26,7 +26,7 @@
 #include "sharedresourceiface.h"
 
 class KJob;
-class QModelIndex;
+#include <QModelIndex>
 
 namespace Akonadi {
   class Collection;
diff --git a/kdepim-runtime/kresources/kcal/resourceakonadi.h b/kdepim-runtime/kresources/kcal/resourceakonadi.h
index dc07ffb0..b4ec3759 100644
--- a/kdepim-runtime/kresources/kcal/resourceakonadi.h
+++ b/kdepim-runtime/kresources/kcal/resourceakonadi.h
@@ -32,7 +32,7 @@ namespace Akonadi {
 
 class KJob;
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace KCal {
 
diff --git a/kdepim-runtime/kresources/shared/abstractsubresourcemodel.h b/kdepim-runtime/kresources/shared/abstractsubresourcemodel.h
index db67ad43..cba5a754 100644
--- a/kdepim-runtime/kresources/shared/abstractsubresourcemodel.h
+++ b/kdepim-runtime/kresources/shared/abstractsubresourcemodel.h
@@ -36,7 +36,7 @@ class ItemFetchAdapter;
 class KJob;
 
 typedef QSet<QString> StringIdSet;
-class QStringList;
+#include <QStringList>
 class SubResourceBase;
 
 class AbstractSubResourceModel : public QObject
diff --git a/kdepim-runtime/kresources/shared/resourceconfigbase.h b/kdepim-runtime/kresources/shared/resourceconfigbase.h
index dd7321c5..c77165fe 100644
--- a/kdepim-runtime/kresources/shared/resourceconfigbase.h
+++ b/kdepim-runtime/kresources/shared/resourceconfigbase.h
@@ -36,10 +36,10 @@ namespace Akonadi {
 
 class KAction;
 class KDialog;
-class QCheckBox;
-class QDialogButtonBox;
-class QLabel;
-class QPushButton;
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
 
 class ResourceConfigBase : public KRES::ConfigWidget
 {
diff --git a/kdepim-runtime/kresources/shared/storecollectiondialog.h b/kdepim-runtime/kresources/shared/storecollectiondialog.h
index 01052c8d..ca80354c 100644
--- a/kdepim-runtime/kresources/shared/storecollectiondialog.h
+++ b/kdepim-runtime/kresources/shared/storecollectiondialog.h
@@ -31,8 +31,8 @@ namespace Akonadi {
 }
 
 class AbstractSubResourceModel;
-class QLabel;
-class QModelIndex;
+#include <QLabel>
+#include <QModelIndex>
 
 class StoreCollectionDialog : public KDialog
 {
diff --git a/kdepim-runtime/libkdepim-copy/kincidencechooser.h b/kdepim-runtime/libkdepim-copy/kincidencechooser.h
index 476df89e..95a177aa 100644
--- a/kdepim-runtime/libkdepim-copy/kincidencechooser.h
+++ b/kdepim-runtime/libkdepim-copy/kincidencechooser.h
@@ -32,8 +32,8 @@
 
 #include <KDialog>
 
-class QButtonGroup;
-class QLabel;
+#include <QButtonGroup>
+#include <QLabel>
 
 namespace KPIM {
 
diff --git a/kdepim-runtime/migration/infodialog.h b/kdepim-runtime/migration/infodialog.h
index db99b4bc..e6d65ffc 100644
--- a/kdepim-runtime/migration/infodialog.h
+++ b/kdepim-runtime/migration/infodialog.h
@@ -25,9 +25,9 @@
 
 #include <KDialog>
 
-class QLabel;
-class QListWidget;
-class QProgressBar;
+#include <QLabel>
+#include <QListWidget>
+#include <QProgressBar>
 
 class InfoDialog : public KDialog
 {
diff --git a/kdepim-runtime/migration/kjots/kjotsmigrator.h b/kdepim-runtime/migration/kjots/kjotsmigrator.h
index 906287b0..654db9b8 100644
--- a/kdepim-runtime/migration/kjots/kjotsmigrator.h
+++ b/kdepim-runtime/migration/kjots/kjotsmigrator.h
@@ -29,7 +29,7 @@
 #include <akonadi/collection.h>
 #include <akonadi/item.h>
 
-class QDomElement;
+#include <QDomElement>
 
 class KJotsMigrator : public KMigratorBase
 {
diff --git a/kdepim-runtime/migration/kmail/emptyresourcecleaner.h b/kdepim-runtime/migration/kmail/emptyresourcecleaner.h
index c991617f..1da7870d 100644
--- a/kdepim-runtime/migration/kmail/emptyresourcecleaner.h
+++ b/kdepim-runtime/migration/kmail/emptyresourcecleaner.h
@@ -31,7 +31,7 @@ namespace Akonadi
 
 class KJob;
 
-template <typename T> class QList;
+#include <QList>
 
 class EmptyResourceCleaner : public QObject
 {
diff --git a/kdepim-runtime/migration/kmigratorbase.h b/kdepim-runtime/migration/kmigratorbase.h
index c2da55f5..b0a004ad 100644
--- a/kdepim-runtime/migration/kmigratorbase.h
+++ b/kdepim-runtime/migration/kmigratorbase.h
@@ -24,7 +24,7 @@
 
 #include <QObject>
 
-class QFile;
+#include <QFile>
 class KJob;
 
 /**
diff --git a/kdepim-runtime/migration/migratorbase.h b/kdepim-runtime/migration/migratorbase.h
index ef2c003a..e58ca72e 100644
--- a/kdepim-runtime/migration/migratorbase.h
+++ b/kdepim-runtime/migration/migratorbase.h
@@ -27,7 +27,7 @@
 #include <kconfig.h>
 #include <KConfigGroup>
 
-class QFile;
+#include <QFile>
 
 class NullableConfigGroup
 {
diff --git a/kdepim-runtime/plugins/akonadi_serializer_bookmark.h b/kdepim-runtime/plugins/akonadi_serializer_bookmark.h
index 96a2ae18..cda59e14 100644
--- a/kdepim-runtime/plugins/akonadi_serializer_bookmark.h
+++ b/kdepim-runtime/plugins/akonadi_serializer_bookmark.h
@@ -24,8 +24,8 @@
 
 #include <akonadi/itemserializerplugin.h>
 
-class QIODevice;
-class QString;
+#include <QIODevice>
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepim-runtime/qml/kde/kdeintegration.h b/kdepim-runtime/qml/kde/kdeintegration.h
index 4cd5d042..5d304ed7 100644
--- a/kdepim-runtime/qml/kde/kdeintegration.h
+++ b/kdepim-runtime/qml/kde/kdeintegration.h
@@ -24,10 +24,10 @@
 #include <QVariant>
 #include <QStringList>
 
-class QIcon;
-class QPixmap;
-class QScriptValue;
-class QScriptContext;
+#include <QIcon>
+#include <QPixmap>
+#include <QScriptValue>
+#include <QScriptContext>
 
 class KDEIntegration : public QObject
 {
diff --git a/kdepim-runtime/qml/kde/tests/qml_moves/dynamictreemodel.h b/kdepim-runtime/qml/kde/tests/qml_moves/dynamictreemodel.h
index 54a12719..de5a3ff4 100644
--- a/kdepim-runtime/qml/kde/tests/qml_moves/dynamictreemodel.h
+++ b/kdepim-runtime/qml/kde/tests/qml_moves/dynamictreemodel.h
@@ -29,7 +29,7 @@
 
 #include "indexfinder.h"
 
-template<typename T> class QList;
+#include <QList>
 
 class ModelMoveCommand;
 
diff --git a/kdepim-runtime/qml/kde/tests/qml_moves/mainwindow.h b/kdepim-runtime/qml/kde/tests/qml_moves/mainwindow.h
index bb157285..78294227 100644
--- a/kdepim-runtime/qml/kde/tests/qml_moves/mainwindow.h
+++ b/kdepim-runtime/qml/kde/tests/qml_moves/mainwindow.h
@@ -5,8 +5,8 @@
 #include <QWidget>
 #include <QDeclarativeContext>
 
-class QDeclarativeView;
-class QTreeView;
+#include <QDeclarativeView>
+#include <QTreeView>
 
 #include "dynamictreemodel.h"
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/breadcrumbnavigationcontext.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/breadcrumbnavigationcontext.h
index 5d61f3bf..8a0dcfae 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/breadcrumbnavigationcontext.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/breadcrumbnavigationcontext.h
@@ -24,9 +24,9 @@
 
 #include <QObject>
 
-class QAbstractItemModel;
-class QItemSelectionModel;
-class QDeclarativeContext;
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QDeclarativeContext>
 
 
 class KBreadcrumbNavigationFactoryPrivate;
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/checkableitemproxymodel.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/checkableitemproxymodel.h
index 49dbc675..c94e1911 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/checkableitemproxymodel.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/checkableitemproxymodel.h
@@ -26,7 +26,7 @@
 
 #include <QItemSelection>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 class CheckableItemProxyModelPrivate;
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreemodel.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreemodel.h
index 96e902c7..5ea066a8 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreemodel.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreemodel.h
@@ -29,7 +29,7 @@
 
 #include "indexfinder.h"
 
-template<typename T> class QList;
+#include <QList>
 
 class ModelMoveCommand;
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreewidget.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreewidget.h
index edac1654..98e4ef4c 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreewidget.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/dynamictreewidget.h
@@ -22,12 +22,12 @@
 
 #include <QWidget>
 
-class QModelIndex;
+#include <QModelIndex>
 
-class QComboBox;
-class QPlainTextEdit;
-class QTreeView;
-class QRadioButton;
+#include <QComboBox>
+#include <QPlainTextEdit>
+#include <QTreeView>
+#include <QRadioButton>
 
 class DynamicTreeModel;
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kmodelindexproxymapper.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kmodelindexproxymapper.h
index a4f35288..cbaca97e 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kmodelindexproxymapper.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kmodelindexproxymapper.h
@@ -24,9 +24,9 @@
 
 #include <QObject>
 
-class QAbstractItemModel;
-class QModelIndex;
-class QItemSelection;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QItemSelection>
 class KModelIndexProxyMapperPrivate;
 
 /**
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kselectionproxymodel.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kselectionproxymodel.h
index 0776d18e..a8b25457 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kselectionproxymodel.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/kselectionproxymodel.h
@@ -33,7 +33,7 @@ typedef KBiHash<qint64, QModelIndex> ParentMapping;
 #define KDO(object) kDebug() << #object << object
 #define SON(object) object->setObjectName(#object)
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 class KSelectionProxyModel;
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/mainwindow.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/mainwindow.h
index de2c45d1..820ff9a9 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/mainwindow.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/mainwindow.h
@@ -5,8 +5,8 @@
 #include <QWidget>
 #include <QDeclarativeContext>
 
-class QDeclarativeView;
-class QTreeView;
+#include <QDeclarativeView>
+#include <QTreeView>
 
 #include "dynamictreemodel.h"
 
diff --git a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/simple/mainwindow.h b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/simple/mainwindow.h
index 2d440ff6..d426170e 100644
--- a/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/simple/mainwindow.h
+++ b/kdepim-runtime/qml/kde/tests/qmlbreadcrumbnavigation/simple/mainwindow.h
@@ -25,9 +25,9 @@
 #include <QWidget>
 #include <QDeclarativeContext>
 
-class QDeclarativeView;
-class QTreeView;
-class QStandardItemModel;
+#include <QDeclarativeView>
+#include <QTreeView>
+#include <QStandardItemModel>
 
 class KBreadcrumbNavigationFactory;
 
diff --git a/kdepim-runtime/resources/birthdays/birthdaysresource.h b/kdepim-runtime/resources/birthdays/birthdaysresource.h
index 9c61643a..a03825c4 100644
--- a/kdepim-runtime/resources/birthdays/birthdaysresource.h
+++ b/kdepim-runtime/resources/birthdays/birthdaysresource.h
@@ -27,7 +27,7 @@
 
 #include <QHash>
 
-class QDate;
+#include <QDate>
 
 class BirthdaysResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::Observer
 {
diff --git a/kdepim-runtime/resources/contacts/contactsresource.h b/kdepim-runtime/resources/contacts/contactsresource.h
index ce92d6d0..72484161 100644
--- a/kdepim-runtime/resources/contacts/contactsresource.h
+++ b/kdepim-runtime/resources/contacts/contactsresource.h
@@ -30,7 +30,7 @@
 namespace Akonadi_Contacts_Resource {
 class ContactsResourceSettings;
 }
-class QDir;
+#include <QDir>
 
 class ContactsResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2
 {
diff --git a/kdepim-runtime/resources/dav/common/davmanager.h b/kdepim-runtime/resources/dav/common/davmanager.h
index 9efa5c78..3060585f 100644
--- a/kdepim-runtime/resources/dav/common/davmanager.h
+++ b/kdepim-runtime/resources/dav/common/davmanager.h
@@ -32,7 +32,7 @@ class DavJob;
 
 class KUrl;
 
-class QDomDocument;
+#include <QDomDocument>
 
 /**
  * @short A factory class for handling DAV jobs.
diff --git a/kdepim-runtime/resources/dav/resource/configdialog.h b/kdepim-runtime/resources/dav/resource/configdialog.h
index c47ceea7..e016d779 100644
--- a/kdepim-runtime/resources/dav/resource/configdialog.h
+++ b/kdepim-runtime/resources/dav/resource/configdialog.h
@@ -30,7 +30,7 @@
 #include <QtCore/QString>
 
 class KConfigDialogManager;
-class QStandardItemModel;
+#include <QStandardItemModel>
 
 class ConfigDialog : public KDialog
 {
diff --git a/kdepim-runtime/resources/dav/resource/searchdialog.h b/kdepim-runtime/resources/dav/resource/searchdialog.h
index 08c8fda2..427cba1a 100644
--- a/kdepim-runtime/resources/dav/resource/searchdialog.h
+++ b/kdepim-runtime/resources/dav/resource/searchdialog.h
@@ -24,7 +24,7 @@
 #include <KDialog>
 
 class KJob;
-class QStandardItemModel;
+#include <QStandardItemModel>
 
 class SearchDialog : public KDialog
 {
diff --git a/kdepim-runtime/resources/dav/resource/setupwizard.h b/kdepim-runtime/resources/dav/resource/setupwizard.h
index 7ba387a0..9215dc85 100644
--- a/kdepim-runtime/resources/dav/resource/setupwizard.h
+++ b/kdepim-runtime/resources/dav/resource/setupwizard.h
@@ -29,12 +29,12 @@ class KJob;
 class KLineEdit;
 class KTextBrowser;
 
-class QButtonGroup;
-class QCheckBox;
-class QComboBox;
-class QFormLayout;
-class QLabel;
-class QRadioButton;
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QRadioButton>
 
 class SetupWizard : public QWizard
 {
diff --git a/kdepim-runtime/resources/dav/resource/urlconfigurationdialog.h b/kdepim-runtime/resources/dav/resource/urlconfigurationdialog.h
index 12db2465..cfb0dace 100644
--- a/kdepim-runtime/resources/dav/resource/urlconfigurationdialog.h
+++ b/kdepim-runtime/resources/dav/resource/urlconfigurationdialog.h
@@ -28,8 +28,8 @@
 #include <QtCore/QString>
 
 class KJob;
-class QModelIndex;
-class QStandardItemModel;
+#include <QModelIndex>
+#include <QStandardItemModel>
 
 class UrlConfigurationDialog : public KDialog
 {
diff --git a/kdepim-runtime/resources/folderarchivesettings/folderarchivesettingpage.h b/kdepim-runtime/resources/folderarchivesettings/folderarchivesettingpage.h
index a27ae7ee..9196d8b2 100644
--- a/kdepim-runtime/resources/folderarchivesettings/folderarchivesettingpage.h
+++ b/kdepim-runtime/resources/folderarchivesettings/folderarchivesettingpage.h
@@ -23,7 +23,7 @@
 #include <QWidget>
 #include <QComboBox>
 
-class QCheckBox;
+#include <QCheckBox>
 namespace Akonadi {
 class CollectionRequester;
 }
diff --git a/kdepim-runtime/resources/google/calendar/settingsdialog.h b/kdepim-runtime/resources/google/calendar/settingsdialog.h
index 574c35a7..a9998042 100644
--- a/kdepim-runtime/resources/google/calendar/settingsdialog.h
+++ b/kdepim-runtime/resources/google/calendar/settingsdialog.h
@@ -21,7 +21,7 @@
 #include "common/googlesettingsdialog.h"
 
 class KListWidget;
-class QLabel;
+#include <QLabel>
 class KDateComboBox;
 
 class SettingsDialog : public GoogleSettingsDialog
diff --git a/kdepim-runtime/resources/google/common/googlesettingsdialog.h b/kdepim-runtime/resources/google/common/googlesettingsdialog.h
index aaa16394..e0c62961 100644
--- a/kdepim-runtime/resources/google/common/googlesettingsdialog.h
+++ b/kdepim-runtime/resources/google/common/googlesettingsdialog.h
@@ -31,9 +31,9 @@ class GoogleResource;
 class GoogleSettings;
 class GoogleAccountManager;
 
-class QGroupBox;
+#include <QGroupBox>
 class KComboBox;
-class QCheckBox;
+#include <QCheckBox>
 class KIntSpinBox;
 
 
diff --git a/kdepim-runtime/resources/imap/imapresourcebase.h b/kdepim-runtime/resources/imap/imapresourcebase.h
index 2b823cc8..5d5eeaf5 100644
--- a/kdepim-runtime/resources/imap/imapresourcebase.h
+++ b/kdepim-runtime/resources/imap/imapresourcebase.h
@@ -33,7 +33,7 @@
 #include "resourcestateinterface.h"
 #include "resourcestate.h"
 
-class QTimer;
+#include <QTimer>
 
 class ResourceTask;
 namespace KIMAP
diff --git a/kdepim-runtime/resources/imap/subscriptiondialog.h b/kdepim-runtime/resources/imap/subscriptiondialog.h
index 6142342a..6c98dfa6 100644
--- a/kdepim-runtime/resources/imap/subscriptiondialog.h
+++ b/kdepim-runtime/resources/imap/subscriptiondialog.h
@@ -29,15 +29,15 @@
 
 #include <QtCore/QMap>
 
-class QKeyEvent;
-class QStandardItemModel;
-class QStandardItem;
+#include <QKeyEvent>
+#include <QStandardItemModel>
+#include <QStandardItem>
 
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 class ImapAccount;
-class QTreeView;
-class QListView;
+#include <QTreeView>
+#include <QListView>
 
 
 class SubscriptionFilterProxyModel : public KRecursiveFilterProxyModel
diff --git a/kdepim-runtime/resources/kabc/kabcresource.h b/kdepim-runtime/resources/kabc/kabcresource.h
index 73c96eb7..f42aa16b 100644
--- a/kdepim-runtime/resources/kabc/kabcresource.h
+++ b/kdepim-runtime/resources/kabc/kabcresource.h
@@ -32,7 +32,7 @@ namespace Akonadi {
   class MimeTypeChecker;
 }
 
-class QTimer;
+#include <QTimer>
 
 class KABCResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::Observer
 {
diff --git a/kdepim-runtime/resources/kalarm/shared/alarmtyperadiowidget.h b/kdepim-runtime/resources/kalarm/shared/alarmtyperadiowidget.h
index cecfb559..e421d2c2 100644
--- a/kdepim-runtime/resources/kalarm/shared/alarmtyperadiowidget.h
+++ b/kdepim-runtime/resources/kalarm/shared/alarmtyperadiowidget.h
@@ -29,7 +29,7 @@
 
 using namespace KAlarmCal;
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 class AlarmTypeRadioWidget : public Akonadi::SingleFileValidatingWidget
 {
diff --git a/kdepim-runtime/resources/kcal/kcalresource.h b/kdepim-runtime/resources/kcal/kcalresource.h
index 1a9dd276..3467a4f0 100644
--- a/kdepim-runtime/resources/kcal/kcalresource.h
+++ b/kdepim-runtime/resources/kcal/kcalresource.h
@@ -36,7 +36,7 @@ namespace Akonadi {
   class IncidenceMimeTypeVisitor;
 }
 
-class QTimer;
+#include <QTimer>
 
 class KCalResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::Observer
 {
diff --git a/kdepim-runtime/resources/kolabproxy/freebusyupdatehandler.h b/kdepim-runtime/resources/kolabproxy/freebusyupdatehandler.h
index 651f0f89..a3aa5585 100644
--- a/kdepim-runtime/resources/kolabproxy/freebusyupdatehandler.h
+++ b/kdepim-runtime/resources/kolabproxy/freebusyupdatehandler.h
@@ -26,7 +26,7 @@
 class KJob;
 class KUrl;
 
-class QTimer;
+#include <QTimer>
 
 /**
  * A class that triggers the update of freebusy lists on the Kolab server
diff --git a/kdepim-runtime/resources/maildir/libmaildir/maildir.h b/kdepim-runtime/resources/maildir/libmaildir/maildir.h
index 5c4c8703..5a02ef41 100644
--- a/kdepim-runtime/resources/maildir/libmaildir/maildir.h
+++ b/kdepim-runtime/resources/maildir/libmaildir/maildir.h
@@ -27,7 +27,7 @@
 #include <QStringList>
 #include <akonadi/item.h>
 
-class QDateTime;
+#include <QDateTime>
 
 namespace KPIM {
 
diff --git a/kdepim-runtime/resources/maildir/maildirresource.h b/kdepim-runtime/resources/maildir/maildirresource.h
index 494da516..7d40cc6a 100644
--- a/kdepim-runtime/resources/maildir/maildirresource.h
+++ b/kdepim-runtime/resources/maildir/maildirresource.h
@@ -23,8 +23,8 @@
 #include <akonadi/collection.h>
 #include <akonadi/resourcebase.h>
 
-class QTimer;
-class QFileInfo;
+#include <QTimer>
+#include <QFileInfo>
 class KDirWatch;
 namespace Akonadi_Maildir_Resource
 {
diff --git a/kdepim-runtime/resources/maildir/retrieveitemsjob.h b/kdepim-runtime/resources/maildir/retrieveitemsjob.h
index 538d5ad2..ef93c0b5 100644
--- a/kdepim-runtime/resources/maildir/retrieveitemsjob.h
+++ b/kdepim-runtime/resources/maildir/retrieveitemsjob.h
@@ -26,7 +26,7 @@
 
 #include "maildir.h"
 
-class QDirIterator;
+#include <QDirIterator>
 namespace Akonadi
 {
 class TransactionSequence;
diff --git a/kdepim-runtime/resources/mixedmaildir/compactchangehelper.h b/kdepim-runtime/resources/mixedmaildir/compactchangehelper.h
index ad6a47ae..da9ee6b3 100644
--- a/kdepim-runtime/resources/mixedmaildir/compactchangehelper.h
+++ b/kdepim-runtime/resources/mixedmaildir/compactchangehelper.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-template <typename T> class QList;
+#include <QList>
 
 namespace Akonadi {
   class Collection;
diff --git a/kdepim-runtime/resources/mixedmaildir/tests/testdatautil.h b/kdepim-runtime/resources/mixedmaildir/tests/testdatautil.h
index 43de869b..4b1af9c2 100644
--- a/kdepim-runtime/resources/mixedmaildir/tests/testdatautil.h
+++ b/kdepim-runtime/resources/mixedmaildir/tests/testdatautil.h
@@ -21,8 +21,8 @@
 #ifndef TESTDATAUTIL_H
 #define TESTDATAUTIL_H
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace TestDataUtil
 {
diff --git a/kdepim-runtime/resources/openxchange/oxa/contactutils.h b/kdepim-runtime/resources/openxchange/oxa/contactutils.h
index 882f91ad..9a162c12 100644
--- a/kdepim-runtime/resources/openxchange/oxa/contactutils.h
+++ b/kdepim-runtime/resources/openxchange/oxa/contactutils.h
@@ -26,8 +26,8 @@
 
 class KJob;
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace OXA {
 
diff --git a/kdepim-runtime/resources/openxchange/oxa/davmanager.h b/kdepim-runtime/resources/openxchange/oxa/davmanager.h
index d010fd9a..5ba4604a 100644
--- a/kdepim-runtime/resources/openxchange/oxa/davmanager.h
+++ b/kdepim-runtime/resources/openxchange/oxa/davmanager.h
@@ -28,7 +28,7 @@ namespace KIO {
 class DavJob;
 }
 
-class QDomDocument;
+#include <QDomDocument>
 
 namespace OXA {
 
diff --git a/kdepim-runtime/resources/openxchange/oxa/folderutils.h b/kdepim-runtime/resources/openxchange/oxa/folderutils.h
index 8e56703b..85c052ca 100644
--- a/kdepim-runtime/resources/openxchange/oxa/folderutils.h
+++ b/kdepim-runtime/resources/openxchange/oxa/folderutils.h
@@ -22,8 +22,8 @@
 #ifndef OXA_FOLDERUTILS_H
 #define OXA_FOLDERUTILS_H
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace OXA {
 
diff --git a/kdepim-runtime/resources/openxchange/oxa/incidenceutils.h b/kdepim-runtime/resources/openxchange/oxa/incidenceutils.h
index 1bf4dc7b..55b77053 100644
--- a/kdepim-runtime/resources/openxchange/oxa/incidenceutils.h
+++ b/kdepim-runtime/resources/openxchange/oxa/incidenceutils.h
@@ -24,8 +24,8 @@
 
 #include "object.h"
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace OXA {
 
diff --git a/kdepim-runtime/resources/openxchange/oxa/objectutils.h b/kdepim-runtime/resources/openxchange/oxa/objectutils.h
index 83293f29..7a80b73b 100644
--- a/kdepim-runtime/resources/openxchange/oxa/objectutils.h
+++ b/kdepim-runtime/resources/openxchange/oxa/objectutils.h
@@ -27,8 +27,8 @@
 
 class KJob;
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace OXA {
 
diff --git a/kdepim-runtime/resources/pop3/pop3resource.h b/kdepim-runtime/resources/pop3/pop3resource.h
index f228c9c6..0c50bb73 100644
--- a/kdepim-runtime/resources/pop3/pop3resource.h
+++ b/kdepim-runtime/resources/pop3/pop3resource.h
@@ -31,7 +31,7 @@ class Wallet;
 }
 
 class POPSession;
-class QTimer;
+#include <QTimer>
 
 class POP3Resource : public Akonadi::ResourceBase,
                      public Akonadi::AgentBase::Observer
diff --git a/kdepim-runtime/resources/shared/filestore/abstractlocalstore.h b/kdepim-runtime/resources/shared/filestore/abstractlocalstore.h
index b597e34b..5394c167 100644
--- a/kdepim-runtime/resources/shared/filestore/abstractlocalstore.h
+++ b/kdepim-runtime/resources/shared/filestore/abstractlocalstore.h
@@ -28,7 +28,7 @@
 
 #include <QObject>
 
-template <typename T> class QList;
+#include <QList>
 
 namespace Akonadi
 {
diff --git a/kdepim-runtime/resourcetester/global.h b/kdepim-runtime/resourcetester/global.h
index fd78e0e9..ff934d02 100644
--- a/kdepim-runtime/resourcetester/global.h
+++ b/kdepim-runtime/resourcetester/global.h
@@ -20,7 +20,7 @@
 
 #include <QString>
 
-class QObject;
+#include <QObject>
 
 namespace Global
 {
diff --git a/kdepim-runtime/tray/backupassistant.h b/kdepim-runtime/tray/backupassistant.h
index f7ce1d80..c3731457 100644
--- a/kdepim-runtime/tray/backupassistant.h
+++ b/kdepim-runtime/tray/backupassistant.h
@@ -22,8 +22,8 @@
 
 #include <KAssistantDialog>
 class Backup;
-class QLabel;
-class QPushButton;
+#include <QLabel>
+#include <QPushButton>
 
 /**
  * Use this class to create a backup assistant.
diff --git a/kdepim-runtime/tray/dock.h b/kdepim-runtime/tray/dock.h
index 531e5c11..b9b631d7 100644
--- a/kdepim-runtime/tray/dock.h
+++ b/kdepim-runtime/tray/dock.h
@@ -27,8 +27,8 @@
 
 #include <akonadi/agentinstance.h>
 
-class QLabel;
-class QAction;
+#include <QLabel>
+#include <QAction>
 
 class Tray : public QWidget
 {
diff --git a/kdepim-runtime/tray/restoreassistant.h b/kdepim-runtime/tray/restoreassistant.h
index 99440f77..d03b3cbf 100644
--- a/kdepim-runtime/tray/restoreassistant.h
+++ b/kdepim-runtime/tray/restoreassistant.h
@@ -22,8 +22,8 @@
 
 #include <KAssistantDialog>
 class Restore;
-class QLabel;
-class QPushButton;
+#include <QLabel>
+#include <QPushButton>
 
 /**
  * Use this class to create a backup assistant.
diff --git a/kdepim/agents/archivemailagent/addarchivemaildialog.h b/kdepim/agents/archivemailagent/addarchivemaildialog.h
index d9d7b295..81b05475 100644
--- a/kdepim/agents/archivemailagent/addarchivemaildialog.h
+++ b/kdepim/agents/archivemailagent/addarchivemaildialog.h
@@ -24,9 +24,9 @@
 #include <Akonadi/Collection>
 
 class KComboBox;
-class QCheckBox;
+#include <QCheckBox>
 class KUrlRequester;
-class QSpinBox;
+#include <QSpinBox>
 class KIntSpinBox;
 
 namespace MailCommon {
diff --git a/kdepim/agents/archivemailagent/archivemailagent.h b/kdepim/agents/archivemailagent/archivemailagent.h
index d1e507c7..03c14c43 100644
--- a/kdepim/agents/archivemailagent/archivemailagent.h
+++ b/kdepim/agents/archivemailagent/archivemailagent.h
@@ -21,7 +21,7 @@
 #include <akonadi/agentbase.h>
 
 #include <Akonadi/Collection>
-class QTimer;
+#include <QTimer>
 
 
 class ArchiveMailManager;
diff --git a/kdepim/agents/archivemailagent/archivemaildialog.h b/kdepim/agents/archivemailagent/archivemaildialog.h
index 915d7039..ba7735f7 100644
--- a/kdepim/agents/archivemailagent/archivemaildialog.h
+++ b/kdepim/agents/archivemailagent/archivemaildialog.h
@@ -25,7 +25,7 @@
 
 #include <QTreeWidgetItem>
 
-class QTreeWidget;
+#include <QTreeWidget>
 class KAboutData;
 class ArchiveMailItem : public QTreeWidgetItem
 {
diff --git a/kdepim/agents/followupreminderagent/followupreminderinfodialog.h b/kdepim/agents/followupreminderagent/followupreminderinfodialog.h
index 563b019d..d237c69a 100644
--- a/kdepim/agents/followupreminderagent/followupreminderinfodialog.h
+++ b/kdepim/agents/followupreminderagent/followupreminderinfodialog.h
@@ -21,7 +21,7 @@
 #include <KDialog>
 #include <QList>
 class KAboutData;
-class QTreeWidget;
+#include <QTreeWidget>
 class FollowUpReminderInfoWidget;
 namespace FollowUpReminder {
 class FollowUpReminderInfo;
diff --git a/kdepim/agents/followupreminderagent/followupreminderinfowidget.h b/kdepim/agents/followupreminderagent/followupreminderinfowidget.h
index 778be2d7..1030a1cb 100644
--- a/kdepim/agents/followupreminderagent/followupreminderinfowidget.h
+++ b/kdepim/agents/followupreminderagent/followupreminderinfowidget.h
@@ -22,7 +22,7 @@
 #include <KConfigGroup>
 #include <QTreeWidgetItem>
 #include <Akonadi/Item>
-class QTreeWidget;
+#include <QTreeWidget>
 namespace FollowUpReminder {
 class FollowUpReminderInfo;
 }
diff --git a/kdepim/agents/mailfilteragent/filterlogdialog.h b/kdepim/agents/mailfilteragent/filterlogdialog.h
index 85b1418b..c4dea4db 100644
--- a/kdepim/agents/mailfilteragent/filterlogdialog.h
+++ b/kdepim/agents/mailfilteragent/filterlogdialog.h
@@ -31,9 +31,9 @@
 
 #include <kdialog.h>
 
-class QCheckBox;
-class QSpinBox;
-class QGroupBox;
+#include <QCheckBox>
+#include <QSpinBox>
+#include <QGroupBox>
 
 /**
   @short KMail Filter Log Collector.
diff --git a/kdepim/agents/notesagent/notesagentalarmdialog.h b/kdepim/agents/notesagent/notesagentalarmdialog.h
index 90006281..23920b85 100644
--- a/kdepim/agents/notesagent/notesagentalarmdialog.h
+++ b/kdepim/agents/notesagent/notesagentalarmdialog.h
@@ -19,9 +19,9 @@
 #define NOTESAGENTALARMDIALOG_H
 #include <KDialog>
 #include <Akonadi/Item>
-class QListWidget;
-class QLabel;
-class QListWidgetItem;
+#include <QListWidget>
+#include <QLabel>
+#include <QListWidgetItem>
 namespace NoteShared {
 class NoteListWidget;
 }
diff --git a/kdepim/agents/notesagent/notesagentnotedialog.h b/kdepim/agents/notesagent/notesagentnotedialog.h
index f7a2122d..2030821c 100644
--- a/kdepim/agents/notesagent/notesagentnotedialog.h
+++ b/kdepim/agents/notesagent/notesagentnotedialog.h
@@ -21,8 +21,8 @@
 
 #include <KDialog>
 #include <Akonadi/Item>
-class QTextEdit;
-class QLineEdit;
+#include <QTextEdit>
+#include <QLineEdit>
 class KJob;
 namespace PimCommon {
 class RichTextEditorWidget;
diff --git a/kdepim/agents/notesagent/notesmanager.h b/kdepim/agents/notesagent/notesmanager.h
index 45d0ac31..338acc1f 100644
--- a/kdepim/agents/notesagent/notesmanager.h
+++ b/kdepim/agents/notesagent/notesmanager.h
@@ -25,13 +25,13 @@
 
 #include <Akonadi/Item>
 #include <QPointer>
-class QTcpServer;
-class QTimer;
+#include <QTcpServer>
+#include <QTimer>
 namespace NoteShared {
 class NotesChangeRecorder;
 class NotesAkonadiTreeModel;
 }
-class QModelIndex;
+#include <QModelIndex>
 class NotesManager : public QObject
 {
     Q_OBJECT
diff --git a/kdepim/agents/sendlateragent/sendlaterdialog.h b/kdepim/agents/sendlateragent/sendlaterdialog.h
index aef83d2f..2567a787 100644
--- a/kdepim/agents/sendlateragent/sendlaterdialog.h
+++ b/kdepim/agents/sendlateragent/sendlaterdialog.h
@@ -21,7 +21,7 @@
 #include <KDialog>
 #include "sendlater_export.h"
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace Ui {
 class SendLaterWidget;
diff --git a/kdepim/agents/sendlateragent/sendlatermanager.h b/kdepim/agents/sendlateragent/sendlatermanager.h
index 160b6517..cd7a995a 100644
--- a/kdepim/agents/sendlateragent/sendlatermanager.h
+++ b/kdepim/agents/sendlateragent/sendlatermanager.h
@@ -33,7 +33,7 @@ namespace MessageComposer {
 class AkonadiSender;
 }
 
-class QTimer;
+#include <QTimer>
 class SendLaterJob;
 class SendLaterManager : public QObject
 {
diff --git a/kdepim/akonadi_next/amazingcompleter.h b/kdepim/akonadi_next/amazingcompleter.h
index ddfe6039..f34ad83d 100644
--- a/kdepim/akonadi_next/amazingcompleter.h
+++ b/kdepim/akonadi_next/amazingcompleter.h
@@ -26,7 +26,7 @@
 
 #include "akonadi_next_export.h"
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 
 namespace Akonadi
diff --git a/kdepim/akonadi_next/kcolumnfilterproxymodel.h b/kdepim/akonadi_next/kcolumnfilterproxymodel.h
index f81bc775..a7edfbfe 100644
--- a/kdepim/akonadi_next/kcolumnfilterproxymodel.h
+++ b/kdepim/akonadi_next/kcolumnfilterproxymodel.h
@@ -27,7 +27,7 @@
 
 #include <QSortFilterProxyModel>
 
-template <class T> class QVector;
+#include <QVector>
 
 namespace Future
 {
diff --git a/kdepim/akonadiconsole/agentconfigmodel.h b/kdepim/akonadiconsole/agentconfigmodel.h
index f8227cb7..19fef888 100644
--- a/kdepim/akonadiconsole/agentconfigmodel.h
+++ b/kdepim/akonadiconsole/agentconfigmodel.h
@@ -25,7 +25,7 @@
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QVector>
 
-class QDBusInterface;
+#include <QDBusInterface>
 
 class AgentConfigModel : public QAbstractTableModel
 {
diff --git a/kdepim/akonadiconsole/agentwidget.h b/kdepim/akonadiconsole/agentwidget.h
index e43ed275..e580db86 100644
--- a/kdepim/akonadiconsole/agentwidget.h
+++ b/kdepim/akonadiconsole/agentwidget.h
@@ -27,9 +27,9 @@
 #include <akonadi/agentinstance.h>
 
 class KJob;
-class QMenu;
-class QPoint;
-class QResizeEvent;
+#include <QMenu>
+#include <QPoint>
+#include <QResizeEvent>
 
 class AgentWidget : public QWidget
 {
diff --git a/kdepim/akonadiconsole/browserwidget.h b/kdepim/akonadiconsole/browserwidget.h
index 45f6fe51..1269376b 100644
--- a/kdepim/akonadiconsole/browserwidget.h
+++ b/kdepim/akonadiconsole/browserwidget.h
@@ -29,8 +29,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QStandardItemModel;
+#include <QModelIndex>
+#include <QStandardItemModel>
 
 class KJob;
 class KToggleAction;
diff --git a/kdepim/akonadiconsole/collectionattributespage.h b/kdepim/akonadiconsole/collectionattributespage.h
index f7361f31..08b84937 100644
--- a/kdepim/akonadiconsole/collectionattributespage.h
+++ b/kdepim/akonadiconsole/collectionattributespage.h
@@ -24,8 +24,8 @@
 
 #include <akonadi/collectionpropertiespage.h>
 
-class QStandardItem;
-class QStandardItemModel;
+#include <QStandardItem>
+#include <QStandardItemModel>
 
 class CollectionAttributePage : public Akonadi::CollectionPropertiesPage
 {
diff --git a/kdepim/akonadiconsole/dbaccess.h b/kdepim/akonadiconsole/dbaccess.h
index 5818bdbf..65da2e56 100644
--- a/kdepim/akonadiconsole/dbaccess.h
+++ b/kdepim/akonadiconsole/dbaccess.h
@@ -20,7 +20,7 @@
 #ifndef AKONADICONSOLE_DBACCESS_H
 #define AKONADICONSOLE_DBACCESS_H
 
-class QSqlDatabase;
+#include <QSqlDatabase>
 
 namespace DbAccess
 {
diff --git a/kdepim/akonadiconsole/dbbrowser.h b/kdepim/akonadiconsole/dbbrowser.h
index e525529c..138d6517 100644
--- a/kdepim/akonadiconsole/dbbrowser.h
+++ b/kdepim/akonadiconsole/dbbrowser.h
@@ -22,7 +22,7 @@
 
 #include "ui_dbbrowser.h"
 
-class QSqlTableModel;
+#include <QSqlTableModel>
 
 class DbBrowser : public QWidget
 {
diff --git a/kdepim/akonadiconsole/dbconsole.h b/kdepim/akonadiconsole/dbconsole.h
index e278aa73..381ca2f7 100644
--- a/kdepim/akonadiconsole/dbconsole.h
+++ b/kdepim/akonadiconsole/dbconsole.h
@@ -22,7 +22,7 @@
 
 #include "ui_dbconsole.h"
 
-class QSqlQueryModel;
+#include <QSqlQueryModel>
 
 class DbConsole : public QWidget
 {
diff --git a/kdepim/akonadiconsole/jobtrackerwidget.h b/kdepim/akonadiconsole/jobtrackerwidget.h
index e13bcbf9..83010cee 100644
--- a/kdepim/akonadiconsole/jobtrackerwidget.h
+++ b/kdepim/akonadiconsole/jobtrackerwidget.h
@@ -24,8 +24,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QFile;
+#include <QModelIndex>
+#include <QFile>
 class JobTrackerWidget : public QWidget
 {
   Q_OBJECT
diff --git a/kdepim/akonadiconsole/notificationmonitor.h b/kdepim/akonadiconsole/notificationmonitor.h
index d910dbd5..c3d8d925 100644
--- a/kdepim/akonadiconsole/notificationmonitor.h
+++ b/kdepim/akonadiconsole/notificationmonitor.h
@@ -22,9 +22,9 @@
 
 #include <QWidget>
 
-class QModelIndex;
+#include <QModelIndex>
 class NotificationModel;
-class QFile;
+#include <QFile>
 
 class NotificationMonitor : public QWidget
 {
diff --git a/kdepim/akonadiconsole/rawsocketconsole.h b/kdepim/akonadiconsole/rawsocketconsole.h
index b22324f2..09f3beee 100644
--- a/kdepim/akonadiconsole/rawsocketconsole.h
+++ b/kdepim/akonadiconsole/rawsocketconsole.h
@@ -22,7 +22,7 @@
 
 #include "ui_rawsocketconsole.h"
 
-class QLocalSocket;
+#include <QLocalSocket>
 
 class RawSocketConsole : public QWidget
 {
diff --git a/kdepim/akonadiconsole/searchwidget.h b/kdepim/akonadiconsole/searchwidget.h
index 695acdb5..78f30304 100644
--- a/kdepim/akonadiconsole/searchwidget.h
+++ b/kdepim/akonadiconsole/searchwidget.h
@@ -29,9 +29,9 @@ class KJob;
 class KTextBrowser;
 class KTextEdit;
 
-class QListView;
-class QModelIndex;
-class QStringListModel;
+#include <QListView>
+#include <QModelIndex>
+#include <QStringListModel>
 
 class SearchWidget : public QWidget
 {
diff --git a/kdepim/blogilo/src/composer/bilbobrowser.h b/kdepim/blogilo/src/composer/bilbobrowser.h
index 906a934c..bbcd019b 100644
--- a/kdepim/blogilo/src/composer/bilbobrowser.h
+++ b/kdepim/blogilo/src/composer/bilbobrowser.h
@@ -30,8 +30,8 @@
 
 #include "kurl.h"
 
-class QCheckBox;
-class QProgressBar;
+#include <QCheckBox>
+#include <QProgressBar>
 class KWebView;
 class KPushButton;
 class KStatusBar;
diff --git a/kdepim/blogilo/src/composer/htmleditor.h b/kdepim/blogilo/src/composer/htmleditor.h
index 18d2a429..3b223cc5 100644
--- a/kdepim/blogilo/src/composer/htmleditor.h
+++ b/kdepim/blogilo/src/composer/htmleditor.h
@@ -32,7 +32,7 @@ namespace KTextEditor
     class Editor;
     class View;
 }
-class QWidget;
+#include <QWidget>
 class HtmlEditorPrivate;
 
 /**
diff --git a/kdepim/blogilo/src/configurestorageservicewidget.h b/kdepim/blogilo/src/configurestorageservicewidget.h
index 47738fdd..a99b642b 100644
--- a/kdepim/blogilo/src/configurestorageservicewidget.h
+++ b/kdepim/blogilo/src/configurestorageservicewidget.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 #include "pimcommon/storageservice/widgets/storageserviceconfigurewidget.h"
-class QPushButton;
+#include <QPushButton>
 
 class StorageServiceConfigureWidget : public PimCommon::StorageServiceConfigureWidget
 {
diff --git a/kdepim/blogilo/src/mainwindow.h b/kdepim/blogilo/src/mainwindow.h
index 5fd4a139..8c5bff74 100644
--- a/kdepim/blogilo/src/mainwindow.h
+++ b/kdepim/blogilo/src/mainwindow.h
@@ -33,8 +33,8 @@
 #include <QPointer>
 
 class KStatusNotifierItem;
-class QProgressBar;
-class QToolButton;
+#include <QProgressBar>
+#include <QToolButton>
 class Toolbox;
 class KSelectAction;
 class PostEntry;
diff --git a/kdepim/blogilo/src/poststabwidget.h b/kdepim/blogilo/src/poststabwidget.h
index 881e1489..46dde3bd 100644
--- a/kdepim/blogilo/src/poststabwidget.h
+++ b/kdepim/blogilo/src/poststabwidget.h
@@ -19,7 +19,7 @@
 #define POSTSTABWIDGET_H
 
 #include <KTabWidget>
-class QToolButton;
+#include <QToolButton>
 
 class PostsTabWidget : public KTabWidget
 {
diff --git a/kdepim/calendarsupport/archivedialog.h b/kdepim/calendarsupport/archivedialog.h
index a5ef68df..76b3b856 100644
--- a/kdepim/calendarsupport/archivedialog.h
+++ b/kdepim/calendarsupport/archivedialog.h
@@ -33,8 +33,8 @@ class KDateComboBox;
 class KIntNumInput;
 class KUrlRequester;
 
-class QCheckBox;
-class QRadioButton;
+#include <QCheckBox>
+#include <QRadioButton>
 
 namespace Akonadi {
   class IncidenceChanger;
diff --git a/kdepim/calendarsupport/attachmenthandler.h b/kdepim/calendarsupport/attachmenthandler.h
index 8f4ea25a..5ed4aaa2 100644
--- a/kdepim/calendarsupport/attachmenthandler.h
+++ b/kdepim/calendarsupport/attachmenthandler.h
@@ -34,8 +34,8 @@
 
 class KJob;
 
-class QString;
-class QWidget;
+#include <QString>
+#include <QWidget>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/categoryconfig.h b/kdepim/calendarsupport/categoryconfig.h
index 725237d9..696ed9e3 100644
--- a/kdepim/calendarsupport/categoryconfig.h
+++ b/kdepim/calendarsupport/categoryconfig.h
@@ -26,7 +26,7 @@
 #include <QObject>
 
 class KCoreConfigSkeleton;
-class QColor;
+#include <QColor>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/categoryhierarchyreader.h b/kdepim/calendarsupport/categoryhierarchyreader.h
index 7e63c4d5..9e2cd39c 100644
--- a/kdepim/calendarsupport/categoryhierarchyreader.h
+++ b/kdepim/calendarsupport/categoryhierarchyreader.h
@@ -25,8 +25,8 @@
 
 class KComboBox;
 
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/collectiongeneralpage.h b/kdepim/calendarsupport/collectiongeneralpage.h
index 4047d4b7..bdeaab78 100644
--- a/kdepim/calendarsupport/collectiongeneralpage.h
+++ b/kdepim/calendarsupport/collectiongeneralpage.h
@@ -26,7 +26,7 @@
 
 class KLineEdit;
 class KIconButton;
-class QCheckBox;
+#include <QCheckBox>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/collectionselection.h b/kdepim/calendarsupport/collectionselection.h
index a96e375d..f83297ee 100644
--- a/kdepim/calendarsupport/collectionselection.h
+++ b/kdepim/calendarsupport/collectionselection.h
@@ -30,8 +30,8 @@
 
 #include <Akonadi/Collection>
 
-class QItemSelection;
-class QItemSelectionModel;
+#include <QItemSelection>
+#include <QItemSelectionModel>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/eventarchiver.h b/kdepim/calendarsupport/eventarchiver.h
index 4bdf0645..740336d8 100644
--- a/kdepim/calendarsupport/eventarchiver.h
+++ b/kdepim/calendarsupport/eventarchiver.h
@@ -33,7 +33,7 @@
 
 #include <QObject>
 
-class QDate;
+#include <QDate>
 
 namespace Akonadi {
   class IncidenceChanger;
diff --git a/kdepim/calendarsupport/next/incidenceviewer.h b/kdepim/calendarsupport/next/incidenceviewer.h
index 54e2efe7..7f042bc0 100644
--- a/kdepim/calendarsupport/next/incidenceviewer.h
+++ b/kdepim/calendarsupport/next/incidenceviewer.h
@@ -29,7 +29,7 @@
 #include <QDate>
 #include <QWidget>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
   class ETMCalendar;
diff --git a/kdepim/calendarsupport/printing/calprinter.h b/kdepim/calendarsupport/printing/calprinter.h
index c5d4de87..3a68b134 100644
--- a/kdepim/calendarsupport/printing/calprinter.h
+++ b/kdepim/calendarsupport/printing/calprinter.h
@@ -29,8 +29,8 @@
 #include <KComboBox>
 #include <KDialog>
 
-class QButtonGroup;
-class QStackedWidget;
+#include <QButtonGroup>
+#include <QStackedWidget>
 
 namespace CalendarSupport {
 
diff --git a/kdepim/calendarsupport/printing/calprintpluginbase.h b/kdepim/calendarsupport/printing/calprintpluginbase.h
index 775e2137..9ffd9973 100644
--- a/kdepim/calendarsupport/printing/calprintpluginbase.h
+++ b/kdepim/calendarsupport/printing/calprintpluginbase.h
@@ -39,7 +39,7 @@
 #include <QPainter>
 
 class PrintCellItem;
-class QWidget;
+#include <QWidget>
 
 #define PORTRAIT_HEADER_HEIGHT 72   // header height, for portrait orientation
 #define LANDSCAPE_HEADER_HEIGHT 54  // header height, for landscape orientation
diff --git a/kdepim/calendarsupport/utils.h b/kdepim/calendarsupport/utils.h
index e96856a5..bd1f2a6b 100644
--- a/kdepim/calendarsupport/utils.h
+++ b/kdepim/calendarsupport/utils.h
@@ -52,9 +52,9 @@ namespace Akonadi {
   class ETMCalendar;
 }
 
-class QAbstractItemModel;
-class QDrag;
-class QMimeData;
+#include <QAbstractItemModel>
+#include <QDrag>
+#include <QMimeData>
 
 typedef QList<QModelIndex> QModelIndexList;
 
diff --git a/kdepim/calendarviews/agenda/agendaview.h b/kdepim/calendarviews/agenda/agendaview.h
index 206a1ba5..2ec7f143 100644
--- a/kdepim/calendarviews/agenda/agendaview.h
+++ b/kdepim/calendarviews/agenda/agendaview.h
@@ -36,7 +36,7 @@
 class KConfig;
 class KHBox;
 
-class QSplitter;
+#include <QSplitter>
 
 namespace EventViews {
 
diff --git a/kdepim/calendarviews/agenda/timelabelszone.h b/kdepim/calendarviews/agenda/timelabelszone.h
index c886b58e..0deac217 100644
--- a/kdepim/calendarviews/agenda/timelabelszone.h
+++ b/kdepim/calendarviews/agenda/timelabelszone.h
@@ -30,8 +30,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QHBoxLayout;
-class QScrollArea;
+#include <QHBoxLayout>
+#include <QScrollArea>
 
 namespace EventViews {
 
diff --git a/kdepim/calendarviews/helper.h b/kdepim/calendarviews/helper.h
index 00b012d7..e74355d9 100644
--- a/kdepim/calendarviews/helper.h
+++ b/kdepim/calendarviews/helper.h
@@ -35,8 +35,8 @@ namespace Akonadi {
   class Item;
 }
 
-class QPixmap;
-class QDate;
+#include <QPixmap>
+#include <QDate>
 
 // Provides static methods that are useful to all views.
 
diff --git a/kdepim/calendarviews/journal/journalframe.h b/kdepim/calendarviews/journal/journalframe.h
index 94275321..faa520b9 100644
--- a/kdepim/calendarviews/journal/journalframe.h
+++ b/kdepim/calendarviews/journal/journalframe.h
@@ -36,7 +36,7 @@
 #include <QFrame>
 
 class KTextBrowser;
-class QPushButton;
+#include <QPushButton>
 
 namespace EventViews {
 
diff --git a/kdepim/calendarviews/journal/journalview.h b/kdepim/calendarviews/journal/journalview.h
index 3b91c464..f717c41d 100644
--- a/kdepim/calendarviews/journal/journalview.h
+++ b/kdepim/calendarviews/journal/journalview.h
@@ -30,7 +30,7 @@
 #include <KCalCore/Journal>
 
 class KVBox;
-class QScrollArea;
+#include <QScrollArea>
 
 /**
  * This class provides a journal view.
diff --git a/kdepim/calendarviews/list/listview.h b/kdepim/calendarviews/list/listview.h
index 251b5820..33ff7333 100644
--- a/kdepim/calendarviews/list/listview.h
+++ b/kdepim/calendarviews/list/listview.h
@@ -28,7 +28,7 @@
 
 class KConfig;
 
-class QModelIndex;
+#include <QModelIndex>
 
 /**
   This class provides a multi-column list view of events.  It can
diff --git a/kdepim/calendarviews/month/monthview.h b/kdepim/calendarviews/month/monthview.h
index b227c91f..75d096fd 100644
--- a/kdepim/calendarviews/month/monthview.h
+++ b/kdepim/calendarviews/month/monthview.h
@@ -29,7 +29,7 @@
 
 #include <KDateTime>
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace EventViews {
 
diff --git a/kdepim/calendarviews/timeline/timelineview_p.h b/kdepim/calendarviews/timeline/timelineview_p.h
index 484cecda..3910847b 100644
--- a/kdepim/calendarviews/timeline/timelineview_p.h
+++ b/kdepim/calendarviews/timeline/timelineview_p.h
@@ -33,8 +33,8 @@
 #include <QModelIndex>
 #include <QObject>
 
-class QStandardItem;
-class QTreeWidget;
+#include <QStandardItem>
+#include <QTreeWidget>
 
 namespace KDGantt {
   class GraphicsView;
diff --git a/kdepim/calendarviews/todo/tododelegates.h b/kdepim/calendarviews/todo/tododelegates.h
index 92a457a4..33b120d0 100644
--- a/kdepim/calendarviews/todo/tododelegates.h
+++ b/kdepim/calendarviews/todo/tododelegates.h
@@ -28,10 +28,10 @@
 #include <Akonadi/Calendar/ETMCalendar>
 #include <QStyledItemDelegate>
 
-class QPainter;
-class QSize;
-class QStyleOptionViewItem;
-class QTextDocument;
+#include <QPainter>
+#include <QSize>
+#include <QStyleOptionViewItem>
+#include <QTextDocument>
 
 /**
   This delegate is responsible for displaying progress bars for the completion
diff --git a/kdepim/calendarviews/todo/todomodel.h b/kdepim/calendarviews/todo/todomodel.h
index 2571b165..e444e761 100644
--- a/kdepim/calendarviews/todo/todomodel.h
+++ b/kdepim/calendarviews/todo/todomodel.h
@@ -35,7 +35,7 @@
 #include <Akonadi/EntityTreeModel>
 #include <QAbstractProxyModel>
 
-class QMimeData;
+#include <QMimeData>
 
 class TodoModel : public QAbstractProxyModel
 {
diff --git a/kdepim/calendarviews/todo/todoview.h b/kdepim/calendarviews/todo/todoview.h
index dec962bb..79d3cc97 100644
--- a/kdepim/calendarviews/todo/todoview.h
+++ b/kdepim/calendarviews/todo/todoview.h
@@ -49,11 +49,11 @@ namespace Akonadi {
   class ETMViewStateSaver;
 }
 
-class QItemSelection;
-class QMenu;
-class QModelIndex;
-class QToolButton;
-class QTimer;
+#include <QItemSelection>
+#include <QMenu>
+#include <QModelIndex>
+#include <QToolButton>
+#include <QTimer>
 
 namespace EventViews {
 
diff --git a/kdepim/calendarviews/viewerapp/mainwindow.h b/kdepim/calendarviews/viewerapp/mainwindow.h
index c1f45a83..ba284e89 100644
--- a/kdepim/calendarviews/viewerapp/mainwindow.h
+++ b/kdepim/calendarviews/viewerapp/mainwindow.h
@@ -39,7 +39,7 @@ namespace EventViews
   typedef boost::shared_ptr<Prefs> PrefsPtr;
 }
 
-class QAction;
+#include <QAction>
 class Settings;
 
 class MainWindow : public QMainWindow
diff --git a/kdepim/composereditor-ng/image/composerimageresizewidget.h b/kdepim/composereditor-ng/image/composerimageresizewidget.h
index ffc3ff73..335466e0 100644
--- a/kdepim/composereditor-ng/image/composerimageresizewidget.h
+++ b/kdepim/composereditor-ng/image/composerimageresizewidget.h
@@ -23,8 +23,8 @@
 #include <QWidget>
 #include <QWebElement>
 
-class QPaintEvent;
-class QMouseEvent;
+#include <QPaintEvent>
+#include <QMouseEvent>
 
 namespace ComposerEditorNG
 {
diff --git a/kdepim/composereditor-ng/widgets/domtreewidget.h b/kdepim/composereditor-ng/widgets/domtreewidget.h
index bf97ef6c..4e02e16c 100644
--- a/kdepim/composereditor-ng/widgets/domtreewidget.h
+++ b/kdepim/composereditor-ng/widgets/domtreewidget.h
@@ -24,7 +24,7 @@
 #include "composereditor_export.h"
 
 #include <QWidget>
-class QTreeWidget;
+#include <QTreeWidget>
 class QWebView;
 
 namespace ComposerEditorNG
diff --git a/kdepim/console/kabcclient/src/csvtemplate.h b/kdepim/console/kabcclient/src/csvtemplate.h
index 2670ca62..25b7fcd8 100644
--- a/kdepim/console/kabcclient/src/csvtemplate.h
+++ b/kdepim/console/kabcclient/src/csvtemplate.h
@@ -25,7 +25,7 @@
 
 // forward declarations
 class KConfigBase;
-class QDateTime;
+#include <QDateTime>
 
 namespace KABC
 {
diff --git a/kdepim/console/kabcclient/src/inputformat.h b/kdepim/console/kabcclient/src/inputformat.h
index 88a2d02f..8f7cf49b 100644
--- a/kdepim/console/kabcclient/src/inputformat.h
+++ b/kdepim/console/kabcclient/src/inputformat.h
@@ -26,7 +26,7 @@
 #include <QtCore/QString>
 
 // forward declarations
-class QTextCodec;
+#include <QTextCodec>
 
 namespace KABC
 {
diff --git a/kdepim/console/kabcclient/src/kabcclient.h b/kdepim/console/kabcclient/src/kabcclient.h
index 2198f683..67ce3c4b 100644
--- a/kdepim/console/kabcclient/src/kabcclient.h
+++ b/kdepim/console/kabcclient/src/kabcclient.h
@@ -29,7 +29,7 @@
 class FormatFactory;
 class InputFormat;
 class OutputFormat;
-class QTextCodec;
+#include <QTextCodec>
 
 namespace KABC
 {
diff --git a/kdepim/console/kabcclient/src/outputformatimpls.h b/kdepim/console/kabcclient/src/outputformatimpls.h
index be4f5f28..08c3c357 100644
--- a/kdepim/console/kabcclient/src/outputformatimpls.h
+++ b/kdepim/console/kabcclient/src/outputformatimpls.h
@@ -25,7 +25,7 @@
 // forward declarations
 class CSVTemplate;
 class CSVTemplateFactory;
-class QTextCodec;
+#include <QTextCodec>
 
 namespace KABC
 {
diff --git a/kdepim/console/konsolekalendar/konsolekalendar.h b/kdepim/console/konsolekalendar/konsolekalendar.h
index cbe75b49..4a4e4890 100644
--- a/kdepim/console/konsolekalendar/konsolekalendar.h
+++ b/kdepim/console/konsolekalendar/konsolekalendar.h
@@ -35,7 +35,7 @@
 
 #include <QDateTime>
 
-class QTextStream;
+#include <QTextStream>
 
 /**
  * @file konsolekalendar.h
diff --git a/kdepim/examples/akonablog/mainwidget.h b/kdepim/examples/akonablog/mainwidget.h
index 9649c086..51dfac90 100644
--- a/kdepim/examples/akonablog/mainwidget.h
+++ b/kdepim/examples/akonablog/mainwidget.h
@@ -23,8 +23,8 @@
 #include "blogmodel.h"
 #include <QWidget>
 
-class QTreeView;
-class QListView;
+#include <QTreeView>
+#include <QListView>
 class AkonadiTabBar;
 class MainWindow;
 
diff --git a/kdepim/examples/coisceim/coisceim-mobile/messageviewitem.h b/kdepim/examples/coisceim/coisceim-mobile/messageviewitem.h
index 800b3349..9c2ce6da 100644
--- a/kdepim/examples/coisceim/coisceim-mobile/messageviewitem.h
+++ b/kdepim/examples/coisceim/coisceim-mobile/messageviewitem.h
@@ -22,7 +22,7 @@
 
 #include <mobile/lib/declarativeakonadiitem.h>
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class KUrl;
 
 namespace Akonadi {
diff --git a/kdepim/examples/coisceim/coisceimpart.h b/kdepim/examples/coisceim/coisceimpart.h
index f633dc11..cee90aff 100644
--- a/kdepim/examples/coisceim/coisceimpart.h
+++ b/kdepim/examples/coisceim/coisceimpart.h
@@ -26,7 +26,7 @@
 #include <kparts/statusbarextension.h>
 #include "coisceimwidget.h"
 
-class QWidget;
+#include <QWidget>
 class KAboutData;
 
 class CoisceimPart : public KParts::ReadOnlyPart
diff --git a/kdepim/examples/coisceim/createfoldercontentswidget.h b/kdepim/examples/coisceim/createfoldercontentswidget.h
index af1205ac..7ab9f488 100644
--- a/kdepim/examples/coisceim/createfoldercontentswidget.h
+++ b/kdepim/examples/coisceim/createfoldercontentswidget.h
@@ -26,7 +26,7 @@
 #include <Akonadi/Collection>
 
 class FolderContentsWidget;
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 class Trip;
 
diff --git a/kdepim/examples/coisceim/eventselectorwidget.h b/kdepim/examples/coisceim/eventselectorwidget.h
index f3db6318..ca2cf949 100644
--- a/kdepim/examples/coisceim/eventselectorwidget.h
+++ b/kdepim/examples/coisceim/eventselectorwidget.h
@@ -25,7 +25,7 @@
 #include <KDialog>
 #include <Akonadi/Item>
 
-class QTreeView;
+#include <QTreeView>
 
 namespace CalendarSupport {
 class IncidenceViewer;
diff --git a/kdepim/examples/coisceim/foldercontentswidget.h b/kdepim/examples/coisceim/foldercontentswidget.h
index b4b13211..1c785c5e 100644
--- a/kdepim/examples/coisceim/foldercontentswidget.h
+++ b/kdepim/examples/coisceim/foldercontentswidget.h
@@ -24,7 +24,7 @@
 
 #include <QWidget>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 namespace Akonadi
 {
diff --git a/kdepim/examples/coisceim/itemselection.h b/kdepim/examples/coisceim/itemselection.h
index 0ac56e94..920b52a6 100644
--- a/kdepim/examples/coisceim/itemselection.h
+++ b/kdepim/examples/coisceim/itemselection.h
@@ -24,7 +24,7 @@
 
 #include <QModelIndex>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 class ItemSelection : public QObject
 {
diff --git a/kdepim/examples/coisceim/itemviewerwidget.h b/kdepim/examples/coisceim/itemviewerwidget.h
index 43b8ad65..dcab0094 100644
--- a/kdepim/examples/coisceim/itemviewerwidget.h
+++ b/kdepim/examples/coisceim/itemviewerwidget.h
@@ -26,11 +26,11 @@
 
 #include <QWidget>
 
-class QModelIndex;
+#include <QModelIndex>
 class NoteViewer;
 
 class ItemSelection;
-class QStackedWidget;
+#include <QStackedWidget>
 
 namespace MessageViewer
 {
diff --git a/kdepim/examples/coisceim/noteviewer.h b/kdepim/examples/coisceim/noteviewer.h
index a8f217a1..138ab126 100644
--- a/kdepim/examples/coisceim/noteviewer.h
+++ b/kdepim/examples/coisceim/noteviewer.h
@@ -27,8 +27,8 @@
 #include <QWidget>
 #include <QPersistentModelIndex>
 
-class QLineEdit;
-class QTextEdit;
+#include <QLineEdit>
+#include <QTextEdit>
 
 class KJob;
 
diff --git a/kdepim/examples/coisceim/stackedwidgetview.h b/kdepim/examples/coisceim/stackedwidgetview.h
index fdf8b771..6ddd15a5 100644
--- a/kdepim/examples/coisceim/stackedwidgetview.h
+++ b/kdepim/examples/coisceim/stackedwidgetview.h
@@ -24,9 +24,9 @@
 
 #include <QStackedWidget>
 
-class QAbstractItemModel;
-class QItemSelectionModel;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QModelIndex>
 
 class StackedWidgetView : public QStackedWidget
 {
diff --git a/kdepim/examples/coisceim/trip.h b/kdepim/examples/coisceim/trip.h
index b66042e6..8e78dac3 100644
--- a/kdepim/examples/coisceim/trip.h
+++ b/kdepim/examples/coisceim/trip.h
@@ -28,7 +28,7 @@
 #include "itemselection.h"
 #include <QItemSelectionModel>
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class TripComponentFactory;
 class TripModel;
 
diff --git a/kdepim/examples/coisceim/tripcomponentfactory.h b/kdepim/examples/coisceim/tripcomponentfactory.h
index c1190ee6..e7710e35 100644
--- a/kdepim/examples/coisceim/tripcomponentfactory.h
+++ b/kdepim/examples/coisceim/tripcomponentfactory.h
@@ -22,8 +22,8 @@
 #ifndef TRIPCOMPONENTFACTORY_H
 #define TRIPCOMPONENTFACTORY_H
 
-class QObject;
-class QAbstractItemModel;
+#include <QObject>
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 class ChangeRecorder;
diff --git a/kdepim/examples/coisceim/tripwidget.h b/kdepim/examples/coisceim/tripwidget.h
index 0dd1ed70..6ff4862f 100644
--- a/kdepim/examples/coisceim/tripwidget.h
+++ b/kdepim/examples/coisceim/tripwidget.h
@@ -24,9 +24,9 @@
 
 #include <QWidget>
 
-class QLabel;
-class QTextBrowser;
-class QModelIndex;
+#include <QLabel>
+#include <QTextBrowser>
+#include <QModelIndex>
 
 class Trip;
 class FolderContentsWidget;
diff --git a/kdepim/examples/etm_usage/checkable2.h b/kdepim/examples/etm_usage/checkable2.h
index 4448a217..96488e0d 100644
--- a/kdepim/examples/etm_usage/checkable2.h
+++ b/kdepim/examples/etm_usage/checkable2.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class Checkable2 : public QWidget
 {
diff --git a/kdepim/examples/etm_usage/collectionmonitoredwidget.h b/kdepim/examples/etm_usage/collectionmonitoredwidget.h
index a4ef2e91..e2875f4d 100644
--- a/kdepim/examples/etm_usage/collectionmonitoredwidget.h
+++ b/kdepim/examples/etm_usage/collectionmonitoredwidget.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 
-class QItemSelection;
+#include <QItemSelection>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/desctab.h b/kdepim/examples/etm_usage/desctab.h
index 47b3979c..1d1ab845 100644
--- a/kdepim/examples/etm_usage/desctab.h
+++ b/kdepim/examples/etm_usage/desctab.h
@@ -27,7 +27,7 @@
 #include <QWidget>
 
 class EntityTreeWidget;
-class QTreeView;
+#include <QTreeView>
 
 class DescTabWidget : public QWidget
 {
diff --git a/kdepim/examples/etm_usage/entityfindingwidget.h b/kdepim/examples/etm_usage/entityfindingwidget.h
index de258d0e..644fac7a 100644
--- a/kdepim/examples/etm_usage/entityfindingwidget.h
+++ b/kdepim/examples/etm_usage/entityfindingwidget.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 
-class QListView;
+#include <QListView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/entitytreewidget.h b/kdepim/examples/etm_usage/entitytreewidget.h
index e810b4b4..eef53971 100644
--- a/kdepim/examples/etm_usage/entitytreewidget.h
+++ b/kdepim/examples/etm_usage/entitytreewidget.h
@@ -25,9 +25,9 @@
 #include <QWidget>
 #include <QModelIndex>
 
-class QTreeView;
-class QLineEdit;
-class QComboBox;
+#include <QTreeView>
+#include <QLineEdit>
+#include <QComboBox>
 
 namespace Akonadi
 {
diff --git a/kdepim/examples/etm_usage/itemviewerwidget.h b/kdepim/examples/etm_usage/itemviewerwidget.h
index ed8521f0..3dc362c6 100644
--- a/kdepim/examples/etm_usage/itemviewerwidget.h
+++ b/kdepim/examples/etm_usage/itemviewerwidget.h
@@ -28,8 +28,8 @@
 #include <QItemSelection>
 class NoteViewer;
 
-class QItemSelectionModel;
-class QStackedWidget;
+#include <QItemSelectionModel>
+#include <QStackedWidget>
 
 namespace MessageViewer
 {
diff --git a/kdepim/examples/etm_usage/noteviewer.h b/kdepim/examples/etm_usage/noteviewer.h
index a8f217a1..138ab126 100644
--- a/kdepim/examples/etm_usage/noteviewer.h
+++ b/kdepim/examples/etm_usage/noteviewer.h
@@ -27,8 +27,8 @@
 #include <QWidget>
 #include <QPersistentModelIndex>
 
-class QLineEdit;
-class QTextEdit;
+#include <QLineEdit>
+#include <QTextEdit>
 
 class KJob;
 
diff --git a/kdepim/examples/etm_usage/recursiveitemlistwidget.h b/kdepim/examples/etm_usage/recursiveitemlistwidget.h
index ce01babf..5f8edbd4 100644
--- a/kdepim/examples/etm_usage/recursiveitemlistwidget.h
+++ b/kdepim/examples/etm_usage/recursiveitemlistwidget.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 namespace Akonadi
 {
diff --git a/kdepim/examples/etm_usage/tab2_5widget.h b/kdepim/examples/etm_usage/tab2_5widget.h
index a4c7cd76..7bd37875 100644
--- a/kdepim/examples/etm_usage/tab2_5widget.h
+++ b/kdepim/examples/etm_usage/tab2_5widget.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/tab2widget.h b/kdepim/examples/etm_usage/tab2widget.h
index 6f84b2c7..b3878293 100644
--- a/kdepim/examples/etm_usage/tab2widget.h
+++ b/kdepim/examples/etm_usage/tab2widget.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/tab3widget.h b/kdepim/examples/etm_usage/tab3widget.h
index 30b1ec50..3e3132b7 100644
--- a/kdepim/examples/etm_usage/tab3widget.h
+++ b/kdepim/examples/etm_usage/tab3widget.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/tab4widget.h b/kdepim/examples/etm_usage/tab4widget.h
index c36419d4..ae401294 100644
--- a/kdepim/examples/etm_usage/tab4widget.h
+++ b/kdepim/examples/etm_usage/tab4widget.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/tab5widget.h b/kdepim/examples/etm_usage/tab5widget.h
index d3ae1686..91a03381 100644
--- a/kdepim/examples/etm_usage/tab5widget.h
+++ b/kdepim/examples/etm_usage/tab5widget.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 
-class QModelIndex;
+#include <QModelIndex>
 class KCategorizedView;
 
 class EntityTreeWidget;
diff --git a/kdepim/examples/etm_usage/tab6widget.h b/kdepim/examples/etm_usage/tab6widget.h
index dca4589d..d2132641 100644
--- a/kdepim/examples/etm_usage/tab6widget.h
+++ b/kdepim/examples/etm_usage/tab6widget.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 class EntityTreeWidget;
 
diff --git a/kdepim/examples/etm_usage/tab7widget.h b/kdepim/examples/etm_usage/tab7widget.h
index bc00e435..6498cccc 100644
--- a/kdepim/examples/etm_usage/tab7widget.h
+++ b/kdepim/examples/etm_usage/tab7widget.h
@@ -26,7 +26,7 @@
 
 #include <QWidget>
 
-class QModelIndex;
+#include <QModelIndex>
 class KCategorizedView;
 
 class EntityTreeWidget;
diff --git a/kdepim/examples/etm_usage/unreadmailsincollectionswidget.h b/kdepim/examples/etm_usage/unreadmailsincollectionswidget.h
index d478a58d..8c7f7ec5 100644
--- a/kdepim/examples/etm_usage/unreadmailsincollectionswidget.h
+++ b/kdepim/examples/etm_usage/unreadmailsincollectionswidget.h
@@ -27,7 +27,7 @@
 #include <QWidget>
 #include <QSortFilterProxyModel>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 class KCheckableProxyModel;
 
diff --git a/kdepim/examples/etm_usage/unreadmailswidget.h b/kdepim/examples/etm_usage/unreadmailswidget.h
index 63dfa722..834ccb62 100644
--- a/kdepim/examples/etm_usage/unreadmailswidget.h
+++ b/kdepim/examples/etm_usage/unreadmailswidget.h
@@ -29,7 +29,7 @@
 #include <krecursivefilterproxymodel.h>
 
 
-class QTreeView;
+#include <QTreeView>
 class EntityTreeWidget;
 
 class UnreadMailsTree : public KRecursiveFilterProxyModel
diff --git a/kdepim/examples/kabc/kabceditor.h b/kdepim/examples/kabc/kabceditor.h
index 838ff719..7f9a6606 100644
--- a/kdepim/examples/kabc/kabceditor.h
+++ b/kdepim/examples/kabc/kabceditor.h
@@ -24,7 +24,7 @@
 
 #include "kdialog.h"
 
-class QLineEdit;
+#include <QLineEdit>
 
 namespace Akonadi {
   class ContactEditor;
diff --git a/kdepim/examples/mailreader/kmail-plasma/kpapplet.h b/kdepim/examples/mailreader/kmail-plasma/kpapplet.h
index 572e9c03..79aaae97 100644
--- a/kdepim/examples/mailreader/kmail-plasma/kpapplet.h
+++ b/kdepim/examples/mailreader/kmail-plasma/kpapplet.h
@@ -26,7 +26,7 @@
 
 
 
-class QGraphicsProxyWidget;
+#include <QGraphicsProxyWidget>
 
 namespace KP
 {
diff --git a/kdepim/examples/mailreader/mailreaderview.h b/kdepim/examples/mailreader/mailreaderview.h
index 4f74f166..113d0fb6 100644
--- a/kdepim/examples/mailreader/mailreaderview.h
+++ b/kdepim/examples/mailreader/mailreaderview.h
@@ -10,7 +10,7 @@
 
 #include "ui_mailreaderview.h"
 
-class QPainter;
+#include <QPainter>
 class KUrl;
 
 namespace MessageViewer {
diff --git a/kdepim/grantleeeditor/contactthemeeditor/contactpreviewwidget.h b/kdepim/grantleeeditor/contactthemeeditor/contactpreviewwidget.h
index 3f58728a..e0ce1e2e 100644
--- a/kdepim/grantleeeditor/contactthemeeditor/contactpreviewwidget.h
+++ b/kdepim/grantleeeditor/contactthemeeditor/contactpreviewwidget.h
@@ -22,7 +22,7 @@
 
 #include <KABC/Addressee>
 
-class QTabWidget;
+#include <QTabWidget>
 
 namespace Akonadi {
 class ContactViewer;
diff --git a/kdepim/grantleeeditor/contactthemeeditor/editorpage.h b/kdepim/grantleeeditor/contactthemeeditor/editorpage.h
index 0a610d84..de9b5071 100644
--- a/kdepim/grantleeeditor/contactthemeeditor/editorpage.h
+++ b/kdepim/grantleeeditor/contactthemeeditor/editorpage.h
@@ -23,7 +23,7 @@
 
 class ContactTemplateWidget;
 class EditorWidget;
-class QSplitter;
+#include <QSplitter>
 namespace GrantleeThemeEditor {
 class EditorWidget;
 class PreviewWidget;
diff --git a/kdepim/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.h b/kdepim/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.h
index 11d09263..06d927ef 100644
--- a/kdepim/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.h
+++ b/kdepim/grantleeeditor/grantleethemeeditor/grantleeplaintexteditor.h
@@ -21,7 +21,7 @@
 
 #include "pimcommon/texteditor/plaintexteditor/plaintexteditor.h"
 
-class QCompleter;
+#include <QCompleter>
 namespace KPIMTextEdit {
 class HtmlHighlighter;
 }
diff --git a/kdepim/grantleeeditor/grantleethemeeditor/managethemes.h b/kdepim/grantleeeditor/grantleethemeeditor/managethemes.h
index 5dd3458f..6f59623b 100644
--- a/kdepim/grantleeeditor/grantleethemeeditor/managethemes.h
+++ b/kdepim/grantleeeditor/grantleethemeeditor/managethemes.h
@@ -21,7 +21,7 @@
 #include "grantleethemeeditor_export.h"
 #include <KDialog>
 
-class QListWidget;
+#include <QListWidget>
 class KPushButton;
 namespace GrantleeThemeEditor {
 
diff --git a/kdepim/grantleeeditor/headerthemeeditor/editorpage.h b/kdepim/grantleeeditor/headerthemeeditor/editorpage.h
index 0f758232..5b2b98cb 100644
--- a/kdepim/grantleeeditor/headerthemeeditor/editorpage.h
+++ b/kdepim/grantleeeditor/headerthemeeditor/editorpage.h
@@ -24,7 +24,7 @@
 
 class ThemeTemplateWidget;
 class EditorWidget;
-class QSplitter;
+#include <QSplitter>
 namespace GrantleeThemeEditor {
 class EditorWidget;
 class PreviewWidget;
diff --git a/kdepim/grantleetheme/grantleethememanager.h b/kdepim/grantleetheme/grantleethememanager.h
index 32878a0b..359dad9f 100644
--- a/kdepim/grantleetheme/grantleethememanager.h
+++ b/kdepim/grantleetheme/grantleethememanager.h
@@ -22,7 +22,7 @@
 #include "grantleetheme_export.h"
 #include <QObject>
 #include <QMap>
-class QActionGroup;
+#include <QActionGroup>
 class KActionCollection;
 class KToggleAction;
 class KActionMenu;
diff --git a/kdepim/importwizard/evolutionv3/evolutioncalendar.h b/kdepim/importwizard/evolutionv3/evolutioncalendar.h
index 4cf7a5aa..2c496369 100644
--- a/kdepim/importwizard/evolutionv3/evolutioncalendar.h
+++ b/kdepim/importwizard/evolutionv3/evolutioncalendar.h
@@ -20,7 +20,7 @@
 
 #include "abstractcalendar.h"
 
-class QDomElement;
+#include <QDomElement>
 
 class ImportWizard;
 
diff --git a/kdepim/importwizard/evolutionv3/evolutionsettings.h b/kdepim/importwizard/evolutionv3/evolutionsettings.h
index 63627c16..efa96174 100644
--- a/kdepim/importwizard/evolutionv3/evolutionsettings.h
+++ b/kdepim/importwizard/evolutionv3/evolutionsettings.h
@@ -24,7 +24,7 @@
 
 
 class ImportWizard;
-class QDomElement;
+#include <QDomElement>
 
 class EvolutionSettings : public AbstractSettings
 {
diff --git a/kdepim/importwizard/evolutionv3/evolutionutil.h b/kdepim/importwizard/evolutionv3/evolutionutil.h
index 4085683e..e5bc5415 100644
--- a/kdepim/importwizard/evolutionv3/evolutionutil.h
+++ b/kdepim/importwizard/evolutionv3/evolutionutil.h
@@ -18,8 +18,8 @@
 #ifndef EVOLUTIONUTIL_H
 #define EVOLUTIONUTIL_H
 #include <QString>
-class QFile;
-class QDomDocument;
+#include <QFile>
+#include <QDomDocument>
 
 namespace EvolutionUtil {
 bool loadInDomDocument( QFile *file, QDomDocument & doc );
diff --git a/kdepim/importwizard/selectprogrampage.h b/kdepim/importwizard/selectprogrampage.h
index ef134e73..50675e31 100644
--- a/kdepim/importwizard/selectprogrampage.h
+++ b/kdepim/importwizard/selectprogrampage.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 
-class QListWidgetItem;
+#include <QListWidgetItem>
 
 namespace Ui {
 class SelectProgramPage;
diff --git a/kdepim/importwizard/sylpheed/sylpheedaddressbook.h b/kdepim/importwizard/sylpheed/sylpheedaddressbook.h
index 0cc19fde..e8cdeddd 100644
--- a/kdepim/importwizard/sylpheed/sylpheedaddressbook.h
+++ b/kdepim/importwizard/sylpheed/sylpheedaddressbook.h
@@ -21,8 +21,8 @@
 
 #include "abstractaddressbook.h"
 #include <QHash>
-class QDir;
-class QString;
+#include <QDir>
+#include <QString>
 
 
 class ImportWizard;
diff --git a/kdepim/importwizard/sylpheed/sylpheedsettings.h b/kdepim/importwizard/sylpheed/sylpheedsettings.h
index bff7da4f..4748593c 100644
--- a/kdepim/importwizard/sylpheed/sylpheedsettings.h
+++ b/kdepim/importwizard/sylpheed/sylpheedsettings.h
@@ -23,7 +23,7 @@
 
 class ImportWizard;
 class KConfigGroup;
-class QFile;
+#include <QFile>
 
 class SylpheedSettings : public AbstractSettings
 {
diff --git a/kdepim/importwizard/thunderbird/addressbook/MorkParser.h b/kdepim/importwizard/thunderbird/addressbook/MorkParser.h
index 29e7e10e..6e126b20 100644
--- a/kdepim/importwizard/thunderbird/addressbook/MorkParser.h
+++ b/kdepim/importwizard/thunderbird/addressbook/MorkParser.h
@@ -18,7 +18,7 @@
 #include <QMap>
 #include <QByteArray>
 #include <iostream>
-class QString;
+#include <QString>
 // Types
 
 typedef QMap< int, QString > MorkDict;
diff --git a/kdepim/importwizard/trojita/trojitaaddressbook.h b/kdepim/importwizard/trojita/trojitaaddressbook.h
index 999a228f..485b422d 100644
--- a/kdepim/importwizard/trojita/trojitaaddressbook.h
+++ b/kdepim/importwizard/trojita/trojitaaddressbook.h
@@ -21,7 +21,7 @@
 
 #include "abstractaddressbook.h"
 #include <QHash>
-class QSettings;
+#include <QSettings>
 
 
 class ImportWizard;
diff --git a/kdepim/importwizard/trojita/trojitasettings.h b/kdepim/importwizard/trojita/trojitasettings.h
index 1ee89b08..85b32851 100644
--- a/kdepim/importwizard/trojita/trojitasettings.h
+++ b/kdepim/importwizard/trojita/trojitasettings.h
@@ -21,7 +21,7 @@
 #include "abstractsettings.h"
 
 class ImportWizard;
-class QSettings;
+#include <QSettings>
 
 class TrojitaSettings : public AbstractSettings
 {
diff --git a/kdepim/incidenceeditor-ng/alarmpresets.h b/kdepim/incidenceeditor-ng/alarmpresets.h
index b16d52d0..431df5eb 100644
--- a/kdepim/incidenceeditor-ng/alarmpresets.h
+++ b/kdepim/incidenceeditor-ng/alarmpresets.h
@@ -23,7 +23,7 @@
 
 #include <KCalCore/Alarm>
 
-class QStringList;
+#include <QStringList>
 
 namespace IncidenceEditorNG {
 
diff --git a/kdepim/incidenceeditor-ng/attendeeline.h b/kdepim/incidenceeditor-ng/attendeeline.h
index bd7979a3..4b6d1261 100644
--- a/kdepim/incidenceeditor-ng/attendeeline.h
+++ b/kdepim/incidenceeditor-ng/attendeeline.h
@@ -31,7 +31,7 @@
 #include <QCheckBox>
 #include <QToolButton>
 
-class QKeyEvent;
+#include <QKeyEvent>
 
 namespace IncidenceEditorNG {
 
diff --git a/kdepim/incidenceeditor-ng/categoryeditdialog.h b/kdepim/incidenceeditor-ng/categoryeditdialog.h
index 0f928638..c7ae1f18 100644
--- a/kdepim/incidenceeditor-ng/categoryeditdialog.h
+++ b/kdepim/incidenceeditor-ng/categoryeditdialog.h
@@ -25,7 +25,7 @@
 
 #include <KDialog>
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 namespace Ui {
   class CategoryEditDialog_base;
diff --git a/kdepim/incidenceeditor-ng/incidenceattachment.h b/kdepim/incidenceeditor-ng/incidenceattachment.h
index 6c6b16d3..5eadaae7 100644
--- a/kdepim/incidenceeditor-ng/incidenceattachment.h
+++ b/kdepim/incidenceeditor-ng/incidenceattachment.h
@@ -31,8 +31,8 @@ namespace Ui {
 class KAction;
 class KMenu;
 
-class QListWidgetItem;
-class QMimeData;
+#include <QListWidgetItem>
+#include <QMimeData>
 
 namespace IncidenceEditorNG {
 
diff --git a/kdepim/incidenceeditor-ng/visualfreebusywidget.h b/kdepim/incidenceeditor-ng/visualfreebusywidget.h
index 223c3785..8357f5a4 100644
--- a/kdepim/incidenceeditor-ng/visualfreebusywidget.h
+++ b/kdepim/incidenceeditor-ng/visualfreebusywidget.h
@@ -34,7 +34,7 @@ namespace KDGantt {
 
 class KComboBox;
 
-class QTreeView;
+#include <QTreeView>
 
 namespace IncidenceEditorNG {
 
diff --git a/kdepim/kaddressbook/contactselectiondialog.h b/kdepim/kaddressbook/contactselectiondialog.h
index 77e3819e..38b369bb 100644
--- a/kdepim/kaddressbook/contactselectiondialog.h
+++ b/kdepim/kaddressbook/contactselectiondialog.h
@@ -25,7 +25,7 @@
 
 class ContactSelectionWidget;
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 namespace Akonadi
 {
diff --git a/kdepim/kaddressbook/contactselectionwidget.h b/kdepim/kaddressbook/contactselectionwidget.h
index bb4ad570..70ca576f 100644
--- a/kdepim/kaddressbook/contactselectionwidget.h
+++ b/kdepim/kaddressbook/contactselectionwidget.h
@@ -24,10 +24,10 @@
 #include <Akonadi/Item>
 #include <QWidget>
 
-class QCheckBox;
-class QItemSelectionModel;
-class QLabel;
-class QRadioButton;
+#include <QCheckBox>
+#include <QItemSelectionModel>
+#include <QLabel>
+#include <QRadioButton>
 
 namespace Akonadi {
 class Collection;
diff --git a/kdepim/kaddressbook/contactswitcher.h b/kdepim/kaddressbook/contactswitcher.h
index 9979bf93..5190a8a0 100644
--- a/kdepim/kaddressbook/contactswitcher.h
+++ b/kdepim/kaddressbook/contactswitcher.h
@@ -22,9 +22,9 @@
 
 #include <QWidget>
 
-class QAbstractItemView;
-class QLabel;
-class QPushButton;
+#include <QAbstractItemView>
+#include <QLabel>
+#include <QPushButton>
 
 /**
  * @short A widget to switch between the contacts of an contact view.
diff --git a/kdepim/kaddressbook/mainwidget.h b/kdepim/kaddressbook/mainwidget.h
index 99ab8f5b..370a45b5 100644
--- a/kdepim/kaddressbook/mainwidget.h
+++ b/kdepim/kaddressbook/mainwidget.h
@@ -51,14 +51,14 @@ class ContactSwitcher;
 class KActionCollection;
 class KXMLGUIClient;
 class ModelColumnManager;
-class QAbstractItemModel;
-class QItemSelectionModel;
-class QModelIndex;
-class QSplitter;
-class QStackedWidget;
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
+#include <QModelIndex>
+#include <QSplitter>
+#include <QStackedWidget>
 class QuickSearchWidget;
 class XXPortManager;
-class QActionGroup;
+#include <QActionGroup>
 class CategorySelectWidget;
 class CategoryFilterProxyModel;
 
diff --git a/kdepim/kaddressbook/merge/mergecontactduplicatecontactdialog.h b/kdepim/kaddressbook/merge/mergecontactduplicatecontactdialog.h
index ab77e866..4bd8b6f4 100644
--- a/kdepim/kaddressbook/merge/mergecontactduplicatecontactdialog.h
+++ b/kdepim/kaddressbook/merge/mergecontactduplicatecontactdialog.h
@@ -22,8 +22,8 @@
 #include <Akonadi/Item>
 
 #include "kaddressbook_export.h"
-class QStackedWidget;
-class QLabel;
+#include <QStackedWidget>
+#include <QLabel>
 namespace KABMergeContacts {
 class MergeContactShowResultTabWidget;
 class KADDRESSBOOK_EXPORT MergeContactDuplicateContactDialog : public KDialog
diff --git a/kdepim/kaddressbook/merge/mergecontactinfowidget.h b/kdepim/kaddressbook/merge/mergecontactinfowidget.h
index 4e3c575a..acbcca2a 100644
--- a/kdepim/kaddressbook/merge/mergecontactinfowidget.h
+++ b/kdepim/kaddressbook/merge/mergecontactinfowidget.h
@@ -23,12 +23,12 @@
 #include "kaddressbook_export.h"
 
 #include <Akonadi/Item>
-class QLabel;
+#include <QLabel>
 namespace KAddressBookGrantlee {
 class GrantleeContactViewer;
 }
 
-class QStackedWidget;
+#include <QStackedWidget>
 namespace KABMergeContacts {
 class KADDRESSBOOK_EXPORT MergeContactInfoWidget : public QWidget
 {
diff --git a/kdepim/kaddressbook/merge/mergecontactsdialog.h b/kdepim/kaddressbook/merge/mergecontactsdialog.h
index f3049a52..c4461206 100644
--- a/kdepim/kaddressbook/merge/mergecontactsdialog.h
+++ b/kdepim/kaddressbook/merge/mergecontactsdialog.h
@@ -21,7 +21,7 @@
 
 #include <KDialog>
 #include <Akonadi/Item>
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 namespace KABMergeContacts {
 class MergeContactWidget;
 class MergeContactsDialog : public KDialog
diff --git a/kdepim/kaddressbook/merge/mergecontactwidget.h b/kdepim/kaddressbook/merge/mergecontactwidget.h
index f52f9533..fed3e841 100644
--- a/kdepim/kaddressbook/merge/mergecontactwidget.h
+++ b/kdepim/kaddressbook/merge/mergecontactwidget.h
@@ -23,8 +23,8 @@
 #include <Akonadi/Item>
 #include "kaddressbook_export.h"
 
-class QListWidget;
-class QPushButton;
+#include <QListWidget>
+#include <QPushButton>
 namespace Akonadi {
 class CollectionComboBox;
 }
diff --git a/kdepim/kaddressbook/modelcolumnmanager.h b/kdepim/kaddressbook/modelcolumnmanager.h
index 2c8b36c2..218cb49a 100644
--- a/kdepim/kaddressbook/modelcolumnmanager.h
+++ b/kdepim/kaddressbook/modelcolumnmanager.h
@@ -25,7 +25,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 
 /**
  * @short A manager for the contacts model columns.
diff --git a/kdepim/kaddressbook/printing/printingwizard.h b/kdepim/kaddressbook/printing/printingwizard.h
index 0dd390bc..e9d46630 100644
--- a/kdepim/kaddressbook/printing/printingwizard.h
+++ b/kdepim/kaddressbook/printing/printingwizard.h
@@ -35,8 +35,8 @@
 class ContactSelectionWidget;
 class StylePage;
 
-class QItemSelectionModel;
-class QPrinter;
+#include <QItemSelectionModel>
+#include <QPrinter>
 
 namespace Akonadi {
 class Collection;
diff --git a/kdepim/kaddressbook/printing/printprogress.h b/kdepim/kaddressbook/printing/printprogress.h
index 88796da9..83be8109 100644
--- a/kdepim/kaddressbook/printing/printprogress.h
+++ b/kdepim/kaddressbook/printing/printprogress.h
@@ -26,8 +26,8 @@
 
 #include <QWidget>
 
-class QProgressBar;
-class QString;
+#include <QProgressBar>
+#include <QString>
 
 class KTextBrowser;
 
diff --git a/kdepim/kaddressbook/printing/stylepage.h b/kdepim/kaddressbook/printing/stylepage.h
index fd8e79d3..301dbf4c 100644
--- a/kdepim/kaddressbook/printing/stylepage.h
+++ b/kdepim/kaddressbook/printing/stylepage.h
@@ -30,8 +30,8 @@
 #include <QWidget>
 #include "contactfields.h"
 
-class QLabel;
-class QPixmap;
+#include <QLabel>
+#include <QPixmap>
 class KComboBox;
 
 class StylePage : public QWidget
diff --git a/kdepim/kaddressbook/sendmail/mailsenderjob.h b/kdepim/kaddressbook/sendmail/mailsenderjob.h
index eac34bb7..082d9233 100644
--- a/kdepim/kaddressbook/sendmail/mailsenderjob.h
+++ b/kdepim/kaddressbook/sendmail/mailsenderjob.h
@@ -27,7 +27,7 @@
 #include <QObject>
 #include <QStringList>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 class KJob;
 namespace KABMailSender {
 class KADDRESSBOOK_EXPORT MailSenderJob : public QObject
diff --git a/kdepim/kaddressbook/utils.h b/kdepim/kaddressbook/utils.h
index 4e518db8..62631609 100644
--- a/kdepim/kaddressbook/utils.h
+++ b/kdepim/kaddressbook/utils.h
@@ -20,7 +20,7 @@
 #define UTILS_H
 
 #include <Akonadi/Item>
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 namespace Utils {
 Akonadi::Item::List collectSelectedContactsItem(QItemSelectionModel *model);
 Akonadi::Item::List collectSelectedAllContactsItem(QItemSelectionModel *model);
diff --git a/kdepim/kaddressbook/xxport/csv/csv_xxport.h b/kdepim/kaddressbook/xxport/csv/csv_xxport.h
index c9d75b53..9f0e1b60 100644
--- a/kdepim/kaddressbook/xxport/csv/csv_xxport.h
+++ b/kdepim/kaddressbook/xxport/csv/csv_xxport.h
@@ -22,7 +22,7 @@
 
 #include "xxport.h"
 
-class QFile;
+#include <QFile>
 
 class CsvXXPort : public XXPort
 {
diff --git a/kdepim/kaddressbook/xxport/csv/csvimportdialog.h b/kdepim/kaddressbook/xxport/csv/csvimportdialog.h
index d7ff5a1c..61c7351b 100644
--- a/kdepim/kaddressbook/xxport/csv/csvimportdialog.h
+++ b/kdepim/kaddressbook/xxport/csv/csvimportdialog.h
@@ -32,10 +32,10 @@ class KComboBox;
 class KLineEdit;
 class KUrlRequester;
 
-class QButtonGroup;
-class QCheckBox;
+#include <QButtonGroup>
+#include <QCheckBox>
 class QCsvModel;
-class QTableView;
+#include <QTableView>
 
 class CSVImportDialog : public KDialog
 {
diff --git a/kdepim/kaddressbook/xxport/csv/qcsvreader.h b/kdepim/kaddressbook/xxport/csv/qcsvreader.h
index 56c27198..5a7eb057 100644
--- a/kdepim/kaddressbook/xxport/csv/qcsvreader.h
+++ b/kdepim/kaddressbook/xxport/csv/qcsvreader.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QObject>
 
-class QIODevice;
+#include <QIODevice>
 
 /**
  * @short An interface to build data structures from a CSV file.
diff --git a/kdepim/kaddressbook/xxport/csv/templateselectiondialog.h b/kdepim/kaddressbook/xxport/csv/templateselectiondialog.h
index 857bb02c..b04d648d 100644
--- a/kdepim/kaddressbook/xxport/csv/templateselectiondialog.h
+++ b/kdepim/kaddressbook/xxport/csv/templateselectiondialog.h
@@ -22,7 +22,7 @@
 
 #include <KDialog>
 
-class QListView;
+#include <QListView>
 
 class TemplateSelectionDialog : public KDialog
 {
diff --git a/kdepim/kaddressbook/xxport/gmx/gmx_xxport.h b/kdepim/kaddressbook/xxport/gmx/gmx_xxport.h
index 21f8bf3b..5c5711b5 100644
--- a/kdepim/kaddressbook/xxport/gmx/gmx_xxport.h
+++ b/kdepim/kaddressbook/xxport/gmx/gmx_xxport.h
@@ -28,7 +28,7 @@
 
 #include "xxport.h"
 
-class QFile;
+#include <QFile>
 
 class GMXXXPort : public XXPort
 {
diff --git a/kdepim/kaddressbook/xxportmanager.h b/kdepim/kaddressbook/xxportmanager.h
index 72e2da3c..853f1db7 100644
--- a/kdepim/kaddressbook/xxportmanager.h
+++ b/kdepim/kaddressbook/xxportmanager.h
@@ -30,9 +30,9 @@
 class KJob;
 class KProgressDialog;
 
-class QAction;
-class QItemSelectionModel;
-class QSignalMapper;
+#include <QAction>
+#include <QItemSelectionModel>
+#include <QSignalMapper>
 
 /**
  * @short The class that manages import and export of contacts.
diff --git a/kdepim/kalarm/akonadimodel.h b/kdepim/kalarm/akonadimodel.h
index 3a3bfabd..86a8ee07 100644
--- a/kdepim/kalarm/akonadimodel.h
+++ b/kdepim/kalarm/akonadimodel.h
@@ -37,7 +37,7 @@
 namespace Akonadi {
     class AgentInstance;
 }
-class QPixmap;
+#include <QPixmap>
 class KJob;
 
 using namespace KAlarmCal;
diff --git a/kdepim/kalarm/akonadiresourcecreator.h b/kdepim/kalarm/akonadiresourcecreator.h
index 784983b5..2c1f8fe0 100644
--- a/kdepim/kalarm/akonadiresourcecreator.h
+++ b/kdepim/kalarm/akonadiresourcecreator.h
@@ -31,7 +31,7 @@
 
 using namespace KAlarmCal;
 
-class QWidget;
+#include <QWidget>
 class KJob;
 
 class AkonadiResourceCreator : public QObject
diff --git a/kdepim/kalarm/alarmtimewidget.h b/kdepim/kalarm/alarmtimewidget.h
index d908f2d7..cb1534bf 100644
--- a/kdepim/kalarm/alarmtimewidget.h
+++ b/kdepim/kalarm/alarmtimewidget.h
@@ -24,7 +24,7 @@
 #include <kalarmcal/datetime.h>
 #include <QFrame>
 
-class QAbstractButton;
+#include <QAbstractButton>
 class KDateComboBox;
 class KHBox;
 class ButtonGroup;
diff --git a/kdepim/kalarm/birthdaydlg.h b/kdepim/kalarm/birthdaydlg.h
index c9231131..26702b68 100644
--- a/kdepim/kalarm/birthdaydlg.h
+++ b/kdepim/kalarm/birthdaydlg.h
@@ -26,8 +26,8 @@
 #include <klineedit.h>
 #include <QVector>
 
-class QFocusEvent;
-class QTreeView;
+#include <QFocusEvent>
+#include <QTreeView>
 class CheckBox;
 class FontColourButton;
 class SoundPicker;
diff --git a/kdepim/kalarm/collectionmodel.h b/kdepim/kalarm/collectionmodel.h
index 86cdc764..43a8a727 100644
--- a/kdepim/kalarm/collectionmodel.h
+++ b/kdepim/kalarm/collectionmodel.h
@@ -35,7 +35,7 @@
 
 using namespace KAlarmCal;
 
-class QEventLoop;
+#include <QEventLoop>
 namespace Akonadi
 {
     class EntityMimeTypeFilterModel;
diff --git a/kdepim/kalarm/editdlg.h b/kdepim/kalarm/editdlg.h
index fa03adf0..a111d59f 100644
--- a/kdepim/kalarm/editdlg.h
+++ b/kdepim/kalarm/editdlg.h
@@ -31,13 +31,13 @@
 
 #include <kdialog.h>
 
-class QLabel;
-class QShowEvent;
-class QResizeEvent;
-class QAbstractButton;
-class QGroupBox;
-class QFrame;
-class QVBoxLayout;
+#include <QLabel>
+#include <QShowEvent>
+#include <QResizeEvent>
+#include <QAbstractButton>
+#include <QGroupBox>
+#include <QFrame>
+#include <QVBoxLayout>
 class KLineEdit;
 class KTabWidget;
 #ifndef USE_AKONADI
diff --git a/kdepim/kalarm/editdlg_p.h b/kdepim/kalarm/editdlg_p.h
index 23c2312c..5c582eab 100644
--- a/kdepim/kalarm/editdlg_p.h
+++ b/kdepim/kalarm/editdlg_p.h
@@ -24,8 +24,8 @@
 #include <ktextedit.h>
 #include <ktabwidget.h>
 #include <QFrame>
-class QDragEnterEvent;
-class QShowEvent;
+#include <QDragEnterEvent>
+#include <QShowEvent>
 class CheckBox;
 class LineEdit;
 
diff --git a/kdepim/kalarm/editdlgtypes.h b/kdepim/kalarm/editdlgtypes.h
index 1144f96c..aa5f997a 100644
--- a/kdepim/kalarm/editdlgtypes.h
+++ b/kdepim/kalarm/editdlgtypes.h
@@ -33,8 +33,8 @@
 
 #include <kurl.h>
 
-class QAbstractButton;
-class QGroupBox;
+#include <QAbstractButton>
+#include <QGroupBox>
 class KComboBox;
 class KHBox;
 class EmailIdCombo;
diff --git a/kdepim/kalarm/emailidcombo.h b/kdepim/kalarm/emailidcombo.h
index 92c420e5..899ef8e8 100644
--- a/kdepim/kalarm/emailidcombo.h
+++ b/kdepim/kalarm/emailidcombo.h
@@ -24,8 +24,8 @@
 #include "combobox.h"
 #include <kpimidentities/identitycombo.h>
 
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 class EmailIdCombo : public KPIMIdentities::IdentityCombo
diff --git a/kdepim/kalarm/eventlistmodel.h b/kdepim/kalarm/eventlistmodel.h
index 219d2b06..2172636d 100644
--- a/kdepim/kalarm/eventlistmodel.h
+++ b/kdepim/kalarm/eventlistmodel.h
@@ -32,7 +32,7 @@
 #include <QSortFilterProxyModel>
 #include <QSize>
 
-class QPixmap;
+#include <QPixmap>
 namespace KCal { class Event; }
 
 using namespace KAlarmCal;
diff --git a/kdepim/kalarm/find.h b/kdepim/kalarm/find.h
index c52b6662..3532a2cf 100644
--- a/kdepim/kalarm/find.h
+++ b/kdepim/kalarm/find.h
@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QModelIndex>
 
-class QCheckBox;
+#include <QCheckBox>
 class FindDlg;
 class KFind;
 class KSeparator;
diff --git a/kdepim/kalarm/functions.h b/kdepim/kalarm/functions.h
index deadd791..6e5092cf 100644
--- a/kdepim/kalarm/functions.h
+++ b/kdepim/kalarm/functions.h
@@ -43,8 +43,8 @@
 using namespace KAlarmCal;
 
 namespace KCal { class Event; }
-class QWidget;
-class QAction;
+#include <QWidget>
+#include <QAction>
 class KAction;
 class KToggleAction;
 class AlarmResource;
diff --git a/kdepim/kalarm/latecancel.h b/kdepim/kalarm/latecancel.h
index 16214978..8ab8b534 100644
--- a/kdepim/kalarm/latecancel.h
+++ b/kdepim/kalarm/latecancel.h
@@ -26,7 +26,7 @@
 
 #include <QFrame>
 
-class QStackedWidget;
+#include <QStackedWidget>
 class CheckBox;
 
 
diff --git a/kdepim/kalarm/lib/buttongroup.h b/kdepim/kalarm/lib/buttongroup.h
index 6e1f04d3..2122911b 100644
--- a/kdepim/kalarm/lib/buttongroup.h
+++ b/kdepim/kalarm/lib/buttongroup.h
@@ -22,7 +22,7 @@
 
 #include <QButtonGroup>
 #include <QMap>
-class QAbstractButton;
+#include <QAbstractButton>
 
 
 /**
diff --git a/kdepim/kalarm/lib/checkbox.h b/kdepim/kalarm/lib/checkbox.h
index 48b83d22..9d572d9e 100644
--- a/kdepim/kalarm/lib/checkbox.h
+++ b/kdepim/kalarm/lib/checkbox.h
@@ -22,8 +22,8 @@
 #define CHECKBOX_H
 
 #include <QCheckBox>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/combobox.h b/kdepim/kalarm/lib/combobox.h
index a6ec6f12..3516b715 100644
--- a/kdepim/kalarm/lib/combobox.h
+++ b/kdepim/kalarm/lib/combobox.h
@@ -22,8 +22,8 @@
 #define COMBOBOX_H
 
 #include <kcombobox.h>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/filedialog.h b/kdepim/kalarm/lib/filedialog.h
index 98068911..aba56b25 100644
--- a/kdepim/kalarm/lib/filedialog.h
+++ b/kdepim/kalarm/lib/filedialog.h
@@ -22,7 +22,7 @@
 #define FILEDIALOG_H
 
 #include <kfiledialog.h>
-class QCheckBox;
+#include <QCheckBox>
 
 
 class FileDialog : public KFileDialog
diff --git a/kdepim/kalarm/lib/groupbox.h b/kdepim/kalarm/lib/groupbox.h
index 66357fe3..05b9a039 100644
--- a/kdepim/kalarm/lib/groupbox.h
+++ b/kdepim/kalarm/lib/groupbox.h
@@ -22,8 +22,8 @@
 #define GROUPBOX_H
 
 #include <QGroupBox>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/itembox.h b/kdepim/kalarm/lib/itembox.h
index 756490bc..b5ff6535 100644
--- a/kdepim/kalarm/lib/itembox.h
+++ b/kdepim/kalarm/lib/itembox.h
@@ -22,7 +22,7 @@
 #define ITEMBOX_H
 
 #include <khbox.h>
-class QHBoxLayout;
+#include <QHBoxLayout>
 
 
 /**
diff --git a/kdepim/kalarm/lib/label.h b/kdepim/kalarm/lib/label.h
index 171771c8..ae3623dd 100644
--- a/kdepim/kalarm/lib/label.h
+++ b/kdepim/kalarm/lib/label.h
@@ -22,8 +22,8 @@
 #define LABEL_H
 
 #include <QLabel>
-class QFocusEvent;
-class QRadioButton;
+#include <QFocusEvent>
+#include <QRadioButton>
 class LabelFocusWidget;
 
 /**
diff --git a/kdepim/kalarm/lib/lineedit.h b/kdepim/kalarm/lib/lineedit.h
index 4fadecdb..04250cb2 100644
--- a/kdepim/kalarm/lib/lineedit.h
+++ b/kdepim/kalarm/lib/lineedit.h
@@ -22,9 +22,9 @@
 #define LINEEDIT_H
 
 #include <klineedit.h>
-class QDragEnterEvent;
-class QFocusEvent;
-class QDropEvent;
+#include <QDragEnterEvent>
+#include <QFocusEvent>
+#include <QDropEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/pushbutton.h b/kdepim/kalarm/lib/pushbutton.h
index ac5c1527..1776bc2e 100644
--- a/kdepim/kalarm/lib/pushbutton.h
+++ b/kdepim/kalarm/lib/pushbutton.h
@@ -22,8 +22,8 @@
 #define PUSHBUTTON_H
 
 #include <kpushbutton.h>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/radiobutton.h b/kdepim/kalarm/lib/radiobutton.h
index 8c42a769..92ece1d9 100644
--- a/kdepim/kalarm/lib/radiobutton.h
+++ b/kdepim/kalarm/lib/radiobutton.h
@@ -22,8 +22,8 @@
 #define RADIOBUTTON_H
 
 #include <QRadioButton>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/slider.h b/kdepim/kalarm/lib/slider.h
index b33b2bc0..484ee265 100644
--- a/kdepim/kalarm/lib/slider.h
+++ b/kdepim/kalarm/lib/slider.h
@@ -22,8 +22,8 @@
 #define SLIDER_H
 
 #include <QSlider>
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 
 /**
diff --git a/kdepim/kalarm/lib/spinbox.h b/kdepim/kalarm/lib/spinbox.h
index 5aeb10fd..5b5cffa7 100644
--- a/kdepim/kalarm/lib/spinbox.h
+++ b/kdepim/kalarm/lib/spinbox.h
@@ -22,7 +22,7 @@
 #define SPINBOX_H
 
 #include <QSpinBox>
-class QEvent;
+#include <QEvent>
 class QStyleOptionSpinBox;
 
 
diff --git a/kdepim/kalarm/lib/spinbox2.h b/kdepim/kalarm/lib/spinbox2.h
index 3e381b16..3737ec8f 100644
--- a/kdepim/kalarm/lib/spinbox2.h
+++ b/kdepim/kalarm/lib/spinbox2.h
@@ -24,8 +24,8 @@
 #include "spinbox.h"
 
 #include <QFrame>
-class QShowEvent;
-class QResizeEvent;
+#include <QShowEvent>
+#include <QResizeEvent>
 class SpinMirror;
 class ExtraSpinBox;
 
diff --git a/kdepim/kalarm/lib/spinbox2_p.h b/kdepim/kalarm/lib/spinbox2_p.h
index 2dd6a497..fa6ecd3a 100644
--- a/kdepim/kalarm/lib/spinbox2_p.h
+++ b/kdepim/kalarm/lib/spinbox2_p.h
@@ -25,8 +25,8 @@
 
 #include <QGraphicsView>
 
-class QMouseEvent;
-class QPaintEvent;
+#include <QMouseEvent>
+#include <QPaintEvent>
 
 
 /*=============================================================================
diff --git a/kdepim/kalarm/lib/synchtimer.h b/kdepim/kalarm/lib/synchtimer.h
index 92ff1fb9..2cc22e5e 100644
--- a/kdepim/kalarm/lib/synchtimer.h
+++ b/kdepim/kalarm/lib/synchtimer.h
@@ -27,7 +27,7 @@
 #include <QList>
 #include <QByteArray>
 #include <QDateTime>
-class QTimer;
+#include <QTimer>
 
 /** SynchTimer is a virtual base class for application-wide timers synchronized
  *  to a time boundary.
diff --git a/kdepim/kalarm/lib/timeperiod.h b/kdepim/kalarm/lib/timeperiod.h
index 5352627c..97aa2556 100644
--- a/kdepim/kalarm/lib/timeperiod.h
+++ b/kdepim/kalarm/lib/timeperiod.h
@@ -29,7 +29,7 @@
 #include <khbox.h>
 #include <QString>
 
-class QStackedWidget;
+#include <QStackedWidget>
 class ComboBox;
 class SpinBox;
 class TimeSpinBox;
diff --git a/kdepim/kalarm/mainwindow.h b/kdepim/kalarm/mainwindow.h
index bf3f1e31..534cced6 100644
--- a/kdepim/kalarm/mainwindow.h
+++ b/kdepim/kalarm/mainwindow.h
@@ -42,14 +42,14 @@
 #include <QList>
 #include <QMap>
 
-class QDragEnterEvent;
-class QHideEvent;
-class QShowEvent;
-class QResizeEvent;
-class QDropEvent;
-class QCloseEvent;
-class QSplitter;
-class QMenu;
+#include <QDragEnterEvent>
+#include <QHideEvent>
+#include <QShowEvent>
+#include <QResizeEvent>
+#include <QDropEvent>
+#include <QCloseEvent>
+#include <QSplitter>
+#include <QMenu>
 class KAction;
 class KToggleAction;
 class KToolBarPopupAction;
diff --git a/kdepim/kalarm/mainwindowbase.h b/kdepim/kalarm/mainwindowbase.h
index 4c7ad88a..dd3f534f 100644
--- a/kdepim/kalarm/mainwindowbase.h
+++ b/kdepim/kalarm/mainwindowbase.h
@@ -23,7 +23,7 @@
 
 #include <kxmlguiwindow.h>
 
-class QCloseEvent;
+#include <QCloseEvent>
 
 
 /**
diff --git a/kdepim/kalarm/messagewin.h b/kdepim/kalarm/messagewin.h
index 9d7d15c0..c96507ad 100644
--- a/kdepim/kalarm/messagewin.h
+++ b/kdepim/kalarm/messagewin.h
@@ -40,14 +40,14 @@
 #include <QMap>
 #include <QPointer>
 
-class QShowEvent;
-class QMoveEvent;
-class QResizeEvent;
-class QCloseEvent;
+#include <QShowEvent>
+#include <QMoveEvent>
+#include <QResizeEvent>
+#include <QCloseEvent>
 class PushButton;
 class MessageText;
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 class DeferAlarmDlg;
 class EditAlarmDlg;
 class ShellProcess;
diff --git a/kdepim/kalarm/pickfileradio.h b/kdepim/kalarm/pickfileradio.h
index 62f09842..06e6921c 100644
--- a/kdepim/kalarm/pickfileradio.h
+++ b/kdepim/kalarm/pickfileradio.h
@@ -25,7 +25,7 @@
 
 #include "radiobutton.h"
 
-class QPushButton;
+#include <QPushButton>
 class ButtonGroup;
 class LineEdit;
 
diff --git a/kdepim/kalarm/prefdlg_p.h b/kdepim/kalarm/prefdlg_p.h
index dfd442b6..35e00cd3 100644
--- a/kdepim/kalarm/prefdlg_p.h
+++ b/kdepim/kalarm/prefdlg_p.h
@@ -25,13 +25,13 @@
 #include "prefdlg.h"
 #include "stackedwidgets.h"
 
-class QCheckBox;
-class QGroupBox;
-class QAbstractButton;
-class QRadioButton;
-class QPushButton;
-class QLabel;
-class QSpinBox;
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QAbstractButton>
+#include <QRadioButton>
+#include <QPushButton>
+#include <QLabel>
+#include <QSpinBox>
 class KTimeZone;
 class KLineEdit;
 class KVBox;
diff --git a/kdepim/kalarm/recurrenceedit.h b/kdepim/kalarm/recurrenceedit.h
index 21aa0df5..04f94f8f 100644
--- a/kdepim/kalarm/recurrenceedit.h
+++ b/kdepim/kalarm/recurrenceedit.h
@@ -31,14 +31,14 @@
 #include <QFrame>
 
 class KDateComboBox;
-class QDate;
-class QShowEvent;
-class QStackedWidget;
-class QGroupBox;
-class QLabel;
-class QListWidget;
-class QAbstractButton;
-class QPushButton;
+#include <QDate>
+#include <QShowEvent>
+#include <QStackedWidget>
+#include <QGroupBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QAbstractButton>
+#include <QPushButton>
 class SpinBox;
 class CheckBox;
 class RadioButton;
diff --git a/kdepim/kalarm/recurrenceedit_p.h b/kdepim/kalarm/recurrenceedit_p.h
index bc516b1c..ab7a6ee0 100644
--- a/kdepim/kalarm/recurrenceedit_p.h
+++ b/kdepim/kalarm/recurrenceedit_p.h
@@ -31,15 +31,15 @@
 #include <QBitArray>
 #include <QAbstractButton>
 
-class QLabel;
-class QWidget;
-class QVBoxLayout;
+#include <QLabel>
+#include <QWidget>
+#include <QVBoxLayout>
 class ButtonGroup;
 class ComboBox;
 class CheckBox;
 class SpinBox;
 class TimeSpinBox;
-class QString;
+#include <QString>
 
 using namespace KAlarmCal;
 
diff --git a/kdepim/kalarm/repetitionbutton.h b/kdepim/kalarm/repetitionbutton.h
index 25e426dc..c644e25a 100644
--- a/kdepim/kalarm/repetitionbutton.h
+++ b/kdepim/kalarm/repetitionbutton.h
@@ -28,7 +28,7 @@
 
 using namespace KAlarmCal;
 
-class QGroupBox;
+#include <QGroupBox>
 class ButtonGroup;
 class RadioButton;
 class SpinBox;
diff --git a/kdepim/kalarm/resourceconfigdialog.h b/kdepim/kalarm/resourceconfigdialog.h
index 42b641f2..dec6de3c 100644
--- a/kdepim/kalarm/resourceconfigdialog.h
+++ b/kdepim/kalarm/resourceconfigdialog.h
@@ -27,7 +27,7 @@
 #include <kdialog.h>
 
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 
 namespace KRES {
     class ConfigWidget;
diff --git a/kdepim/kalarm/resourceselector.h b/kdepim/kalarm/resourceselector.h
index e4fb0963..4757d2c2 100644
--- a/kdepim/kalarm/resourceselector.h
+++ b/kdepim/kalarm/resourceselector.h
@@ -43,8 +43,8 @@
 
 using namespace KAlarmCal;
 
-class QPushButton;
-class QResizeEvent;
+#include <QPushButton>
+#include <QResizeEvent>
 class KAction;
 class KActionCollection;
 class KToggleAction;
diff --git a/kdepim/kalarm/sounddlg.h b/kdepim/kalarm/sounddlg.h
index d8a87977..b679704b 100644
--- a/kdepim/kalarm/sounddlg.h
+++ b/kdepim/kalarm/sounddlg.h
@@ -25,9 +25,9 @@
 #include <kdialog.h>
 #include <QString>
 
-class QPushButton;
-class QShowEvent;
-class QResizeEvent;
+#include <QPushButton>
+#include <QShowEvent>
+#include <QResizeEvent>
 class KHBox;
 namespace Phonon { class MediaObject; }
 class GroupBox;
diff --git a/kdepim/kalarm/specialactions.h b/kdepim/kalarm/specialactions.h
index f86a8e42..fcd5ee7b 100644
--- a/kdepim/kalarm/specialactions.h
+++ b/kdepim/kalarm/specialactions.h
@@ -28,7 +28,7 @@
 
 using namespace KAlarmCal;
 
-class QResizeEvent;
+#include <QResizeEvent>
 class KLineEdit;
 class CheckBox;
 
diff --git a/kdepim/kalarm/templatedlg.h b/kdepim/kalarm/templatedlg.h
index 629367fa..0286f9a9 100644
--- a/kdepim/kalarm/templatedlg.h
+++ b/kdepim/kalarm/templatedlg.h
@@ -23,8 +23,8 @@
 #include "editdlg.h"
 #include <kdialog.h>
 
-class QResizeEvent;
-class QPushButton;
+#include <QResizeEvent>
+#include <QPushButton>
 class NewAlarmAction;
 #ifdef USE_AKONADI
 class TemplateListModel;
diff --git a/kdepim/kalarm/templatemenuaction.h b/kdepim/kalarm/templatemenuaction.h
index 16e88378..14896495 100644
--- a/kdepim/kalarm/templatemenuaction.h
+++ b/kdepim/kalarm/templatemenuaction.h
@@ -23,7 +23,7 @@
 
 #include <kactionmenu.h>
 #include <QMap>
-class QAction;
+#include <QAction>
 namespace KAlarmCal { class KAEvent; }
 
 class TemplateMenuAction : public KActionMenu
diff --git a/kdepim/kalarm/templatepickdlg.h b/kdepim/kalarm/templatepickdlg.h
index 13e7eb52..083f9672 100644
--- a/kdepim/kalarm/templatepickdlg.h
+++ b/kdepim/kalarm/templatepickdlg.h
@@ -24,7 +24,7 @@
 
 #include <kdialog.h>
 
-class QResizeEvent;
+#include <QResizeEvent>
 namespace KCal { class Event; }
 #ifdef USE_AKONADI
 class TemplateListModel;
diff --git a/kdepim/kalarm/traywindow.h b/kdepim/kalarm/traywindow.h
index 4b42da83..0b2fdba0 100644
--- a/kdepim/kalarm/traywindow.h
+++ b/kdepim/kalarm/traywindow.h
@@ -28,7 +28,7 @@
 #include <kstatusnotifieritem.h>
 #include <QIcon>
 
-class QTimer;
+#include <QTimer>
 class KToggleAction;
 class MainWindow;
 class NewAlarmAction;
diff --git a/kdepim/kalarm/wakedlg.h b/kdepim/kalarm/wakedlg.h
index 4e7602d2..d0f06d0e 100644
--- a/kdepim/kalarm/wakedlg.h
+++ b/kdepim/kalarm/wakedlg.h
@@ -23,7 +23,7 @@
 
 #include <kdialog.h>
 
-class QTimer;
+#include <QTimer>
 class MainWindow;
 class Ui_WakeFromSuspendDlgWidget;
 
diff --git a/kdepim/kdgantt2/kdganttabstractgrid.h b/kdepim/kdgantt2/kdganttabstractgrid.h
index f064661b..d6ce8c30 100644
--- a/kdepim/kdgantt2/kdganttabstractgrid.h
+++ b/kdepim/kdgantt2/kdganttabstractgrid.h
@@ -28,10 +28,10 @@
 #include "kdganttglobal.h"
 #include "kdganttconstraint.h"
 
-class QPainter;
-class QRectF;
-class QAbstractItemModel;
-class QModelIndex;
+#include <QPainter>
+#include <QRectF>
+#include <QAbstractItemModel>
+#include <QModelIndex>
 
 namespace KDGantt {
     class AbstractRowController;
diff --git a/kdepim/kdgantt2/kdganttabstractrowcontroller.h b/kdepim/kdgantt2/kdganttabstractrowcontroller.h
index a7ee2046..f97c6776 100644
--- a/kdepim/kdgantt2/kdganttabstractrowcontroller.h
+++ b/kdepim/kdgantt2/kdganttabstractrowcontroller.h
@@ -28,7 +28,7 @@
 #include <QPair>
 #include "kdganttglobal.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace KDGantt {
     class KDGANTT_EXPORT AbstractRowController {
diff --git a/kdepim/kdgantt2/kdganttconstraintproxy.h b/kdepim/kdgantt2/kdganttconstraintproxy.h
index 0ac6631a..5cb5d824 100644
--- a/kdepim/kdgantt2/kdganttconstraintproxy.h
+++ b/kdepim/kdgantt2/kdganttconstraintproxy.h
@@ -29,7 +29,7 @@
 
 #include <QPointer>
 
-class QAbstractProxyModel;
+#include <QAbstractProxyModel>
 
 namespace KDGantt {
     class Constraint;
diff --git a/kdepim/kdgantt2/kdganttgraphicsitem.h b/kdepim/kdgantt2/kdganttgraphicsitem.h
index fae98488..b59943da 100644
--- a/kdepim/kdgantt2/kdganttgraphicsitem.h
+++ b/kdepim/kdgantt2/kdganttgraphicsitem.h
@@ -32,7 +32,7 @@
 #include <QDateTime>
 #include <QPersistentModelIndex>
 
-class QGraphicsLineItem;
+#include <QGraphicsLineItem>
 
 namespace KDGantt {
     class GraphicsScene;
diff --git a/kdepim/kdgantt2/kdganttgraphicsscene.h b/kdepim/kdgantt2/kdganttgraphicsscene.h
index 08a0878a..d128aeeb 100644
--- a/kdepim/kdgantt2/kdganttgraphicsscene.h
+++ b/kdepim/kdgantt2/kdganttgraphicsscene.h
@@ -32,9 +32,9 @@
 
 #include "kdganttglobal.h"
 
-class QAbstractProxyModel;
-class QItemSelectionModel;
-class QPrinter;
+#include <QAbstractProxyModel>
+#include <QItemSelectionModel>
+#include <QPrinter>
 
 namespace KDGantt {
     class AbstractGrid;
diff --git a/kdepim/kdgantt2/kdganttgraphicsview.h b/kdepim/kdgantt2/kdganttgraphicsview.h
index f9b7c7e1..da0f6b14 100644
--- a/kdepim/kdgantt2/kdganttgraphicsview.h
+++ b/kdepim/kdgantt2/kdganttgraphicsview.h
@@ -29,10 +29,10 @@
 
 #include "kdganttglobal.h"
 
-class QModelIndex;
-class QAbstractItemModel;
-class QAbstractProxyModel;
-class QItemSelectionModel;
+#include <QModelIndex>
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+#include <QItemSelectionModel>
 
 namespace KDGantt {
     class AbstractRowController;
diff --git a/kdepim/kdgantt2/kdganttlistviewrowcontroller.h b/kdepim/kdgantt2/kdganttlistviewrowcontroller.h
index da9f2f8d..e129d162 100644
--- a/kdepim/kdgantt2/kdganttlistviewrowcontroller.h
+++ b/kdepim/kdgantt2/kdganttlistviewrowcontroller.h
@@ -27,8 +27,8 @@
 
 #include "kdganttabstractrowcontroller.h"
 
-class QAbstractProxyModel;
-class QListView;
+#include <QAbstractProxyModel>
+#include <QListView>
 
 namespace KDGantt {
     class KDGANTT_EXPORT ListViewRowController : public AbstractRowController {
diff --git a/kdepim/kdgantt2/kdgantttreeviewrowcontroller.h b/kdepim/kdgantt2/kdgantttreeviewrowcontroller.h
index 6cf367a6..4b28b150 100644
--- a/kdepim/kdgantt2/kdgantttreeviewrowcontroller.h
+++ b/kdepim/kdgantt2/kdgantttreeviewrowcontroller.h
@@ -27,8 +27,8 @@
 
 #include "kdganttabstractrowcontroller.h"
 
-class QAbstractProxyModel;
-class QTreeView;
+#include <QAbstractProxyModel>
+#include <QTreeView>
 
 namespace KDGantt {
     class KDGANTT_EXPORT TreeViewRowController :  public AbstractRowController {
diff --git a/kdepim/kdgantt2/kdgantttreeviewrowcontroller_p.h b/kdepim/kdgantt2/kdgantttreeviewrowcontroller_p.h
index 0b52a5dc..8611c4bc 100644
--- a/kdepim/kdgantt2/kdgantttreeviewrowcontroller_p.h
+++ b/kdepim/kdgantt2/kdgantttreeviewrowcontroller_p.h
@@ -29,7 +29,7 @@
 
 #include <QTreeView>
 
-class QAbstractProxyModel;
+#include <QAbstractProxyModel>
 
 namespace KDGantt {
     class TreeViewRowController::Private {
diff --git a/kdepim/kdgantt2/kdganttview.h b/kdepim/kdgantt2/kdganttview.h
index 281fb3da..1ef5967e 100644
--- a/kdepim/kdgantt2/kdganttview.h
+++ b/kdepim/kdgantt2/kdganttview.h
@@ -28,13 +28,13 @@
 #include <QWidget>
 #include "kdganttglobal.h"
 
-class QAbstractItemModel;
-class QAbstractProxyModel;
-class QAbstractItemView;
-class QModelIndex;
-class QItemSelectionModel;
-class QPrinter;
-class QSplitter;
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+#include <QAbstractItemView>
+#include <QModelIndex>
+#include <QItemSelectionModel>
+#include <QPrinter>
+#include <QSplitter>
 
 namespace KDGantt {
     class ItemDelegate;
diff --git a/kdepim/kdgantt2/kdganttview_p.h b/kdepim/kdgantt2/kdganttview_p.h
index 9852facd..0e8a44b8 100644
--- a/kdepim/kdgantt2/kdganttview_p.h
+++ b/kdepim/kdgantt2/kdganttview_p.h
@@ -41,10 +41,10 @@
 #include <QGraphicsView>
 #include <QPointer>
 
-class QAbstractProxyModel;
-class QGraphicsView;
-class QGraphicsScene;
-class QGraphicsRectItem;
+#include <QAbstractProxyModel>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsRectItem>
 
 namespace KDGantt {
     class GraphicsItem;
diff --git a/kdepim/kjots/kjotsbrowser.h b/kdepim/kjots/kjotsbrowser.h
index 74f09f10..a4c23035 100644
--- a/kdepim/kjots/kjotsbrowser.h
+++ b/kdepim/kjots/kjotsbrowser.h
@@ -25,7 +25,7 @@
 #define KJOTSBROWSER_H
 
 #include <QTextBrowser>
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 class KJotsBrowser : public QTextBrowser
 {
diff --git a/kdepim/kjots/kjotsedit.h b/kdepim/kjots/kjotsedit.h
index d75b9c75..4bf112a3 100644
--- a/kdepim/kjots/kjotsedit.h
+++ b/kdepim/kjots/kjotsedit.h
@@ -27,8 +27,8 @@
 
 #include <KRichTextWidget>
 
-class QItemSelection;
-class QItemSelectionModel;
+#include <QItemSelection>
+#include <QItemSelectionModel>
 
 class KActionCollection;
 
diff --git a/kdepim/kjots/kjotslinkdialog.h b/kdepim/kjots/kjotslinkdialog.h
index a52958d8..02bcacae 100644
--- a/kdepim/kjots/kjotslinkdialog.h
+++ b/kdepim/kjots/kjotslinkdialog.h
@@ -23,11 +23,11 @@
 
 #include <KDialog>
 
-class QLabel;
-class QAbstractItemModel;
-class QString;
-class QRadioButton;
-class QTreeView;
+#include <QLabel>
+#include <QAbstractItemModel>
+#include <QString>
+#include <QRadioButton>
+#include <QTreeView>
 
 class KComboBox;
 class KLineEdit;
diff --git a/kdepim/kjots/kjotsmodel.h b/kdepim/kjots/kjotsmodel.h
index fede471b..c8d58bf1 100644
--- a/kdepim/kjots/kjotsmodel.h
+++ b/kdepim/kjots/kjotsmodel.h
@@ -24,7 +24,7 @@
 
 #include <akonadi/entitytreemodel.h>
 
-class QTextDocument;
+#include <QTextDocument>
 
 namespace Akonadi
 {
diff --git a/kdepim/kjots/kjotspart.h b/kdepim/kjots/kjotspart.h
index 0c3ec376..948185f9 100644
--- a/kdepim/kjots/kjotspart.h
+++ b/kdepim/kjots/kjotspart.h
@@ -28,7 +28,7 @@
 #include <kparts/part.h>
 #include <kparts/statusbarextension.h>
 
-class QWidget;
+#include <QWidget>
 class KAboutData;
 class KJotsWidget;
 
diff --git a/kdepim/kjots/kjotsreplacenextdialog.h b/kdepim/kjots/kjotsreplacenextdialog.h
index b97bc525..3c02b0a4 100644
--- a/kdepim/kjots/kjotsreplacenextdialog.h
+++ b/kdepim/kjots/kjotsreplacenextdialog.h
@@ -24,8 +24,8 @@
 
 #include <KDialog>
 
-class QString;
-class QLabel;
+#include <QString>
+#include <QLabel>
 
 // Mostly stolen from kdelibs/kdeui/findreplace/kreplace.cpp
 class KJotsReplaceNextDialog : public KDialog
diff --git a/kdepim/kjots/kjotswidget.h b/kdepim/kjots/kjotswidget.h
index 3f09022f..ed771849 100644
--- a/kdepim/kjots/kjotswidget.h
+++ b/kdepim/kjots/kjotswidget.h
@@ -33,12 +33,12 @@
 
 #include <grantlee/templateloader.h>
 
-class QCheckBox;
-class QTextEdit;
-class QTextCharFormat;
-class QSplitter;
-class QStackedWidget;
-class QModelIndex;
+#include <QCheckBox>
+#include <QTextEdit>
+#include <QTextCharFormat>
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QModelIndex>
 
 class KActionMenu;
 class KFindDialog;
diff --git a/kdepim/kjots/knowitimporter.h b/kdepim/kjots/knowitimporter.h
index c0e9a194..1b609e06 100644
--- a/kdepim/kjots/knowitimporter.h
+++ b/kdepim/kjots/knowitimporter.h
@@ -22,7 +22,7 @@
 #ifndef KNOWITIMPORTER_H
 #define KNOWITIMPORTER_H
 
-class QDomElement;
+#include <QDomElement>
 
 #include <QHash>
 #include <QDomDocument>
diff --git a/kdepim/kjots/plasmoid/akonotes_noteapplet.h b/kdepim/kjots/plasmoid/akonotes_noteapplet.h
index d6262e2f..9419aceb 100644
--- a/kdepim/kjots/plasmoid/akonotes_noteapplet.h
+++ b/kdepim/kjots/plasmoid/akonotes_noteapplet.h
@@ -25,7 +25,7 @@
 #include <akonadi/collection.h>
 #include <akonadi/item.h>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class KJob;
 
diff --git a/kdepim/kjots/plasmoid/akonotes_noteslistapplet.h b/kdepim/kjots/plasmoid/akonotes_noteslistapplet.h
index 4f34558a..c2ae5030 100644
--- a/kdepim/kjots/plasmoid/akonotes_noteslistapplet.h
+++ b/kdepim/kjots/plasmoid/akonotes_noteslistapplet.h
@@ -26,7 +26,7 @@
 
 #include <akonadi/collection.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 
 namespace Akonadi
diff --git a/kdepim/kjots/plasmoid/plasmatreeview.h b/kdepim/kjots/plasmoid/plasmatreeview.h
index b62733c6..57eee14d 100644
--- a/kdepim/kjots/plasmoid/plasmatreeview.h
+++ b/kdepim/kjots/plasmoid/plasmatreeview.h
@@ -23,7 +23,7 @@
 
 #include <QGraphicsProxyWidget>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi
 {
diff --git a/kdepim/kleopatra/commands/checksumcreatefilescommand.h b/kdepim/kleopatra/commands/checksumcreatefilescommand.h
index 679c7ed1..52779ece 100644
--- a/kdepim/kleopatra/commands/checksumcreatefilescommand.h
+++ b/kdepim/kleopatra/commands/checksumcreatefilescommand.h
@@ -39,7 +39,7 @@
 
 #include <gpgme++/global.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/commands/checksumverifyfilescommand.h b/kdepim/kleopatra/commands/checksumverifyfilescommand.h
index 2605fe0a..323c2f65 100644
--- a/kdepim/kleopatra/commands/checksumverifyfilescommand.h
+++ b/kdepim/kleopatra/commands/checksumverifyfilescommand.h
@@ -39,7 +39,7 @@
 
 #include <gpgme++/global.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/commands/command.h b/kdepim/kleopatra/commands/command.h
index fb6fbb6d..1d4b35af 100644
--- a/kdepim/kleopatra/commands/command.h
+++ b/kdepim/kleopatra/commands/command.h
@@ -42,9 +42,9 @@
 
 #include <vector>
 
-class QModelIndex;
-template <typename T> class QList;
-class QAbstractItemView;
+#include <QModelIndex>
+#include <QList>
+#include <QAbstractItemView>
 
 namespace GpgME {
     class Key;
diff --git a/kdepim/kleopatra/commands/decryptverifyfilescommand.h b/kdepim/kleopatra/commands/decryptverifyfilescommand.h
index 0ae99d2c..2386f24d 100644
--- a/kdepim/kleopatra/commands/decryptverifyfilescommand.h
+++ b/kdepim/kleopatra/commands/decryptverifyfilescommand.h
@@ -37,7 +37,7 @@
 
 #include <utils/types.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/commands/gnupgprocesscommand.h b/kdepim/kleopatra/commands/gnupgprocesscommand.h
index 4a3f4eb4..d4f4cdaa 100644
--- a/kdepim/kleopatra/commands/gnupgprocesscommand.h
+++ b/kdepim/kleopatra/commands/gnupgprocesscommand.h
@@ -35,8 +35,8 @@
 
 #include <commands/command.h>
 
-class QStringList;
-class QString;
+#include <QStringList>
+#include <QString>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.h b/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.h
index 5ebfdb13..3b31c4ea 100644
--- a/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.h
+++ b/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.h
@@ -37,7 +37,7 @@
 
 #ifndef QT_NO_CLIPBOARD
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/commands/importcertificatefromfilecommand.h b/kdepim/kleopatra/commands/importcertificatefromfilecommand.h
index 06249d3a..a4e05d39 100644
--- a/kdepim/kleopatra/commands/importcertificatefromfilecommand.h
+++ b/kdepim/kleopatra/commands/importcertificatefromfilecommand.h
@@ -35,7 +35,7 @@
 
 #include "importcertificatescommand.h"
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/commands/importcertificatescommand.h b/kdepim/kleopatra/commands/importcertificatescommand.h
index 201b763a..2125d130 100644
--- a/kdepim/kleopatra/commands/importcertificatescommand.h
+++ b/kdepim/kleopatra/commands/importcertificatescommand.h
@@ -35,7 +35,7 @@
 
 #include "command.h"
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/commands/importcertificatescommand_p.h b/kdepim/kleopatra/commands/importcertificatescommand_p.h
index e6a4d7a3..f76b4dd8 100644
--- a/kdepim/kleopatra/commands/importcertificatescommand_p.h
+++ b/kdepim/kleopatra/commands/importcertificatescommand_p.h
@@ -50,7 +50,7 @@ namespace Kleo {
     class AbstractImportJob;
 }
 
-class QByteArray;
+#include <QByteArray>
 
 class Kleo::ImportCertificatesCommand::Private : public Command::Private {
     friend class ::Kleo::ImportCertificatesCommand;
diff --git a/kdepim/kleopatra/commands/importcrlcommand.h b/kdepim/kleopatra/commands/importcrlcommand.h
index 984e708a..9720eca7 100644
--- a/kdepim/kleopatra/commands/importcrlcommand.h
+++ b/kdepim/kleopatra/commands/importcrlcommand.h
@@ -35,7 +35,7 @@
 
 #include <commands/command.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/commands/signencryptfilescommand.h b/kdepim/kleopatra/commands/signencryptfilescommand.h
index 10f25a85..82167832 100644
--- a/kdepim/kleopatra/commands/signencryptfilescommand.h
+++ b/kdepim/kleopatra/commands/signencryptfilescommand.h
@@ -39,7 +39,7 @@
 
 #include <gpgme++/global.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Commands {
diff --git a/kdepim/kleopatra/conf/dirservconfigpage.h b/kdepim/kleopatra/conf/dirservconfigpage.h
index 5418f2c2..2c48bf08 100644
--- a/kdepim/kleopatra/conf/dirservconfigpage.h
+++ b/kdepim/kleopatra/conf/dirservconfigpage.h
@@ -37,9 +37,9 @@
 
 #include "libkleo/kleo/cryptoconfig.h"
 
-class QCheckBox;
-class QLabel;
-class QTimeEdit;
+#include <QCheckBox>
+#include <QLabel>
+#include <QTimeEdit>
 class KIntNumInput;
 namespace Kleo {
   class CryptoConfig;
diff --git a/kdepim/kleopatra/crlview.h b/kdepim/kleopatra/crlview.h
index 61c35901..d26fbdd5 100644
--- a/kdepim/kleopatra/crlview.h
+++ b/kdepim/kleopatra/crlview.h
@@ -37,11 +37,11 @@
 #include <QString>
 #include <QProcess>
 
-class QTextEdit;
-class QPushButton;
+#include <QTextEdit>
+#include <QPushButton>
 class KProcess;
-class QTimer;
-class QCloseEvent;
+#include <QTimer>
+#include <QCloseEvent>
 
 class CRLView : public QDialog {
   Q_OBJECT
diff --git a/kdepim/kleopatra/crypto/controller.h b/kdepim/kleopatra/crypto/controller.h
index 12fa73fb..72251325 100644
--- a/kdepim/kleopatra/crypto/controller.h
+++ b/kdepim/kleopatra/crypto/controller.h
@@ -42,7 +42,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QDialog;
+#include <QDialog>
 
 namespace Kleo {
 namespace Crypto {
diff --git a/kdepim/kleopatra/crypto/decryptverifyemailcontroller.h b/kdepim/kleopatra/crypto/decryptverifyemailcontroller.h
index 747188cb..57aff2b2 100644
--- a/kdepim/kleopatra/crypto/decryptverifyemailcontroller.h
+++ b/kdepim/kleopatra/crypto/decryptverifyemailcontroller.h
@@ -45,7 +45,7 @@
 
 #include <vector>
 
-class QFile;
+#include <QFile>
 
 namespace KMime {
 namespace Types {
diff --git a/kdepim/kleopatra/crypto/decryptverifyfilescontroller.h b/kdepim/kleopatra/crypto/decryptverifyfilescontroller.h
index d02768fc..e8b78186 100644
--- a/kdepim/kleopatra/crypto/decryptverifyfilescontroller.h
+++ b/kdepim/kleopatra/crypto/decryptverifyfilescontroller.h
@@ -43,7 +43,7 @@
 
 #include <vector>
 
-class QFile;
+#include <QFile>
 
 namespace GpgME {
     class VerificationResult;
diff --git a/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.h b/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.h
index bf29fdaf..1f7c004d 100644
--- a/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.h
+++ b/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.h
@@ -42,9 +42,9 @@
 
 #include <vector>
 
-class QFileInfo;
-class QStringList;
-template <typename T> class QList;
+#include <QFileInfo>
+#include <QStringList>
+#include <QList>
 
 namespace boost {
     template <typename T> class shared_ptr;
diff --git a/kdepim/kleopatra/crypto/gui/objectspage.h b/kdepim/kleopatra/crypto/gui/objectspage.h
index a9c224df..f0a7098a 100644
--- a/kdepim/kleopatra/crypto/gui/objectspage.h
+++ b/kdepim/kleopatra/crypto/gui/objectspage.h
@@ -37,7 +37,7 @@
     
 #include <utils/pimpl_ptr.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 namespace Crypto {
diff --git a/kdepim/kleopatra/crypto/gui/resolverecipientspage_p.h b/kdepim/kleopatra/crypto/gui/resolverecipientspage_p.h
index 6fa38dff..f4a8f5ea 100644
--- a/kdepim/kleopatra/crypto/gui/resolverecipientspage_p.h
+++ b/kdepim/kleopatra/crypto/gui/resolverecipientspage_p.h
@@ -39,13 +39,13 @@
 
 #include <QHash>
 
-class QComboBox;
-class QLabel;
-class QListWidget;
-class QListWidgetItem;
-class QPushButton;
-class QStringList;
-class QToolButton;
+#include <QComboBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QStringList>
+#include <QToolButton>
 
 class Kleo::Crypto::Gui::ResolveRecipientsPage::ListWidget : public QWidget {
     Q_OBJECT
diff --git a/kdepim/kleopatra/crypto/gui/resultitemwidget.h b/kdepim/kleopatra/crypto/gui/resultitemwidget.h
index bf5c107c..321961fa 100644
--- a/kdepim/kleopatra/crypto/gui/resultitemwidget.h
+++ b/kdepim/kleopatra/crypto/gui/resultitemwidget.h
@@ -41,7 +41,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace Crypto {
diff --git a/kdepim/kleopatra/crypto/gui/resultlistwidget.h b/kdepim/kleopatra/crypto/gui/resultlistwidget.h
index 839d2f0f..573007c4 100644
--- a/kdepim/kleopatra/crypto/gui/resultlistwidget.h
+++ b/kdepim/kleopatra/crypto/gui/resultlistwidget.h
@@ -41,7 +41,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace Crypto {
diff --git a/kdepim/kleopatra/crypto/gui/signencryptwizard.h b/kdepim/kleopatra/crypto/gui/signencryptwizard.h
index d5475b36..997f010f 100644
--- a/kdepim/kleopatra/crypto/gui/signencryptwizard.h
+++ b/kdepim/kleopatra/crypto/gui/signencryptwizard.h
@@ -50,8 +50,8 @@ namespace GpgME {
     class Key;
 }
 
-class QFileInfo;
-template <typename T> class QList;
+#include <QFileInfo>
+#include <QList>
 typedef QList<QFileInfo> QFileInfoList;
 
 namespace Kleo {
diff --git a/kdepim/kleopatra/crypto/gui/signerresolvepage_p.h b/kdepim/kleopatra/crypto/gui/signerresolvepage_p.h
index db16772d..f3a9b0d7 100644
--- a/kdepim/kleopatra/crypto/gui/signerresolvepage_p.h
+++ b/kdepim/kleopatra/crypto/gui/signerresolvepage_p.h
@@ -35,9 +35,9 @@
 
 #include <gpgme++/global.h>
 
-class QButtonGroup;
-class QCheckBox;
-class QLabel;
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QLabel>
 
 #include <vector>
 #include <map>
diff --git a/kdepim/kleopatra/crypto/gui/signingcertificateselectiondialog.h b/kdepim/kleopatra/crypto/gui/signingcertificateselectiondialog.h
index 24125d82..3a94eb99 100644
--- a/kdepim/kleopatra/crypto/gui/signingcertificateselectiondialog.h
+++ b/kdepim/kleopatra/crypto/gui/signingcertificateselectiondialog.h
@@ -38,7 +38,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-template <typename K, typename U> class QMap;
+#include <QMap>
 
 namespace Kleo {
 namespace Crypto {
diff --git a/kdepim/kleopatra/crypto/gui/signingcertificateselectionwidget.h b/kdepim/kleopatra/crypto/gui/signingcertificateselectionwidget.h
index 676cd0ef..623da0e6 100644
--- a/kdepim/kleopatra/crypto/gui/signingcertificateselectionwidget.h
+++ b/kdepim/kleopatra/crypto/gui/signingcertificateselectionwidget.h
@@ -38,7 +38,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-template <typename K, typename U> class QMap;
+#include <QMap>
 
 namespace GpgME {
     class Key;
diff --git a/kdepim/kleopatra/crypto/signencryptfilestask.h b/kdepim/kleopatra/crypto/signencryptfilestask.h
index b4de9b7a..cf2c7296 100644
--- a/kdepim/kleopatra/crypto/signencryptfilestask.h
+++ b/kdepim/kleopatra/crypto/signencryptfilestask.h
@@ -41,7 +41,7 @@
 
 #include <vector>
 
-class QString;
+#include <QString>
 
 namespace GpgME {
     class Key;
diff --git a/kdepim/kleopatra/crypto/task.h b/kdepim/kleopatra/crypto/task.h
index ed4ce4b4..12c8b8c0 100644
--- a/kdepim/kleopatra/crypto/task.h
+++ b/kdepim/kleopatra/crypto/task.h
@@ -42,8 +42,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QColor;
-class QIcon;
+#include <QColor>
+#include <QIcon>
 
 namespace Kleo {
     class AuditLog;
diff --git a/kdepim/kleopatra/dialogs/adduseriddialog.h b/kdepim/kleopatra/dialogs/adduseriddialog.h
index 127b3709..3c160247 100644
--- a/kdepim/kleopatra/dialogs/adduseriddialog.h
+++ b/kdepim/kleopatra/dialogs/adduseriddialog.h
@@ -37,7 +37,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace Dialogs {
diff --git a/kdepim/kleopatra/dialogs/certificatedetailsdialog.h b/kdepim/kleopatra/dialogs/certificatedetailsdialog.h
index afabe8ee..22ecdae4 100644
--- a/kdepim/kleopatra/dialogs/certificatedetailsdialog.h
+++ b/kdepim/kleopatra/dialogs/certificatedetailsdialog.h
@@ -37,7 +37,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QDate;
+#include <QDate>
 
 namespace GpgME {
     class Key;
diff --git a/kdepim/kleopatra/dialogs/certifycertificatedialog_p.h b/kdepim/kleopatra/dialogs/certifycertificatedialog_p.h
index ee235fd4..6a5c4af4 100644
--- a/kdepim/kleopatra/dialogs/certifycertificatedialog_p.h
+++ b/kdepim/kleopatra/dialogs/certifycertificatedialog_p.h
@@ -43,9 +43,9 @@
 #include <QStandardItemModel>
 #include <QWizardPage>
 
-class QListView;
-class QLabel;
-class QCheckBox;
+#include <QListView>
+#include <QLabel>
+#include <QCheckBox>
 
 namespace Kleo {
     namespace Dialogs {
diff --git a/kdepim/kleopatra/dialogs/expirydialog.h b/kdepim/kleopatra/dialogs/expirydialog.h
index 630434f6..4fe265a4 100644
--- a/kdepim/kleopatra/dialogs/expirydialog.h
+++ b/kdepim/kleopatra/dialogs/expirydialog.h
@@ -37,7 +37,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QDate;
+#include <QDate>
 
 namespace Kleo {
 namespace Dialogs {
diff --git a/kdepim/kleopatra/dialogs/exportcertificatesdialog.h b/kdepim/kleopatra/dialogs/exportcertificatesdialog.h
index cf37647c..3b5e9bef 100644
--- a/kdepim/kleopatra/dialogs/exportcertificatesdialog.h
+++ b/kdepim/kleopatra/dialogs/exportcertificatesdialog.h
@@ -37,7 +37,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace Dialogs {
diff --git a/kdepim/kleopatra/dialogs/exportsecretkeydialog.h b/kdepim/kleopatra/dialogs/exportsecretkeydialog.h
index 667c02fe..139cafa1 100644
--- a/kdepim/kleopatra/dialogs/exportsecretkeydialog.h
+++ b/kdepim/kleopatra/dialogs/exportsecretkeydialog.h
@@ -37,7 +37,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QDate;
+#include <QDate>
 
 namespace GpgME {
     class Key;
diff --git a/kdepim/kleopatra/kgpgconf/configreader.h b/kdepim/kleopatra/kgpgconf/configreader.h
index e8dbc7a6..6c0d2d75 100644
--- a/kdepim/kleopatra/kgpgconf/configreader.h
+++ b/kdepim/kleopatra/kgpgconf/configreader.h
@@ -35,7 +35,7 @@
 
 #include <QString>
 
-class QStringList;
+#include <QStringList>
 
 class Config;
 
diff --git a/kdepim/kleopatra/kgpgconf/configwriter.h b/kdepim/kleopatra/kgpgconf/configwriter.h
index 46b04e72..dfd53481 100644
--- a/kdepim/kleopatra/kgpgconf/configwriter.h
+++ b/kdepim/kleopatra/kgpgconf/configwriter.h
@@ -33,7 +33,7 @@
 #ifndef KGPGCONF_CONFIGWRITER_H
 #define KGPGCONF_CONFIGWRITER_H 
 
-class QIODevice;
+#include <QIODevice>
 
 class Config;
 
diff --git a/kdepim/kleopatra/kgpgconf/mainwindow.h b/kdepim/kleopatra/kgpgconf/mainwindow.h
index 3c6353ae..0b612a44 100644
--- a/kdepim/kleopatra/kgpgconf/mainwindow.h
+++ b/kdepim/kleopatra/kgpgconf/mainwindow.h
@@ -38,7 +38,7 @@
 
 #include "ui_mainwidget.h"
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 class Config;
 class ConfigComponent;
diff --git a/kdepim/kleopatra/kwatchgnupg/kwatchgnupgconfig.h b/kdepim/kleopatra/kwatchgnupg/kwatchgnupgconfig.h
index 5512fa78..f60b39e6 100644
--- a/kdepim/kleopatra/kwatchgnupg/kwatchgnupgconfig.h
+++ b/kdepim/kleopatra/kwatchgnupg/kwatchgnupgconfig.h
@@ -35,8 +35,8 @@
 
 #include <kdialog.h>
 
-class QCheckBox;
-class QComboBox;
+#include <QCheckBox>
+#include <QComboBox>
 class KIntSpinBox;
 class KUrlRequester;
 
diff --git a/kdepim/kleopatra/libkleopatraclient/core/kleocommand.h b/kdepim/kleopatra/libkleopatraclient/core/kleocommand.h
index 7eaa6504..c846a0ac 100644
--- a/kdepim/kleopatra/libkleopatraclient/core/kleocommand.h
+++ b/kdepim/kleopatra/libkleopatraclient/core/kleocommand.h
@@ -27,9 +27,9 @@
 #include <QtCore/QObject>
 #include <QWidget> // only for WId, doesn't prevent linking against QtCore-only
 
-class QString;
-class QByteArray;
-class QVariant;
+#include <QString>
+#include <QByteArray>
+#include <QVariant>
 
 namespace KLEOPATRACLIENT_NAMESPACE {
 
diff --git a/kdepim/kleopatra/models/keylistmodelinterface.h b/kdepim/kleopatra/models/keylistmodelinterface.h
index 82ed7bd8..07b93478 100644
--- a/kdepim/kleopatra/models/keylistmodelinterface.h
+++ b/kdepim/kleopatra/models/keylistmodelinterface.h
@@ -39,8 +39,8 @@ namespace GpgME {
     class Key;
 }
 
-class QModelIndex;
-template <typename T> class QList;
+#include <QModelIndex>
+#include <QList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/newcertificatewizard/listwidget.h b/kdepim/kleopatra/newcertificatewizard/listwidget.h
index bb78e778..e07650bf 100644
--- a/kdepim/kleopatra/newcertificatewizard/listwidget.h
+++ b/kdepim/kleopatra/newcertificatewizard/listwidget.h
@@ -37,9 +37,9 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QRegExp;
-class QString;
-class QStringList;
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
 
 namespace Kleo {
 namespace NewCertificateUi {
diff --git a/kdepim/kleopatra/selftest/selftest.h b/kdepim/kleopatra/selftest/selftest.h
index 96c31457..a9df155e 100644
--- a/kdepim/kleopatra/selftest/selftest.h
+++ b/kdepim/kleopatra/selftest/selftest.h
@@ -33,7 +33,7 @@
 #ifndef __KLEOPATRA_SELFTEST_SELFTEST_H__
 #define __KLEOPATRA_SELFTEST_SELFTEST_H__
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/systrayicon.h b/kdepim/kleopatra/systrayicon.h
index 3e0f39f3..aef9db61 100644
--- a/kdepim/kleopatra/systrayicon.h
+++ b/kdepim/kleopatra/systrayicon.h
@@ -40,7 +40,7 @@
 #include <utils/pimpl_ptr.h>
 
 class MainWindow;
-class QDialog;
+#include <QDialog>
 
 class SysTrayIcon : public Kleo::SystemTrayIcon {
     Q_OBJECT
diff --git a/kdepim/kleopatra/uiserver/assuancommand.h b/kdepim/kleopatra/uiserver/assuancommand.h
index 0dc26233..40cd2b40 100644
--- a/kdepim/kleopatra/uiserver/assuancommand.h
+++ b/kdepim/kleopatra/uiserver/assuancommand.h
@@ -54,12 +54,12 @@
 #include <map>
 #include <vector>
 
-class QVariant;
-class QIODevice;
-class QObject;
-class QStringList;
-class QDialog;
-class QFile;
+#include <QVariant>
+#include <QIODevice>
+#include <QObject>
+#include <QStringList>
+#include <QDialog>
+#include <QFile>
 
 struct assuan_context_s;
 
diff --git a/kdepim/kleopatra/uiserver/uiserver.h b/kdepim/kleopatra/uiserver/uiserver.h
index 5d330faf..eb3bbb63 100644
--- a/kdepim/kleopatra/uiserver/uiserver.h
+++ b/kdepim/kleopatra/uiserver/uiserver.h
@@ -41,7 +41,7 @@
 
 #include <cstdio>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/action_data.h b/kdepim/kleopatra/utils/action_data.h
index 0edbf3b0..7f49bac0 100644
--- a/kdepim/kleopatra/utils/action_data.h
+++ b/kdepim/kleopatra/utils/action_data.h
@@ -35,7 +35,7 @@
 
 #include <QString>
 
-class QObject;
+#include <QObject>
 class KAction;
 class KActionCollection;
 
diff --git a/kdepim/kleopatra/utils/archivedefinition.h b/kdepim/kleopatra/utils/archivedefinition.h
index acb4c6f0..1893880d 100644
--- a/kdepim/kleopatra/utils/archivedefinition.h
+++ b/kdepim/kleopatra/utils/archivedefinition.h
@@ -41,7 +41,7 @@
 
 #include <vector>
 
-class QDir;
+#include <QDir>
 
 namespace boost {
     template <typename T> class shared_ptr;
diff --git a/kdepim/kleopatra/utils/classify.h b/kdepim/kleopatra/utils/classify.h
index 7850e92c..61cfa1fc 100644
--- a/kdepim/kleopatra/utils/classify.h
+++ b/kdepim/kleopatra/utils/classify.h
@@ -35,8 +35,8 @@
 #ifndef __KLEOPATRA_UISERVER_CLASSIFY_H__
 #define __KLEOPATRA_UISERVER_CLASSIFY_H__
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/clipboardmenu.h b/kdepim/kleopatra/utils/clipboardmenu.h
index b8d4d0bb..b256e9fa 100644
--- a/kdepim/kleopatra/utils/clipboardmenu.h
+++ b/kdepim/kleopatra/utils/clipboardmenu.h
@@ -20,7 +20,7 @@
 
 #include <QObject>
 class KActionMenu;
-class QAction;
+#include <QAction>
 class MainWindow;
 namespace Kleo {
 class Command;
diff --git a/kdepim/kleopatra/utils/detail_p.h b/kdepim/kleopatra/utils/detail_p.h
index e32e2dd5..c05032e7 100644
--- a/kdepim/kleopatra/utils/detail_p.h
+++ b/kdepim/kleopatra/utils/detail_p.h
@@ -43,7 +43,7 @@
 #include <io.h>
 #endif
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace _detail {
diff --git a/kdepim/kleopatra/utils/dragqueen.h b/kdepim/kleopatra/utils/dragqueen.h
index 9a0bde19..5c6c4b18 100644
--- a/kdepim/kleopatra/utils/dragqueen.h
+++ b/kdepim/kleopatra/utils/dragqueen.h
@@ -39,7 +39,7 @@
 #include <QMimeData>
 
 
-class QUrl;
+#include <QUrl>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/filesystemwatcher.h b/kdepim/kleopatra/utils/filesystemwatcher.h
index 0188fe2e..9a99f40f 100644
--- a/kdepim/kleopatra/utils/filesystemwatcher.h
+++ b/kdepim/kleopatra/utils/filesystemwatcher.h
@@ -37,8 +37,8 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/formatting.h b/kdepim/kleopatra/utils/formatting.h
index 56ca6893..a561327b 100644
--- a/kdepim/kleopatra/utils/formatting.h
+++ b/kdepim/kleopatra/utils/formatting.h
@@ -35,9 +35,9 @@
 
 #include <gpgme++/key.h>
 
-class QString;
-class QStringList;
-class QDate;
+#include <QString>
+#include <QStringList>
+#include <QDate>
 
 namespace GpgME {
     class Import;
diff --git a/kdepim/kleopatra/utils/getpid.h b/kdepim/kleopatra/utils/getpid.h
index b71822dc..70e704dc 100644
--- a/kdepim/kleopatra/utils/getpid.h
+++ b/kdepim/kleopatra/utils/getpid.h
@@ -42,7 +42,7 @@
 # include <unistd.h>
 #endif
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/gnupg-helper.h b/kdepim/kleopatra/utils/gnupg-helper.h
index 5f1c0c25..d2b883a6 100644
--- a/kdepim/kleopatra/utils/gnupg-helper.h
+++ b/kdepim/kleopatra/utils/gnupg-helper.h
@@ -33,8 +33,8 @@
 #ifndef __KLEOPATRA_GNUPGHELPER_H__
 #define __KLEOPATRA_GNUPGHELPER_H__
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/hex.h b/kdepim/kleopatra/utils/hex.h
index 69d61f8d..8860bba1 100644
--- a/kdepim/kleopatra/utils/hex.h
+++ b/kdepim/kleopatra/utils/hex.h
@@ -35,7 +35,7 @@
 
 #include <string>
 
-class QByteArray;
+#include <QByteArray>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/input.h b/kdepim/kleopatra/utils/input.h
index 0a4a9307..d04dc105 100644
--- a/kdepim/kleopatra/utils/input.h
+++ b/kdepim/kleopatra/utils/input.h
@@ -37,12 +37,12 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QIODevice;
-class QString;
-class QStringList;
-class QByteArray;
-class QFile;
-class QDir;
+#include <QIODevice>
+#include <QString>
+#include <QStringList>
+#include <QByteArray>
+#include <QFile>
+#include <QDir>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/kdlogtextwidget.h b/kdepim/kleopatra/utils/kdlogtextwidget.h
index c95a5f46..0642a364 100644
--- a/kdepim/kleopatra/utils/kdlogtextwidget.h
+++ b/kdepim/kleopatra/utils/kdlogtextwidget.h
@@ -27,9 +27,9 @@
 #include <utils/pimpl_ptr.h>
 #include <QAbstractScrollArea>
 
-class QString;
-class QStringList;
-class QColor;
+#include <QString>
+#include <QStringList>
+#include <QColor>
 
 class KDLogTextWidget : public QAbstractScrollArea {
     Q_OBJECT
diff --git a/kdepim/kleopatra/utils/kdsignalblocker.h b/kdepim/kleopatra/utils/kdsignalblocker.h
index 680503ba..c8df55cf 100644
--- a/kdepim/kleopatra/utils/kdsignalblocker.h
+++ b/kdepim/kleopatra/utils/kdsignalblocker.h
@@ -25,7 +25,7 @@
 
 #include <utils/kdtoolsglobal.h>
 
-class QObject;
+#include <QObject>
 
 class KDSignalBlocker {
     Q_DISABLE_COPY( KDSignalBlocker )
diff --git a/kdepim/kleopatra/utils/log.h b/kdepim/kleopatra/utils/log.h
index 24d7a13e..3ae167cc 100644
--- a/kdepim/kleopatra/utils/log.h
+++ b/kdepim/kleopatra/utils/log.h
@@ -40,9 +40,9 @@
 
 #include <cstdio>
 
-class QIODevice;
-class QFile;
-class QString;
+#include <QIODevice>
+#include <QFile>
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/output.h b/kdepim/kleopatra/utils/output.h
index bf07416c..df687eb3 100644
--- a/kdepim/kleopatra/utils/output.h
+++ b/kdepim/kleopatra/utils/output.h
@@ -39,11 +39,11 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QIODevice;
-class QString;
-class QStringList;
-class QDir;
-class QWidget;
+#include <QIODevice>
+#include <QString>
+#include <QStringList>
+#include <QDir>
+#include <QWidget>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/path-helper.h b/kdepim/kleopatra/utils/path-helper.h
index a81663c9..7ec347b4 100644
--- a/kdepim/kleopatra/utils/path-helper.h
+++ b/kdepim/kleopatra/utils/path-helper.h
@@ -33,9 +33,9 @@
 #ifndef __KLEOPATRA_UTILS_PATH_HELPER_H__
 #define __KLEOPATRA_UTILS_PATH_HELPER_H__
 
-class QString;
-class QStringList;
-class QDir;
+#include <QString>
+#include <QStringList>
+#include <QDir>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/utils/progressmanager.h b/kdepim/kleopatra/utils/progressmanager.h
index 76e07fd4..0a086563 100644
--- a/kdepim/kleopatra/utils/progressmanager.h
+++ b/kdepim/kleopatra/utils/progressmanager.h
@@ -41,7 +41,7 @@ namespace Kleo {
     class Job;
 }
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 namespace ProgressManager {
diff --git a/kdepim/kleopatra/utils/types.h b/kdepim/kleopatra/utils/types.h
index a3ab436c..c6f6be30 100644
--- a/kdepim/kleopatra/utils/types.h
+++ b/kdepim/kleopatra/utils/types.h
@@ -35,7 +35,7 @@
 
 #include <utils/pimpl_ptr.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace boost {
     template <typename T> class shared_ptr;
diff --git a/kdepim/kleopatra/utils/validation.h b/kdepim/kleopatra/utils/validation.h
index 84533f0b..b05d61b1 100644
--- a/kdepim/kleopatra/utils/validation.h
+++ b/kdepim/kleopatra/utils/validation.h
@@ -33,9 +33,9 @@
 #ifndef __KLEOPATRA_UTILS_VALIDATION_H__
 #define __KLEOPATRA_UTILS_VALIDATION_H__
 
-class QValidator;
-class QRegExp;
-class QObject;
+#include <QValidator>
+#include <QRegExp>
+#include <QObject>
 
 namespace Kleo {
 namespace Validation {
diff --git a/kdepim/kleopatra/view/keylistcontroller.h b/kdepim/kleopatra/view/keylistcontroller.h
index 085dd469..18a1669e 100644
--- a/kdepim/kleopatra/view/keylistcontroller.h
+++ b/kdepim/kleopatra/view/keylistcontroller.h
@@ -40,10 +40,10 @@
 
 #include <vector>
 
-class QAbstractItemView;
-class QAction;
-class QPoint;
-class QItemSelectionModel;
+#include <QAbstractItemView>
+#include <QAction>
+#include <QPoint>
+#include <QItemSelectionModel>
 class KActionCollection;
 
 namespace Kleo {
diff --git a/kdepim/kleopatra/view/keytreeview.h b/kdepim/kleopatra/view/keytreeview.h
index 115a0562..d116aecc 100644
--- a/kdepim/kleopatra/view/keytreeview.h
+++ b/kdepim/kleopatra/view/keytreeview.h
@@ -42,7 +42,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
-class QTreeView;
+#include <QTreeView>
 
 namespace Kleo {
 
diff --git a/kdepim/kleopatra/view/tabwidget.h b/kdepim/kleopatra/view/tabwidget.h
index 78978717..274aaa53 100644
--- a/kdepim/kleopatra/view/tabwidget.h
+++ b/kdepim/kleopatra/view/tabwidget.h
@@ -41,7 +41,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 class KConfigGroup;
 class KActionCollection;
diff --git a/kdepim/kmail/antispam-virus/antispamwizard.h b/kdepim/kmail/antispam-virus/antispamwizard.h
index ed514437..99dd332a 100644
--- a/kdepim/kmail/antispam-virus/antispamwizard.h
+++ b/kdepim/kmail/antispam-virus/antispamwizard.h
@@ -35,11 +35,11 @@
 #include <QList>
 #include <akonadi/collection.h>
 
-class QLabel;
-class QTextEdit;
-class QCheckBox;
-class QBoxLayout;
-class QListWidget;
+#include <QLabel>
+#include <QTextEdit>
+#include <QCheckBox>
+#include <QBoxLayout>
+#include <QListWidget>
 
 namespace MailCommon {
 class FolderTreeWidget;
diff --git a/kdepim/kmail/collectionpage/collectionmailinglistpage.h b/kdepim/kmail/collectionpage/collectionmailinglistpage.h
index 5e335057..4b88a307 100644
--- a/kdepim/kmail/collectionpage/collectionmailinglistpage.h
+++ b/kdepim/kmail/collectionpage/collectionmailinglistpage.h
@@ -28,10 +28,10 @@
 #include <akonadi/collection.h>
 
 
-class QCheckBox;
-class QPushButton;
+#include <QCheckBox>
+#include <QPushButton>
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 class KComboBox;
 class KJob;
diff --git a/kdepim/kmail/collectionpage/collectionmaintenancepage.h b/kdepim/kmail/collectionpage/collectionmaintenancepage.h
index 95c1b84d..09e432c2 100644
--- a/kdepim/kmail/collectionpage/collectionmaintenancepage.h
+++ b/kdepim/kmail/collectionpage/collectionmaintenancepage.h
@@ -21,8 +21,8 @@
 #include <akonadi/collectionpropertiespage.h>
 #include <akonadi/collection.h>
 
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 namespace Akonadi {
 class CollectionStatistics;
 }
diff --git a/kdepim/kmail/collectionpage/collectionquotapage_p.h b/kdepim/kmail/collectionpage/collectionquotapage_p.h
index 164ed14c..b63358a8 100644
--- a/kdepim/kmail/collectionpage/collectionquotapage_p.h
+++ b/kdepim/kmail/collectionpage/collectionquotapage_p.h
@@ -36,8 +36,8 @@
 
 #include <QWidget>
 
-class QProgressBar;
-class QLabel;
+#include <QProgressBar>
+#include <QLabel>
 
 class QuotaWidget : public QWidget {
 
diff --git a/kdepim/kmail/collectionpage/collectionshortcutpage.h b/kdepim/kmail/collectionpage/collectionshortcutpage.h
index 82e297f4..0e590b56 100644
--- a/kdepim/kmail/collectionpage/collectionshortcutpage.h
+++ b/kdepim/kmail/collectionpage/collectionshortcutpage.h
@@ -24,7 +24,7 @@
 
 #include <akonadi/collectionpropertiespage.h>
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 class KKeySequenceWidget;
 
diff --git a/kdepim/kmail/collectionpage/collectiontemplatespage.h b/kdepim/kmail/collectionpage/collectiontemplatespage.h
index c06454a0..e6ba59e7 100644
--- a/kdepim/kmail/collectionpage/collectiontemplatespage.h
+++ b/kdepim/kmail/collectionpage/collectiontemplatespage.h
@@ -20,12 +20,12 @@
 #define COLLECTIONTEMPLATESPAGE_H
 #include <akonadi/collectionpropertiespage.h>
 
-class QCheckBox;
+#include <QCheckBox>
 namespace TemplateParser {
 class TemplatesConfiguration;
 }
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 class CollectionTemplatesPage : public Akonadi::CollectionPropertiesPage
 {
diff --git a/kdepim/kmail/collectionpage/collectionviewpage.h b/kdepim/kmail/collectionpage/collectionviewpage.h
index 91aa6d3d..5b0017af 100644
--- a/kdepim/kmail/collectionpage/collectionviewpage.h
+++ b/kdepim/kmail/collectionpage/collectionviewpage.h
@@ -21,13 +21,13 @@
 
 #include <akonadi/collectionpropertiespage.h>
 #include <akonadi/collection.h>
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 class KComboBox;
 class KIconButton;
 
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 namespace MessageList {
 namespace Utils {
diff --git a/kdepim/kmail/configuredialog/colorlistbox.h b/kdepim/kmail/configuredialog/colorlistbox.h
index 88b99d06..4a7c0240 100644
--- a/kdepim/kmail/configuredialog/colorlistbox.h
+++ b/kdepim/kmail/configuredialog/colorlistbox.h
@@ -25,10 +25,10 @@
 
 #include <QTreeWidget>
 
-class QDragLeaveEvent;
-class QDropEvent;
-class QDragMoveEvent;
-class QDragLeaveEvent;
+#include <QDragLeaveEvent>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QDragLeaveEvent>
 
 class ColorListBox : public QTreeWidget
 {
diff --git a/kdepim/kmail/configuredialog/configagentdelegate.h b/kdepim/kmail/configuredialog/configagentdelegate.h
index d6359b9c..1ed9c7ec 100644
--- a/kdepim/kmail/configuredialog/configagentdelegate.h
+++ b/kdepim/kmail/configuredialog/configagentdelegate.h
@@ -24,7 +24,7 @@
 
 #include <QStyledItemDelegate>
 
-class QTextDocument;
+#include <QTextDocument>
 
 /**
  * @short A delegate for listing the accounts in the account list with kmail specific options.
diff --git a/kdepim/kmail/configuredialog/configureaccountpage.h b/kdepim/kmail/configuredialog/configureaccountpage.h
index 615f2423..fd16b489 100644
--- a/kdepim/kmail/configuredialog/configureaccountpage.h
+++ b/kdepim/kmail/configuredialog/configureaccountpage.h
@@ -22,7 +22,7 @@
 #include "configuredialog_p.h"
 #include "ui_accountspagereceivingtab.h"
 
-class QCheckBox;
+#include <QCheckBox>
 class KComboBox;
 class KLineEdit;
 class OrgFreedesktopAkonadiNewMailNotifierInterface;
diff --git a/kdepim/kmail/configuredialog/configureagentswidget.h b/kdepim/kmail/configuredialog/configureagentswidget.h
index 35399dbd..c174e957 100644
--- a/kdepim/kmail/configuredialog/configureagentswidget.h
+++ b/kdepim/kmail/configuredialog/configureagentswidget.h
@@ -20,11 +20,11 @@
 
 #include <QWidget>
 
-class QTreeWidget;
-class QSplitter;
+#include <QTreeWidget>
+#include <QSplitter>
 class KTextEdit;
-class QTreeWidgetItem;
-class QPushButton;
+#include <QTreeWidgetItem>
+#include <QPushButton>
 class ConfigureAgentsWidget : public QWidget
 {
     Q_OBJECT
diff --git a/kdepim/kmail/configuredialog/configureappearancepage.h b/kdepim/kmail/configuredialog/configureappearancepage.h
index c156dd05..b68aebc5 100644
--- a/kdepim/kmail/configuredialog/configureappearancepage.h
+++ b/kdepim/kmail/configuredialog/configureappearancepage.h
@@ -22,17 +22,17 @@
 #include "tag.h"
 #include <QListWidgetItem>
 
-class QPushButton;
-class QCheckBox;
+#include <QPushButton>
+#include <QCheckBox>
 class KComboBox;
 class KFontChooser;
 class ColorListBox;
-class QButtonGroup;
-class QGroupBox;
-class QSpinBox;
+#include <QButtonGroup>
+#include <QGroupBox>
+#include <QSpinBox>
 class KButtonGroup;
 class KLineEdit;
-class QModelIndex;
+#include <QModelIndex>
 namespace MessageViewer {
 class ConfigureWidget;
 }
diff --git a/kdepim/kmail/configuredialog/configurecomposerpage.h b/kdepim/kmail/configuredialog/configurecomposerpage.h
index cd64887c..5ebf9410 100644
--- a/kdepim/kmail/configuredialog/configurecomposerpage.h
+++ b/kdepim/kmail/configuredialog/configurecomposerpage.h
@@ -22,15 +22,15 @@
 #include <config-enterprise.h>
 #include "configuredialog_p.h"
 #include "ui_customtemplates_base.h"
-class QCheckBox;
+#include <QCheckBox>
 class KIntSpinBox;
 class KIntNumInput;
 class KComboBox;
 class KUrlRequester;
 class KLineEdit;
 class ListView;
-class QPushButton;
-class QLabel;
+#include <QPushButton>
+#include <QLabel>
 class ConfigureStorageServiceWidget;
 
 namespace TemplateParser {
diff --git a/kdepim/kmail/configuredialog/configuresecuritypage.h b/kdepim/kmail/configuredialog/configuresecuritypage.h
index 21fed9f1..6a700c0d 100644
--- a/kdepim/kmail/configuredialog/configuresecuritypage.h
+++ b/kdepim/kmail/configuredialog/configuresecuritypage.h
@@ -27,7 +27,7 @@
 #include "ui_warningconfiguration.h"
 #include "ui_smimeconfiguration.h"
 
-class QButtonGroup;
+#include <QButtonGroup>
 namespace MessageViewer {
 class AdBlockSettingWidget;
 }
diff --git a/kdepim/kmail/configuredialog/configurestorageservicewidget.h b/kdepim/kmail/configuredialog/configurestorageservicewidget.h
index c2e1b65c..bab94be1 100644
--- a/kdepim/kmail/configuredialog/configurestorageservicewidget.h
+++ b/kdepim/kmail/configuredialog/configurestorageservicewidget.h
@@ -19,7 +19,7 @@
 #define CONFIGURESTORAGESERVICEWIDGET_H
 
 #include <QWidget>
-class QPushButton;
+#include <QPushButton>
 namespace PimCommon {
 class StorageServiceSettingsWidget;
 }
diff --git a/kdepim/kmail/dialog/archivefolderdialog.h b/kdepim/kmail/dialog/archivefolderdialog.h
index 40ce3d9b..36aa8e9e 100644
--- a/kdepim/kmail/dialog/archivefolderdialog.h
+++ b/kdepim/kmail/dialog/archivefolderdialog.h
@@ -21,7 +21,7 @@
 
 #include <kdialog.h>
 
-class QCheckBox;
+#include <QCheckBox>
 class KUrlRequester;
 class KComboBox;
 class KUrl;
diff --git a/kdepim/kmail/editor/attachmentcontroller.h b/kdepim/kmail/editor/attachmentcontroller.h
index ad90f500..5be486db 100644
--- a/kdepim/kmail/editor/attachmentcontroller.h
+++ b/kdepim/kmail/editor/attachmentcontroller.h
@@ -26,7 +26,7 @@
 #include "attachment/attachmentcontrollerbase.h"
 
 class KMComposeWin;
-class QModelIndex;
+#include <QModelIndex>
 namespace MessageComposer {
 class AttachmentModel;
 }
diff --git a/kdepim/kmail/editor/attachmentview.h b/kdepim/kmail/editor/attachmentview.h
index 5a1096f8..70b1d1c3 100644
--- a/kdepim/kmail/editor/attachmentview.h
+++ b/kdepim/kmail/editor/attachmentview.h
@@ -27,7 +27,7 @@
 
 #include <QTreeView>
 
-class QContextMenuEvent;
+#include <QContextMenuEvent>
 
 namespace MessageComposer {
 class AttachmentModel;
diff --git a/kdepim/kmail/editor/cryptostateindicatorwidget.h b/kdepim/kmail/editor/cryptostateindicatorwidget.h
index b0371de3..ecf5607d 100644
--- a/kdepim/kmail/editor/cryptostateindicatorwidget.h
+++ b/kdepim/kmail/editor/cryptostateindicatorwidget.h
@@ -19,7 +19,7 @@
 #define CRYPTOSTATEINDICATORWIDGET_H
 
 #include <QWidget>
-class QLabel;
+#include <QLabel>
 
 class CryptoStateIndicatorWidget : public QWidget
 {
diff --git a/kdepim/kmail/editor/kmcomposewin.h b/kdepim/kmail/editor/kmcomposewin.h
index 3a76381a..4ead1639 100644
--- a/kdepim/kmail/editor/kmcomposewin.h
+++ b/kdepim/kmail/editor/kmcomposewin.h
@@ -47,12 +47,12 @@
 #include "kleo/enum.h"
 #include <composer/composerviewbase.h>
 
-class QByteArray;
-class QCheckBox;
-class QGridLayout;
-class QLabel;
-class QPushButton;
-class QSplitter;
+#include <QByteArray>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QSplitter>
 
 class CodecAction;
 class KMComposeWin;
diff --git a/kdepim/kmail/editor/snippetwidget.h b/kdepim/kmail/editor/snippetwidget.h
index 11c3e82d..720760be 100644
--- a/kdepim/kmail/editor/snippetwidget.h
+++ b/kdepim/kmail/editor/snippetwidget.h
@@ -23,7 +23,7 @@ class SnippetsManager;
 class KActionCollection;
 class KMComposerEditor;
 
-class QContextMenuEvent;
+#include <QContextMenuEvent>
 
 /**
  * @author Robert Gruber
diff --git a/kdepim/kmail/foldershortcutactionmanager.h b/kdepim/kmail/foldershortcutactionmanager.h
index ee235f2c..b85e353c 100644
--- a/kdepim/kmail/foldershortcutactionmanager.h
+++ b/kdepim/kmail/foldershortcutactionmanager.h
@@ -28,7 +28,7 @@
 #include <QModelIndex>
 #include <QObject>
 
-class QAction;
+#include <QAction>
 
 class KActionCollection;
 
diff --git a/kdepim/kmail/identity/identityaddvcarddialog.h b/kdepim/kmail/identity/identityaddvcarddialog.h
index 783b6823..6934af03 100644
--- a/kdepim/kmail/identity/identityaddvcarddialog.h
+++ b/kdepim/kmail/identity/identityaddvcarddialog.h
@@ -18,7 +18,7 @@
 #ifndef IDENTITYADDVCARDDIALOG_H
 #define IDENTITYADDVCARDDIALOG_H
 #include <KDialog>
-class QButtonGroup;
+#include <QButtonGroup>
 class KComboBox;
 class KUrlRequester;
 
diff --git a/kdepim/kmail/identity/identitydialog.h b/kdepim/kmail/identity/identitydialog.h
index 0c9bd342..e41b3600 100644
--- a/kdepim/kmail/identity/identitydialog.h
+++ b/kdepim/kmail/identity/identitydialog.h
@@ -34,7 +34,7 @@
 
 #include <kdialog.h>
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace PimCommon {
 class SimpleStringListEditor;
diff --git a/kdepim/kmail/identity/newidentitydialog.h b/kdepim/kmail/identity/newidentitydialog.h
index dc8aa3ed..3ad8a3c9 100644
--- a/kdepim/kmail/identity/newidentitydialog.h
+++ b/kdepim/kmail/identity/newidentitydialog.h
@@ -28,7 +28,7 @@
 
 class KComboBox;
 class KLineEdit;
-class QButtonGroup;
+#include <QButtonGroup>
 
 namespace KPIMIdentities {
 class IdentityManager;
diff --git a/kdepim/kmail/identity/xfaceconfigurator.h b/kdepim/kmail/identity/xfaceconfigurator.h
index aeaaa874..c906ddbf 100644
--- a/kdepim/kmail/identity/xfaceconfigurator.h
+++ b/kdepim/kmail/identity/xfaceconfigurator.h
@@ -22,8 +22,8 @@
 class KJob;
 class KUrl;
 
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 namespace PimCommon {
 class PlainTextEditor;
 }
diff --git a/kdepim/kmail/kmcommands.h b/kdepim/kmail/kmcommands.h
index 3a7ac656..f66b5008 100644
--- a/kdepim/kmail/kmcommands.h
+++ b/kdepim/kmail/kmcommands.h
@@ -28,7 +28,7 @@ using Akonadi::MessageStatus;
 class KProgressDialog;
 class KMMainWidget;
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 namespace MessageViewer {
 class HeaderStyle;
diff --git a/kdepim/kmail/kmkernel.h b/kdepim/kmail/kmkernel.h
index 1c66223e..ca46f7e3 100644
--- a/kdepim/kmail/kmkernel.h
+++ b/kdepim/kmail/kmkernel.h
@@ -25,7 +25,7 @@
 #define kmconfig KMKernel::config()
 
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 namespace Akonadi {
 class Collection;
 class ChangeRecorder;
@@ -75,7 +75,7 @@ class KMFilterDialog;
 }
 
 class KComponentData;
-class QTimer;
+#include <QTimer>
 class KMMainWin;
 class KMainWindow;
 class KMMainWidget;
diff --git a/kdepim/kmail/kmmainwidget.h b/kdepim/kmail/kmmainwidget.h
index fb00c99a..1b242ab7 100644
--- a/kdepim/kmail/kmmainwidget.h
+++ b/kdepim/kmail/kmmainwidget.h
@@ -46,11 +46,11 @@ namespace KMime {
 class Message;
 }
 class KUrl;
-class QVBoxLayout;
-class QSplitter;
+#include <QVBoxLayout>
+#include <QSplitter>
 
 class DisplayMessageFormatActionMenu;
-class QMenu;
+#include <QMenu>
 class KAction;
 class KActionMenu;
 class KToggleAction;
@@ -59,8 +59,8 @@ class CollectionPane;
 class KMCommand;
 class KMMoveCommand;
 class KRecentFilesAction;
-class QDBusPendingCallWatcher;
-template <typename T, typename S> class QMap;
+#include <QDBusPendingCallWatcher>
+#include <QMap>
 
 namespace KIO {
 class Job;
diff --git a/kdepim/kmail/kmsystemtray.h b/kdepim/kmail/kmsystemtray.h
index c6de8d96..2183c61e 100644
--- a/kdepim/kmail/kmsystemtray.h
+++ b/kdepim/kmail/kmsystemtray.h
@@ -25,7 +25,7 @@
 #include <QAction>
 #include <QAbstractItemModel>
 
-class QMenu;
+#include <QMenu>
 
 /**
  * KMSystemTray extends KStatusNotifierItem and handles system
diff --git a/kdepim/kmail/mailmerge/mailmergewidget.h b/kdepim/kmail/mailmerge/mailmergewidget.h
index 1d41c024..16680cbe 100644
--- a/kdepim/kmail/mailmerge/mailmergewidget.h
+++ b/kdepim/kmail/mailmerge/mailmergewidget.h
@@ -21,7 +21,7 @@
 #include <QWidget>
 
 class KComboBox;
-class QStackedWidget;
+#include <QStackedWidget>
 class AttachmentListWidget;
 class KUrlRequester;
 class MailMergeWidget : public QWidget
diff --git a/kdepim/kmail/mailserviceimpl.h b/kdepim/kmail/mailserviceimpl.h
index d6383e51..b62f9ba9 100644
--- a/kdepim/kmail/mailserviceimpl.h
+++ b/kdepim/kmail/mailserviceimpl.h
@@ -30,8 +30,8 @@
 #ifndef MAILSERVICEIMPL_H
 #define MAILSERVICEIMPL_H
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 #include <QObject>
 
 namespace KMail {
diff --git a/kdepim/kmail/messageactions.h b/kdepim/kmail/messageactions.h
index cd2fbde9..f1cc5620 100644
--- a/kdepim/kmail/messageactions.h
+++ b/kdepim/kmail/messageactions.h
@@ -24,8 +24,8 @@
 
 #include <qobject.h>
 
-class QWidget;
-class QAction;
+#include <QWidget>
+#include <QAction>
 class KJob;
 class KAction;
 class KActionMenu;
diff --git a/kdepim/kmail/searchdialog/kmsearchfilterproxymodel.h b/kdepim/kmail/searchdialog/kmsearchfilterproxymodel.h
index 00a34821..9a5483b7 100644
--- a/kdepim/kmail/searchdialog/kmsearchfilterproxymodel.h
+++ b/kdepim/kmail/searchdialog/kmsearchfilterproxymodel.h
@@ -31,7 +31,7 @@
 
 #include <QSortFilterProxyModel>
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace KMail {
 class KMSearchFilterProxyModel : public QSortFilterProxyModel
diff --git a/kdepim/kmail/searchdialog/searchwindow.h b/kdepim/kmail/searchdialog/searchwindow.h
index 7618d661..80cc3708 100644
--- a/kdepim/kmail/searchdialog/searchwindow.h
+++ b/kdepim/kmail/searchdialog/searchwindow.h
@@ -32,14 +32,14 @@
 
 #include <QtCore/QTimer>
 
-class QCloseEvent;
-class QKeyEvent;
+#include <QCloseEvent>
+#include <QKeyEvent>
 class KActionMenu;
 class KJob;
 class KMMainWidget;
 class KMSearchMessageModel;
-class QAbstractItemModel;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QModelIndex>
 
 namespace PimCommon {
 class SelectMultiCollectionDialog;
diff --git a/kdepim/kmail/secondarywindow.h b/kdepim/kmail/secondarywindow.h
index 4e4d6cf5..edb8a744 100644
--- a/kdepim/kmail/secondarywindow.h
+++ b/kdepim/kmail/secondarywindow.h
@@ -33,7 +33,7 @@
 
 #include <kxmlguiwindow.h>
 
-class QCloseEvent;
+#include <QCloseEvent>
 
 namespace KMail {
 
diff --git a/kdepim/kmail/settings/globalsettings.h b/kdepim/kmail/settings/globalsettings.h
index a6ff4eaa..87ebecea 100644
--- a/kdepim/kmail/settings/globalsettings.h
+++ b/kdepim/kmail/settings/globalsettings.h
@@ -26,7 +26,7 @@
 
 #include "globalsettings_base.h"
 
-class QTimer;
+#include <QTimer>
 
 class GlobalSettings : public GlobalSettingsBase
 {
diff --git a/kdepim/kmail/tag/tagactionmanager.h b/kdepim/kmail/tag/tagactionmanager.h
index 426797eb..729b4dd0 100644
--- a/kdepim/kmail/tag/tagactionmanager.h
+++ b/kdepim/kmail/tag/tagactionmanager.h
@@ -29,8 +29,8 @@ class KJob;
 class KActionCollection;
 class KXMLGUIClient;
 class KToggleAction;
-class QAction;
-class QSignalMapper;
+#include <QAction>
+#include <QSignalMapper>
 class KAction;
 namespace Akonadi {
 class Item;
diff --git a/kdepim/kmail/tag/tagselectdialog.h b/kdepim/kmail/tag/tagselectdialog.h
index a373520d..68fdcf81 100644
--- a/kdepim/kmail/tag/tagselectdialog.h
+++ b/kdepim/kmail/tag/tagselectdialog.h
@@ -34,7 +34,7 @@
 #include <Akonadi/Tag>
 #include "tag.h"
 
-class QListWidget;
+#include <QListWidget>
 class TagSelectDialog : public KDialog
 {
     Q_OBJECT
diff --git a/kdepim/kmail/widgets/vacationscriptindicatorwidget.h b/kdepim/kmail/widgets/vacationscriptindicatorwidget.h
index f355169f..dfc8b615 100644
--- a/kdepim/kmail/widgets/vacationscriptindicatorwidget.h
+++ b/kdepim/kmail/widgets/vacationscriptindicatorwidget.h
@@ -19,8 +19,8 @@
 #define VACATIONSCRIPTINDICATORWIDGET_H
 
 #include <QLabel>
-class QHBoxLayout;
-class QLabel;
+#include <QHBoxLayout>
+#include <QLabel>
 namespace KMail {
 
 class ServerLabel : public QLabel
diff --git a/kdepim/knode/articlewidget.h b/kdepim/knode/articlewidget.h
index 93b6849e..b38b265e 100644
--- a/kdepim/knode/articlewidget.h
+++ b/kdepim/knode/articlewidget.h
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kmime/kmime_content.h>
 
-class QTimer;
+#include <QTimer>
 class KAction;
 class KActionCollection;
 class KActionMenu;
diff --git a/kdepim/knode/knarticlefactory.h b/kdepim/knode/knarticlefactory.h
index d009f9c3..956229ca 100644
--- a/kdepim/knode/knarticlefactory.h
+++ b/kdepim/knode/knarticlefactory.h
@@ -26,7 +26,7 @@
 #include <QListWidgetItem>
 #include <kdialog.h>
 
-class QLabel;
+#include <QLabel>
 class KNComposer;
 class KNSendErrorDialog;
 
diff --git a/kdepim/knode/kncleanup.h b/kdepim/knode/kncleanup.h
index 628771bd..c116e411 100644
--- a/kdepim/knode/kncleanup.h
+++ b/kdepim/knode/kncleanup.h
@@ -21,9 +21,9 @@
 #include <QList>
 #include <KDialog>
 
-class QProgressBar;
-class QCloseEvent;
-class QLabel;
+#include <QProgressBar>
+#include <QCloseEvent>
+#include <QLabel>
 
 class KNFolder;
 
diff --git a/kdepim/knode/kncollectionview.h b/kdepim/knode/kncollectionview.h
index bea1f967..5930d7a9 100644
--- a/kdepim/knode/kncollectionview.h
+++ b/kdepim/knode/kncollectionview.h
@@ -21,8 +21,8 @@
 
 #include <foldertreewidget.h>
 
-class QContextMenuEvent;
-class QDropEvent;
+#include <QContextMenuEvent>
+#include <QDropEvent>
 
 using namespace KPIM;
 
diff --git a/kdepim/knode/kncomposer.h b/kdepim/knode/kncomposer.h
index 652b29e6..d6cecce0 100644
--- a/kdepim/knode/kncomposer.h
+++ b/kdepim/knode/kncomposer.h
@@ -27,8 +27,8 @@
 class KSelectAction;
 class KTemporaryFile;
 class KToggleAction;
-class QComboBox;
-class QFile;
+#include <QComboBox>
+#include <QFile>
 namespace KNode {
   namespace Composer {
     class View;
diff --git a/kdepim/knode/kncomposerview.h b/kdepim/knode/kncomposerview.h
index 61f38420..bab50a56 100644
--- a/kdepim/knode/kncomposerview.h
+++ b/kdepim/knode/kncomposerview.h
@@ -21,7 +21,7 @@
 
 class KComboBox;
 class KNComposerEditor;
-class QGroupBox;
+#include <QGroupBox>
 namespace KPIMIdentities {
   class IdentityCombo;
 }
diff --git a/kdepim/knode/knconfigpages.h b/kdepim/knode/knconfigpages.h
index 9efc5446..5681d953 100644
--- a/kdepim/knode/knconfigpages.h
+++ b/kdepim/knode/knconfigpages.h
@@ -18,7 +18,7 @@
 #include <kcmodule.h>
 
 
-class QTabWidget;
+#include <QTabWidget>
 
 namespace KNode {
 
diff --git a/kdepim/knode/knfilterdialog.h b/kdepim/knode/knfilterdialog.h
index a1752758..85f83345 100644
--- a/kdepim/knode/knfilterdialog.h
+++ b/kdepim/knode/knfilterdialog.h
@@ -20,8 +20,8 @@
 class KNFilterConfigWidget;
 class KNArticleFilter;
 class KLineEdit;
-class QComboBox;
-class QCheckBox;
+#include <QComboBox>
+#include <QCheckBox>
 
 
 /** Filter configuration dialog. */
diff --git a/kdepim/knode/knglobals.h b/kdepim/knode/knglobals.h
index 142816a4..5d279f73 100644
--- a/kdepim/knode/knglobals.h
+++ b/kdepim/knode/knglobals.h
@@ -34,7 +34,7 @@ class KNGroupManager;
 class KNArticleManager;
 class KNArticleFactory;
 class KNFolderManager;
-class QWidget;
+#include <QWidget>
 class KNFilterManager;
 class KNMainWidget;
 class KNScoringManager;
diff --git a/kdepim/knode/kngroupbrowser.h b/kdepim/knode/kngroupbrowser.h
index cb3c90e8..5108198d 100644
--- a/kdepim/knode/kngroupbrowser.h
+++ b/kdepim/knode/kngroupbrowser.h
@@ -21,9 +21,9 @@
 #include <q3listview.h>
 
 class KLineEdit;
-class QCheckBox;
-class QLabel;
-class QGridLayout;
+#include <QCheckBox>
+#include <QLabel>
+#include <QGridLayout>
 
 class KNNntpAccount;
 
diff --git a/kdepim/knode/kngrouppropdlg.h b/kdepim/knode/kngrouppropdlg.h
index c5577030..ca8afe07 100644
--- a/kdepim/knode/kngrouppropdlg.h
+++ b/kdepim/knode/kngrouppropdlg.h
@@ -17,8 +17,8 @@
 
 #include <kpagedialog.h>
 
-class QCheckBox;
-class QComboBox;
+#include <QCheckBox>
+#include <QComboBox>
 
 class KLineEdit;
 
diff --git a/kdepim/knode/knmainwidget.h b/kdepim/knode/knmainwidget.h
index 7767d56b..2fd62027 100644
--- a/kdepim/knode/knmainwidget.h
+++ b/kdepim/knode/knmainwidget.h
@@ -25,10 +25,10 @@
 
 
 class Q3ListViewItem;
-class QLineEdit;
-class QSplitter;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QLineEdit>
+#include <QSplitter>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class K3ListView;
 class KAction;
 class KToggleAction;
diff --git a/kdepim/knode/knnntpaccount.h b/kdepim/knode/knnntpaccount.h
index 131a72d8..94276e43 100644
--- a/kdepim/knode/knnntpaccount.h
+++ b/kdepim/knode/knnntpaccount.h
@@ -22,7 +22,7 @@
 #include <QObject>
 #include <QDate>
 
-class QTimer;
+#include <QTimer>
 class KNNntpAccount;
 namespace KNode {
   class Cleanup;
diff --git a/kdepim/knode/knrangefilter.h b/kdepim/knode/knrangefilter.h
index cc906a5a..217c9ebd 100644
--- a/kdepim/knode/knrangefilter.h
+++ b/kdepim/knode/knrangefilter.h
@@ -17,10 +17,10 @@
 
 #include <QGroupBox>
 
-class QLabel;
+#include <QLabel>
 class KIntSpinBox;
-class QComboBox;
-class QCheckBox;
+#include <QComboBox>
+#include <QCheckBox>
 
 class KConfig;
 
diff --git a/kdepim/knode/knsearchdialog.h b/kdepim/knode/knsearchdialog.h
index 2d5b6e70..102837a6 100644
--- a/kdepim/knode/knsearchdialog.h
+++ b/kdepim/knode/knsearchdialog.h
@@ -17,8 +17,8 @@
 
 #include <kdialog.h>
 
-class QCloseEvent;
-class QCheckBox;
+#include <QCloseEvent>
+#include <QCheckBox>
 class KNFilterConfigWidget;
 class KNArticleFilter;
 
diff --git a/kdepim/knode/knstatusfilter.h b/kdepim/knode/knstatusfilter.h
index 3c1fe709..678b3208 100644
--- a/kdepim/knode/knstatusfilter.h
+++ b/kdepim/knode/knstatusfilter.h
@@ -21,7 +21,7 @@
 #include <QComboBox>
 #include <QBitArray>
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace KNode {
 
diff --git a/kdepim/knode/knstringfilter.h b/kdepim/knode/knstringfilter.h
index e47382ee..fc1671cd 100644
--- a/kdepim/knode/knstringfilter.h
+++ b/kdepim/knode/knstringfilter.h
@@ -17,8 +17,8 @@
 
 #include <QGroupBox>
 
-class QCheckBox;
-class QComboBox;
+#include <QCheckBox>
+#include <QComboBox>
 class KConfigGroup;
 class KLineEdit;
 class KConfig;
diff --git a/kdepim/knode/kscoring.h b/kdepim/knode/kscoring.h
index 6deaff5c..f299b643 100644
--- a/kdepim/knode/kscoring.h
+++ b/kdepim/knode/kscoring.h
@@ -35,10 +35,10 @@
 
 #include <unistd.h>
 
-class QDomNode;
-class QDomDocument;
-class QDomElement;
-class QLabel;
+#include <QDomNode>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QLabel>
 
 namespace KPIM {
 
diff --git a/kdepim/knode/kscoringeditor.h b/kdepim/knode/kscoringeditor.h
index f8baa12f..9005b934 100644
--- a/kdepim/knode/kscoringeditor.h
+++ b/kdepim/knode/kscoringeditor.h
@@ -35,11 +35,11 @@ class KComboBox;
 class KColorCombo;
 class KLineEdit;
 class KIntSpinBox;
-class QLabel;
+#include <QLabel>
 class Q3ListBoxItem;
-class QPushButton;
-class QCheckBox;
-class QRadioButton;
+#include <QPushButton>
+#include <QCheckBox>
+#include <QRadioButton>
 class ScoreEditWidget;
 
 namespace KPIM {
diff --git a/kdepim/knode/treewidget.h b/kdepim/knode/treewidget.h
index 2880b3db..eaf35772 100644
--- a/kdepim/knode/treewidget.h
+++ b/kdepim/knode/treewidget.h
@@ -35,7 +35,7 @@ class KMenu;
 class KConfig;
 class KConfigGroup;
 
-class QAction;
+#include <QAction>
 
 namespace KPIM
 {
diff --git a/kdepim/knode/utilities.h b/kdepim/knode/utilities.h
index d5017fa5..9d9d814e 100644
--- a/kdepim/knode/utilities.h
+++ b/kdepim/knode/utilities.h
@@ -18,7 +18,7 @@
 #include <kurl.h>
 
 class KTemporaryFile;
-class QFile;
+#include <QFile>
 
 //*****************************************************************************
 // utility classes
diff --git a/kdepim/knode/utils/locale.h b/kdepim/knode/utils/locale.h
index 1179f485..8a6f942f 100644
--- a/kdepim/knode/utils/locale.h
+++ b/kdepim/knode/utils/locale.h
@@ -26,9 +26,9 @@
 #include "knode_export.h"
 #include "kngroup.h"
 
-class QByteArray;
-class QString;
-class QStringList;
+#include <QByteArray>
+#include <QString>
+#include <QStringList>
 
 namespace KNode {
 
diff --git a/kdepim/knotes/apps/knotesapp.h b/kdepim/knotes/apps/knotesapp.h
index cead6722..22fa2a29 100644
--- a/kdepim/knotes/apps/knotesapp.h
+++ b/kdepim/knotes/apps/knotesapp.h
@@ -47,7 +47,7 @@ namespace DNSSD {
 class PublicService;
 }
 class KJob;
-class QModelIndex;
+#include <QModelIndex>
 class KNotesApp
         : public QWidget, public KSessionManager, virtual public KXMLGUIClient
 {
diff --git a/kdepim/knotes/configdialog/knotecollectionconfigwidget.h b/kdepim/knotes/configdialog/knotecollectionconfigwidget.h
index 00c8a666..1f3944cd 100644
--- a/kdepim/knotes/configdialog/knotecollectionconfigwidget.h
+++ b/kdepim/knotes/configdialog/knotecollectionconfigwidget.h
@@ -24,7 +24,7 @@
 #include <Akonadi/Collection>
 #include <QModelIndex>
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 class KRecursiveFilterProxyModel;
 namespace Akonadi {
 class EntityTreeModel;
@@ -32,7 +32,7 @@ class ChangeRecorder;
 class CollectionRequester;
 class EntityTreeView;
 }
-class QTreeView;
+#include <QTreeView>
 class KCheckableProxyModel;
 class KJob;
 class KPushButton;
diff --git a/kdepim/knotes/configdialog/knotedisplayconfigwidget.h b/kdepim/knotes/configdialog/knotedisplayconfigwidget.h
index 2fe13474..c4e1babf 100644
--- a/kdepim/knotes/configdialog/knotedisplayconfigwidget.h
+++ b/kdepim/knotes/configdialog/knotedisplayconfigwidget.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 class KColorButton;
-class QCheckBox;
+#include <QCheckBox>
 class KIntNumInput;
 namespace NoteShared {
 class NoteDisplayAttribute;
diff --git a/kdepim/knotes/configdialog/knoteeditorconfigwidget.h b/kdepim/knotes/configdialog/knoteeditorconfigwidget.h
index 996e11e7..d6e8d744 100644
--- a/kdepim/knotes/configdialog/knoteeditorconfigwidget.h
+++ b/kdepim/knotes/configdialog/knoteeditorconfigwidget.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 class KIntNumInput;
-class QCheckBox;
+#include <QCheckBox>
 class KFontRequester;
 namespace NoteShared {
 class NoteDisplayAttribute;
diff --git a/kdepim/knotes/configdialog/knotesimpleconfigdialog.h b/kdepim/knotes/configdialog/knotesimpleconfigdialog.h
index b8f25121..8e2e1244 100644
--- a/kdepim/knotes/configdialog/knotesimpleconfigdialog.h
+++ b/kdepim/knotes/configdialog/knotesimpleconfigdialog.h
@@ -21,7 +21,7 @@
 #include "knotes_export.h"
 #include <Akonadi/Item>
 #include <KDialog>
-class QTabWidget;
+#include <QTabWidget>
 class KNoteEditorConfigWidget;
 class KNoteDisplayConfigWidget;
 class KNOTES_EXPORT KNoteSimpleConfigDialog : public KDialog
diff --git a/kdepim/knotes/dialog/knoteselectednotesdialog.h b/kdepim/knotes/dialog/knoteselectednotesdialog.h
index b9348fb0..a4f645b9 100644
--- a/kdepim/knotes/dialog/knoteselectednotesdialog.h
+++ b/kdepim/knotes/dialog/knoteselectednotesdialog.h
@@ -20,7 +20,7 @@
 
 #include <KDialog>
 #include <Akonadi/Item>
-class QListWidget;
+#include <QListWidget>
 class KNote;
 class KNoteSelectedNotesDialog : public KDialog
 {
diff --git a/kdepim/knotes/finddialog/knotefinddialog.h b/kdepim/knotes/finddialog/knotefinddialog.h
index 15fb8b7a..d0e24fc8 100644
--- a/kdepim/knotes/finddialog/knotefinddialog.h
+++ b/kdepim/knotes/finddialog/knotefinddialog.h
@@ -23,9 +23,9 @@
 #include "knotes_export.h"
 class KPushButton;
 class KLineEdit;
-class QListWidgetItem;
-class QListWidget;
-class QLabel;
+#include <QListWidgetItem>
+#include <QListWidget>
+#include <QLabel>
 namespace NoteShared {
 class NoteListWidget;
 }
diff --git a/kdepim/knotes/knoteedit.h b/kdepim/knotes/knoteedit.h
index 8f8cb415..64c4619a 100644
--- a/kdepim/knotes/knoteedit.h
+++ b/kdepim/knotes/knoteedit.h
@@ -27,7 +27,7 @@
 
 #include "pimcommon/widgets/customtextedit.h"
 
-class QFont;
+#include <QFont>
 
 class KAction;
 class KActionCollection;
diff --git a/kdepim/knotes/notes/knote.h b/kdepim/knotes/notes/knote.h
index 86bec661..d0e7097d 100644
--- a/kdepim/knotes/notes/knote.h
+++ b/kdepim/knotes/notes/knote.h
@@ -32,9 +32,9 @@
 
 class KNoteDisplaySettings;
 
-class QLabel;
-class QLayout;
-class QSizeGrip;
+#include <QLabel>
+#include <QLayout>
+#include <QSizeGrip>
 
 class KMenu;
 class KNoteButton;
diff --git a/kdepim/knotes/print/knoteprinter.h b/kdepim/knotes/print/knoteprinter.h
index ff44f1dc..8e519a68 100644
--- a/kdepim/knotes/print/knoteprinter.h
+++ b/kdepim/knotes/print/knoteprinter.h
@@ -28,7 +28,7 @@ namespace Grantlee {
 class Engine;
 }
 
-class QPrinter;
+#include <QPrinter>
 class KNotePrintObject;
 class KNOTES_EXPORT KNotePrinter
 {
diff --git a/kdepim/knotes/print/knoteprintselectednotesdialog.h b/kdepim/knotes/print/knoteprintselectednotesdialog.h
index 38fc51e0..1cf28778 100644
--- a/kdepim/knotes/print/knoteprintselectednotesdialog.h
+++ b/kdepim/knotes/print/knoteprintselectednotesdialog.h
@@ -20,7 +20,7 @@
 
 #include <KDialog>
 #include <Akonadi/Item>
-class QListWidget;
+#include <QListWidget>
 class KNote;
 class KNotePrintObject;
 class KNotePrintSelectThemeComboBox;
diff --git a/kdepim/knotes/settings/globalsettings.h b/kdepim/knotes/settings/globalsettings.h
index 9fbc5dfe..a3baee4c 100644
--- a/kdepim/knotes/settings/globalsettings.h
+++ b/kdepim/knotes/settings/globalsettings.h
@@ -21,7 +21,7 @@
 
 #include "knotesglobalconfig.h"
 #include "knotes_export.h"
-class QTimer;
+#include <QTimer>
 
 class KNOTES_EXPORT GlobalSettings : public KNotesGlobalConfig
 {
diff --git a/kdepim/knotes/tests/apps/knoteakonadinote.h b/kdepim/knotes/tests/apps/knoteakonadinote.h
index 8f870237..a7b64616 100644
--- a/kdepim/knotes/tests/apps/knoteakonadinote.h
+++ b/kdepim/knotes/tests/apps/knoteakonadinote.h
@@ -19,8 +19,8 @@
 #define KNOTEAKONADINOTE_H
 
 #include <QFrame>
-class QTextEdit;
-class QLineEdit;
+#include <QTextEdit>
+#include <QLineEdit>
 class KNoteAkonadiNote : public QFrame
 {
     Q_OBJECT
diff --git a/kdepim/knotes/tests/apps/knotesakonadiapp.h b/kdepim/knotes/tests/apps/knotesakonadiapp.h
index 0bdc851c..c67c92db 100644
--- a/kdepim/knotes/tests/apps/knotesakonadiapp.h
+++ b/kdepim/knotes/tests/apps/knotesakonadiapp.h
@@ -27,7 +27,7 @@ namespace NoteShared {
 class NotesChangeRecorder;
 class NotesAkonadiTreeModel;
 }
-class QModelIndex;
+#include <QModelIndex>
 class KNoteAkonadiNote;
 class KNotesAkonadiApp : public QWidget
 {
diff --git a/kdepim/kontact/plugins/kmail/kcmkmailsummary.h b/kdepim/kontact/plugins/kmail/kcmkmailsummary.h
index e0127294..7dc9e2a1 100644
--- a/kdepim/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kdepim/kontact/plugins/kmail/kcmkmailsummary.h
@@ -33,7 +33,7 @@ namespace Akonadi {
 class ETMViewStateSaver;
 }
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace PimCommon {
 class CheckedCollectionWidget;
diff --git a/kdepim/kontact/plugins/kmail/summarywidget.h b/kdepim/kontact/plugins/kmail/summarywidget.h
index 325b25bb..0b4dee5c 100644
--- a/kdepim/kontact/plugins/kmail/summarywidget.h
+++ b/kdepim/kontact/plugins/kmail/summarywidget.h
@@ -45,10 +45,10 @@ class Plugin;
 
 class KCheckableProxyModel;
 
-class QGridLayout;
-class QItemSelectionModel;
-class QLabel;
-class QModelIndex;
+#include <QGridLayout>
+#include <QItemSelectionModel>
+#include <QLabel>
+#include <QModelIndex>
 
 class SummaryWidget : public KontactInterface::Summary
 {
diff --git a/kdepim/kontact/plugins/knotes/kcmknotessummary.h b/kdepim/kontact/plugins/knotes/kcmknotessummary.h
index 13b74d0e..0272ecdb 100644
--- a/kdepim/kontact/plugins/knotes/kcmknotessummary.h
+++ b/kdepim/kontact/plugins/knotes/kcmknotessummary.h
@@ -26,7 +26,7 @@ namespace Akonadi {
 class ETMViewStateSaver;
 }
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace PimCommon {
 class CheckedCollectionWidget;
diff --git a/kdepim/kontact/plugins/knotes/summarywidget.h b/kdepim/kontact/plugins/knotes/summarywidget.h
index b9ff414a..656969d2 100644
--- a/kdepim/kontact/plugins/knotes/summarywidget.h
+++ b/kdepim/kontact/plugins/knotes/summarywidget.h
@@ -29,9 +29,9 @@
 #include <KontactInterface/Summary>
 #include <KViewStateMaintainer>
 #include <Akonadi/Item>
-class QGridLayout;
-class QItemSelectionModel;
-class QLabel;
+#include <QGridLayout>
+#include <QItemSelectionModel>
+#include <QLabel>
 namespace KontactInterface {
 class Plugin;
 }
diff --git a/kdepim/kontact/plugins/korganizer/apptsummarywidget.h b/kdepim/kontact/plugins/korganizer/apptsummarywidget.h
index 82c292ba..b9b94741 100644
--- a/kdepim/kontact/plugins/korganizer/apptsummarywidget.h
+++ b/kdepim/kontact/plugins/korganizer/apptsummarywidget.h
@@ -37,9 +37,9 @@ namespace Akonadi {
   class IncidenceChanger;
 }
 
-class QDate;
-class QGridLayout;
-class QLabel;
+#include <QDate>
+#include <QGridLayout>
+#include <QLabel>
 
 class ApptSummaryWidget : public KontactInterface::Summary
 {
diff --git a/kdepim/kontact/plugins/korganizer/summaryeventinfo.h b/kdepim/kontact/plugins/korganizer/summaryeventinfo.h
index a9bb7757..142997b4 100644
--- a/kdepim/kontact/plugins/korganizer/summaryeventinfo.h
+++ b/kdepim/kontact/plugins/korganizer/summaryeventinfo.h
@@ -32,7 +32,7 @@
 #include <QList>
 #include <QString>
 
-class QDate;
+#include <QDate>
 
 class SummaryEventInfo
 {
diff --git a/kdepim/kontact/plugins/korganizer/todosummarywidget.h b/kdepim/kontact/plugins/korganizer/todosummarywidget.h
index 971cc654..a72d696f 100644
--- a/kdepim/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kdepim/kontact/plugins/korganizer/todosummarywidget.h
@@ -39,8 +39,8 @@ namespace Akonadi {
   class IncidenceChanger;
 }
 
-class QGridLayout;
-class QLabel;
+#include <QGridLayout>
+#include <QLabel>
 
 class TodoSummaryWidget : public KontactInterface::Summary
 {
diff --git a/kdepim/kontact/plugins/planner/planner.h b/kdepim/kontact/plugins/planner/planner.h
index 81302a60..83ad842c 100644
--- a/kdepim/kontact/plugins/planner/planner.h
+++ b/kdepim/kontact/plugins/planner/planner.h
@@ -52,9 +52,9 @@ namespace KontactInterface {
   class Plugin;
 }
 
-class QGridLayout;
-class QLabel;
-class QVBoxLayout;
+#include <QGridLayout>
+#include <QLabel>
+#include <QVBoxLayout>
 
 class Planner : public KontactInterface::Summary
 {
diff --git a/kdepim/kontact/plugins/specialdates/sdsummarywidget.h b/kdepim/kontact/plugins/specialdates/sdsummarywidget.h
index 6ec3f64e..f49c94ed 100644
--- a/kdepim/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kdepim/kontact/plugins/specialdates/sdsummarywidget.h
@@ -39,9 +39,9 @@ namespace KontactInterface {
   class Plugin;
 }
 
-class QDate;
-class QGridLayout;
-class QLabel;
+#include <QDate>
+#include <QGridLayout>
+#include <QLabel>
 class SDEntry;
 class KJob;
 
diff --git a/kdepim/kontact/plugins/summary/dropwidget.h b/kdepim/kontact/plugins/summary/dropwidget.h
index 4faf0b8a..b6b1f8ad 100644
--- a/kdepim/kontact/plugins/summary/dropwidget.h
+++ b/kdepim/kontact/plugins/summary/dropwidget.h
@@ -24,8 +24,8 @@
 
 #include <QWidget>
 
-class QDragEnterEvent;
-class QDropEvent;
+#include <QDragEnterEvent>
+#include <QDropEvent>
 
 class DropWidget : public QWidget
 {
diff --git a/kdepim/kontact/plugins/summary/summaryview_part.h b/kdepim/kontact/plugins/summary/summaryview_part.h
index e5213bb6..a49967b6 100644
--- a/kdepim/kontact/plugins/summary/summaryview_part.h
+++ b/kdepim/kontact/plugins/summary/summaryview_part.h
@@ -36,9 +36,9 @@ namespace KontactInterface {
 class KAboutData;
 class KAction;
 
-class QFrame;
-class QLabel;
-class QVBoxLayout;
+#include <QFrame>
+#include <QLabel>
+#include <QVBoxLayout>
 
 class SummaryViewPart : public KParts::ReadOnlyPart
 {
diff --git a/kdepim/kontact/src/mainwindow.h b/kdepim/kontact/src/mainwindow.h
index d71b19a2..d298d80b 100644
--- a/kdepim/kontact/src/mainwindow.h
+++ b/kdepim/kontact/src/mainwindow.h
@@ -36,9 +36,9 @@ class KWebView;
 class KPluginInfo;
 class KSqueezedTextLabel;
 
-class QFrame;
-class QSplitter;
-class QStackedWidget;
+#include <QFrame>
+#include <QSplitter>
+#include <QStackedWidget>
 
 typedef QList<KontactInterface::Plugin *> PluginList;
 typedef QList<QAction*> ActionPluginList;
diff --git a/kdepim/korgac/alarmdialog.h b/kdepim/korgac/alarmdialog.h
index 41acee6f..95a21409 100644
--- a/kdepim/korgac/alarmdialog.h
+++ b/kdepim/korgac/alarmdialog.h
@@ -49,11 +49,11 @@ class ReminderTreeItem;
 
 class KComboBox;
 
-class QDateTime;
-class QTreeWidget;
-class QTreeWidgetItem;
-class QSpinBox;
-class QVBoxLayout;
+#include <QDateTime>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QSpinBox>
+#include <QVBoxLayout>
 
 class AlarmDialog : public KDialog
 {
diff --git a/kdepim/korganizer/akonadicollectionview.h b/kdepim/korganizer/akonadicollectionview.h
index b4d34cd7..c9b3e5d1 100644
--- a/kdepim/korganizer/akonadicollectionview.h
+++ b/kdepim/korganizer/akonadicollectionview.h
@@ -40,8 +40,8 @@ namespace Akonadi {
 
 class KAction;
 class KJob;
-class QAbstractProxyModel;
-class QModelIndex;
+#include <QAbstractProxyModel>
+#include <QModelIndex>
 
 /**
  * The factory for AkonadiCollectionView instances.
diff --git a/kdepim/korganizer/calendarview.h b/kdepim/korganizer/calendarview.h
index 0e94f8c2..04199ac9 100644
--- a/kdepim/korganizer/calendarview.h
+++ b/kdepim/korganizer/calendarview.h
@@ -69,8 +69,8 @@ namespace Akonadi {
 
 class KVBox;
 
-class QSplitter;
-class QStackedWidget;
+#include <QSplitter>
+#include <QStackedWidget>
 
 using namespace KOrg;
 
diff --git a/kdepim/korganizer/datechecker.h b/kdepim/korganizer/datechecker.h
index 6ec94dc5..37833021 100644
--- a/kdepim/korganizer/datechecker.h
+++ b/kdepim/korganizer/datechecker.h
@@ -29,7 +29,7 @@
 #include <QDate>
 #include <QObject>
 
-class QTimer;
+#include <QTimer>
 
 class DateChecker: public QObject
 {
diff --git a/kdepim/korganizer/htmlexportjob.h b/kdepim/korganizer/htmlexportjob.h
index 9436fd3b..62cb70e0 100644
--- a/kdepim/korganizer/htmlexportjob.h
+++ b/kdepim/korganizer/htmlexportjob.h
@@ -29,7 +29,7 @@
 
 #include <KJob>
 
-class QTextStream;
+#include <QTextStream>
 
 namespace KOrg {
 
diff --git a/kdepim/korganizer/interfaces/korganizer/mainwindow.h b/kdepim/korganizer/interfaces/korganizer/mainwindow.h
index 8d063fcf..92cc4742 100644
--- a/kdepim/korganizer/interfaces/korganizer/mainwindow.h
+++ b/kdepim/korganizer/interfaces/korganizer/mainwindow.h
@@ -31,7 +31,7 @@ class KUrl;
 class KXMLGUIClient;
 class KXMLGUIFactory;
 
-class QWidget;
+#include <QWidget>
 
 namespace KOrg {
 
diff --git a/kdepim/korganizer/kcmdesignerfields.h b/kdepim/korganizer/kcmdesignerfields.h
index 6fec76d4..fe7644a7 100644
--- a/kdepim/korganizer/kcmdesignerfields.h
+++ b/kdepim/korganizer/kcmdesignerfields.h
@@ -27,10 +27,10 @@
 
 class KComponentData;
 
-class QLabel;
-class QPushButton;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QLabel>
+#include <QPushButton>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 class KCMDesignerFields : public KCModule
 {
diff --git a/kdepim/korganizer/kdatenavigator.h b/kdepim/korganizer/kdatenavigator.h
index 2ce768e5..0e9f63ab 100644
--- a/kdepim/korganizer/kdatenavigator.h
+++ b/kdepim/korganizer/kdatenavigator.h
@@ -38,7 +38,7 @@ namespace Akonadi {
   class Item;
 }
 
-class QLabel;
+#include <QLabel>
 
 class KDateNavigator: public QFrame
 {
diff --git a/kdepim/korganizer/koeventview.h b/kdepim/korganizer/koeventview.h
index 5be96d92..39d9454e 100644
--- a/kdepim/korganizer/koeventview.h
+++ b/kdepim/korganizer/koeventview.h
@@ -35,7 +35,7 @@ namespace Akonadi {
 
 class KOEventPopupMenu;
 
-class QMenu;
+#include <QMenu>
 
 /**
   KOEventView is the abstract base class from which all other
diff --git a/kdepim/korganizer/kohelper.h b/kdepim/korganizer/kohelper.h
index c83e448e..bc66738e 100644
--- a/kdepim/korganizer/kohelper.h
+++ b/kdepim/korganizer/kohelper.h
@@ -36,8 +36,8 @@ namespace Akonadi {
   class Item;
 }
 
-class QColor;
-class QDate;
+#include <QColor>
+#include <QDate>
 
 // Provides static methods that are useful to all views.
 
diff --git a/kdepim/korganizer/koprefsdialog.h b/kdepim/korganizer/koprefsdialog.h
index 03a49859..696d213e 100644
--- a/kdepim/korganizer/koprefsdialog.h
+++ b/kdepim/korganizer/koprefsdialog.h
@@ -38,7 +38,7 @@ namespace Akonadi {
   class CollectionComboBox;
 }
 
-class QRadioButton;
+#include <QRadioButton>
 
 class KCM_KORGANIZER_EXPORT KOPrefsDialogMain : public KPIM::KPrefsModule
 {
diff --git a/kdepim/korganizer/navigatorbar.h b/kdepim/korganizer/navigatorbar.h
index 60742c0f..12a5bbc7 100644
--- a/kdepim/korganizer/navigatorbar.h
+++ b/kdepim/korganizer/navigatorbar.h
@@ -28,7 +28,7 @@
 
 #include <QWidget>
 
-class QToolButton;
+#include <QToolButton>
 
 class NavigatorBar: public QWidget
 {
diff --git a/kdepim/korganizer/plugins/datenums/configdialog.h b/kdepim/korganizer/plugins/datenums/configdialog.h
index 6ef46780..54d7954a 100644
--- a/kdepim/korganizer/plugins/datenums/configdialog.h
+++ b/kdepim/korganizer/plugins/datenums/configdialog.h
@@ -23,7 +23,7 @@
 
 #include <KDialog>
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 class ConfigDialog : public KDialog
 {
diff --git a/kdepim/korganizer/plugins/hebrew/configdialog.h b/kdepim/korganizer/plugins/hebrew/configdialog.h
index da92a255..9f52460c 100644
--- a/kdepim/korganizer/plugins/hebrew/configdialog.h
+++ b/kdepim/korganizer/plugins/hebrew/configdialog.h
@@ -24,7 +24,7 @@
 
 #include <KDialog>
 
-class QCheckBox;
+#include <QCheckBox>
 
 /**
   @author Jonathan Singer
diff --git a/kdepim/korganizer/plugins/picoftheday/configdialog.h b/kdepim/korganizer/plugins/picoftheday/configdialog.h
index 1b61c703..ef8801e0 100644
--- a/kdepim/korganizer/plugins/picoftheday/configdialog.h
+++ b/kdepim/korganizer/plugins/picoftheday/configdialog.h
@@ -23,7 +23,7 @@
 
 #include <KDialog>
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 class ConfigDialog : public KDialog
 {
diff --git a/kdepim/korganizer/views/listview/kolistview.h b/kdepim/korganizer/views/listview/kolistview.h
index cf080c2d..ac9784df 100644
--- a/kdepim/korganizer/views/listview/kolistview.h
+++ b/kdepim/korganizer/views/listview/kolistview.h
@@ -39,7 +39,7 @@ namespace Akonadi {
   class IncidenceChanger;
 }
 
-class QModelIndex;
+#include <QModelIndex>
 
 class KOListView : public KOEventView
 {
diff --git a/kdepim/ksendemail/mailerservice.h b/kdepim/ksendemail/mailerservice.h
index 4eb4cbc8..0faa6d8e 100644
--- a/kdepim/ksendemail/mailerservice.h
+++ b/kdepim/ksendemail/mailerservice.h
@@ -22,7 +22,7 @@
 #ifndef MAILERSERVICE_H
 #define MAILERSERVICE_H
 
-class QEventLoop;
+#include <QEventLoop>
 
 #include <QObject>
 
diff --git a/kdepim/ktimetracker/desktoptracker.h b/kdepim/ktimetracker/desktoptracker.h
index a1f76f81..89f9b1e7 100644
--- a/kdepim/ktimetracker/desktoptracker.h
+++ b/kdepim/ktimetracker/desktoptracker.h
@@ -29,7 +29,7 @@
 #include "desktoplist.h"
 
 class Task;
-class QTimer;
+#include <QTimer>
 
 typedef QVector<Task *> TaskVector;
 const int maxDesktops = 20;
diff --git a/kdepim/ktimetracker/focusdetector.h b/kdepim/ktimetracker/focusdetector.h
index 35da1b8a..cf9c800e 100644
--- a/kdepim/ktimetracker/focusdetector.h
+++ b/kdepim/ktimetracker/focusdetector.h
@@ -28,7 +28,7 @@
 
 #include <config-ktimetracker.h> // HAVE_LIBXSS
 
-class QTimer;
+#include <QTimer>
 
 /**
   Keep track of what window has the focus.
diff --git a/kdepim/ktimetracker/idletimedetector.h b/kdepim/ktimetracker/idletimedetector.h
index 524f739e..fd6fb663 100644
--- a/kdepim/ktimetracker/idletimedetector.h
+++ b/kdepim/ktimetracker/idletimedetector.h
@@ -28,7 +28,7 @@
 #include <QObject>
 #include <config-ktimetracker.h> // HAVE_LIBXSS
 
-class QTimer;
+#include <QTimer>
 
 #if defined(HAVE_LIBXSS) && defined(Q_WS_X11)
  #include <X11/Xlib.h>
diff --git a/kdepim/ktimetracker/ktimetrackerpart.h b/kdepim/ktimetracker/ktimetrackerpart.h
index 95da43b9..b887f877 100644
--- a/kdepim/ktimetracker/ktimetrackerpart.h
+++ b/kdepim/ktimetracker/ktimetrackerpart.h
@@ -27,7 +27,7 @@
 #include "reportcriteria.h"
 
 class TrayIcon;
-class QWidget;
+#include <QWidget>
 class TimetrackerWidget;
 
 /**
diff --git a/kdepim/ktimetracker/mainwindow.h b/kdepim/ktimetracker/mainwindow.h
index 6991f994..ca1eb530 100644
--- a/kdepim/ktimetracker/mainwindow.h
+++ b/kdepim/ktimetracker/mainwindow.h
@@ -30,8 +30,8 @@ class KAccel;
 class KAccelMenuWatch;
 class KAction;
 class TrayIcon;
-class QPoint;
-class QString;
+#include <QPoint>
+#include <QString>
 
 class Task;
 class TimetrackerWidget;
diff --git a/kdepim/ktimetracker/new/mainwindow.h b/kdepim/ktimetracker/new/mainwindow.h
index bbb483d7..466c806f 100644
--- a/kdepim/ktimetracker/new/mainwindow.h
+++ b/kdepim/ktimetracker/new/mainwindow.h
@@ -31,8 +31,8 @@ class KAccel;
 class KAccelMenuWatch;
 class KAction;
 class TrayIcon;
-class QPoint;
-class QString;
+#include <QPoint>
+#include <QString>
 
 class Task;
 class TimetrackerWidget;
diff --git a/kdepim/ktimetracker/reportcriteria.h b/kdepim/ktimetracker/reportcriteria.h
index 8c37dc71..348e2174 100644
--- a/kdepim/ktimetracker/reportcriteria.h
+++ b/kdepim/ktimetracker/reportcriteria.h
@@ -26,7 +26,7 @@
 #include <QDateTime>
 #include <kurl.h>
 
-class QString;
+#include <QString>
 
 /**
  Stores entries from export dialog.
diff --git a/kdepim/ktimetracker/task.h b/kdepim/ktimetracker/task.h
index 7f99e2c4..75235006 100644
--- a/kdepim/ktimetracker/task.h
+++ b/kdepim/ktimetracker/task.h
@@ -31,9 +31,9 @@
 #include <QPixmap>
 #include <QVector>
 
-class QObject;
-class QPixmap;
-class QString;
+#include <QObject>
+#include <QPixmap>
+#include <QString>
 
 class timetrackerstorage;
 
diff --git a/kdepim/ktimetracker/taskview.h b/kdepim/ktimetracker/taskview.h
index bec015a8..8cbf9d58 100644
--- a/kdepim/ktimetracker/taskview.h
+++ b/kdepim/ktimetracker/taskview.h
@@ -31,10 +31,10 @@
 #include "timetrackerstorage.h"
 #include "reportcriteria.h"
 
-class QMouseEvent;
-class QString;
-class QTableWidget;
-class QTimer;
+#include <QMouseEvent>
+#include <QString>
+#include <QTableWidget>
+#include <QTimer>
 
 class DesktopTracker;
 class IdleTimeDetector;
diff --git a/kdepim/ktimetracker/timekard.h b/kdepim/ktimetracker/timekard.h
index d0850682..f395d7f7 100644
--- a/kdepim/ktimetracker/timekard.h
+++ b/kdepim/ktimetracker/timekard.h
@@ -29,8 +29,8 @@
 
 #include "reportcriteria.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class Task;
 class TaskView;
diff --git a/kdepim/ktimetracker/timetrackerstorage.h b/kdepim/ktimetracker/timetrackerstorage.h
index 79f25c72..b4494e51 100644
--- a/kdepim/ktimetracker/timetrackerstorage.h
+++ b/kdepim/ktimetracker/timetrackerstorage.h
@@ -33,7 +33,7 @@
 #include <KCalCore/Todo>
 #include <KCalCore/Event>
 
-class QDateTime;
+#include <QDateTime>
 class Task;
 class TaskView;
 class HistoryEvent;
diff --git a/kdepim/ktimetracker/tray.h b/kdepim/ktimetracker/tray.h
index 0cae3a97..7631cdb9 100644
--- a/kdepim/ktimetracker/tray.h
+++ b/kdepim/ktimetracker/tray.h
@@ -31,7 +31,7 @@
 #include "task.h"
 #include "ktimetrackerpart.h"
 
-class QTimer;
+#include <QTimer>
 class MainWindow;
 
 class TrayIcon : public KStatusNotifierItem
diff --git a/kdepim/ktimetracker/treeviewheadercontextmenu.h b/kdepim/ktimetracker/treeviewheadercontextmenu.h
index 77d8d9e9..fca7fc98 100644
--- a/kdepim/ktimetracker/treeviewheadercontextmenu.h
+++ b/kdepim/ktimetracker/treeviewheadercontextmenu.h
@@ -27,8 +27,8 @@
 #include <QHash>
 #include <QVector>
 
-class QAction;
-class QTreeView;
+#include <QAction>
+#include <QTreeView>
 
 class KMenu;
 
diff --git a/kdepim/ktnef/attachpropertydialog.h b/kdepim/ktnef/attachpropertydialog.h
index a318728e..5c8075b1 100644
--- a/kdepim/ktnef/attachpropertydialog.h
+++ b/kdepim/ktnef/attachpropertydialog.h
@@ -31,8 +31,8 @@ namespace KTnef {
 }
 using namespace KTnef;
 
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 class AttachPropertyDialog : public KDialog
 {
diff --git a/kdepim/ktnef/ktnefmain.h b/kdepim/ktnef/ktnefmain.h
index 174f0976..24fced34 100644
--- a/kdepim/ktnef/ktnefmain.h
+++ b/kdepim/ktnef/ktnefmain.h
@@ -19,8 +19,8 @@
 
 #include <KXmlGuiWindow>
 
-class QContextMenuEvent;
-class QTreeWidgetItem;
+#include <QContextMenuEvent>
+#include <QTreeWidgetItem>
 class KRecentFilesAction;
 class KUrl;
 
diff --git a/kdepim/ktnef/messagepropertydialog.h b/kdepim/ktnef/messagepropertydialog.h
index 1aa1e7ea..084b66b4 100644
--- a/kdepim/ktnef/messagepropertydialog.h
+++ b/kdepim/ktnef/messagepropertydialog.h
@@ -24,7 +24,7 @@ namespace KTnef {
 }
 using namespace KTnef;
 
-class QTreeWidget;
+#include <QTreeWidget>
 
 class MessagePropertyDialog : public KDialog
 {
diff --git a/kdepim/ktnef/qwmf.h b/kdepim/ktnef/qwmf.h
index 7baaf762..02193b28 100644
--- a/kdepim/ktnef/qwmf.h
+++ b/kdepim/ktnef/qwmf.h
@@ -27,8 +27,8 @@
 #include <QImage>
 #include <QRect>
 
-class QBuffer;
-class QString;
+#include <QBuffer>
+#include <QString>
 class WmfCmd;
 class WinObjHandle;
 struct WmfPlaceableHeader;
diff --git a/kdepim/libkdepim/addressline/addresseelineedit.h b/kdepim/libkdepim/addressline/addresseelineedit.h
index 4ac30956..d1272bcb 100644
--- a/kdepim/libkdepim/addressline/addresseelineedit.h
+++ b/kdepim/libkdepim/addressline/addresseelineedit.h
@@ -33,12 +33,12 @@
 
 #include <KLineEdit>
 
-class QDropEvent;
-class QEvent;
-class QKeyEvent;
-class QMenu;
-class QMouseEvent;
-class QObject;
+#include <QDropEvent>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QObject>
 
 namespace Akonadi {
 class Item;
diff --git a/kdepim/libkdepim/addressline/completionordereditor.h b/kdepim/libkdepim/addressline/completionordereditor.h
index a6750968..ded8faae 100644
--- a/kdepim/libkdepim/addressline/completionordereditor.h
+++ b/kdepim/libkdepim/addressline/completionordereditor.h
@@ -37,9 +37,9 @@
 #include <KDE/KDialog>
 
 class KPushButton;
-class QAbstractItemModel;
-class QModelIndex;
-class QTreeWidget;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QTreeWidget>
 
 namespace KLDAP {
 class LdapClientSearch;
diff --git a/kdepim/libkdepim/addressline/recentaddresses.h b/kdepim/libkdepim/addressline/recentaddresses.h
index 65abe079..60a359b7 100644
--- a/kdepim/libkdepim/addressline/recentaddresses.h
+++ b/kdepim/libkdepim/addressline/recentaddresses.h
@@ -36,7 +36,7 @@
 #include <QStringList>
 class KConfig;
 class KPushButton;
-class QListWidget;
+#include <QListWidget>
 class KLineEdit;
 
 namespace KPIM {
diff --git a/kdepim/libkdepim/ldap/kcmldap_p.h b/kdepim/libkdepim/ldap/kcmldap_p.h
index e49fbb92..6bc02ef7 100644
--- a/kdepim/libkdepim/ldap/kcmldap_p.h
+++ b/kdepim/libkdepim/ldap/kcmldap_p.h
@@ -25,10 +25,10 @@
 
 #include <kcmodule.h>
 
-class QListWidget;
-class QListWidgetItem;
-class QPushButton;
-class QToolButton;
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QToolButton>
 
 namespace KLDAP {
 class LdapClientSearchConfig;
diff --git a/kdepim/libkdepim/ldap/ldapsearchdialog.h b/kdepim/libkdepim/ldap/ldapsearchdialog.h
index a8ef6379..4baa93a0 100644
--- a/kdepim/libkdepim/ldap/ldapsearchdialog.h
+++ b/kdepim/libkdepim/ldap/ldapsearchdialog.h
@@ -29,7 +29,7 @@
 #include <kabc/addressee.h>
 #include <kdialog.h>
 
-class QCloseEvent;
+#include <QCloseEvent>
 
 namespace KLDAP {
 
diff --git a/kdepim/libkdepim/misc/uistatesaver.h b/kdepim/libkdepim/misc/uistatesaver.h
index b71470b6..c92cbb75 100644
--- a/kdepim/libkdepim/misc/uistatesaver.h
+++ b/kdepim/libkdepim/misc/uistatesaver.h
@@ -22,7 +22,7 @@
 
 #include "kdepim_export.h"
 
-class QWidget;
+#include <QWidget>
 class KConfigGroup;
 
 namespace KPIM {
diff --git a/kdepim/libkdepim/prefs/kprefsdialog.h b/kdepim/libkdepim/prefs/kprefsdialog.h
index ef1bef46..35c1c97a 100644
--- a/kdepim/libkdepim/prefs/kprefsdialog.h
+++ b/kdepim/libkdepim/prefs/kprefsdialog.h
@@ -42,12 +42,12 @@ class KDateComboBox;
 class KTimeComboBox;
 class KUrlRequester;
 
-class QCheckBox;
-class QLabel;
-class QSpinBox;
-class QTimeEdit;
-class QButtonGroup;
-class QGroupBox;
+#include <QCheckBox>
+#include <QLabel>
+#include <QSpinBox>
+#include <QTimeEdit>
+#include <QButtonGroup>
+#include <QGroupBox>
 
 namespace KPIM {
 
diff --git a/kdepim/libkdepim/progresswidget/progressdialog.h b/kdepim/libkdepim/progresswidget/progressdialog.h
index 526d2a39..93243056 100644
--- a/kdepim/libkdepim/progresswidget/progressdialog.h
+++ b/kdepim/libkdepim/progresswidget/progressdialog.h
@@ -43,10 +43,10 @@
 #include <QMap>
 #include <KVBox>
 
-class QProgressBar;
-class QFrame;
-class QLabel;
-class QPushButton;
+#include <QProgressBar>
+#include <QFrame>
+#include <QLabel>
+#include <QPushButton>
 
 namespace KPIM {
 class TransactionItem;
diff --git a/kdepim/libkdepim/progresswidget/statusbarprogresswidget.h b/kdepim/libkdepim/progresswidget/statusbarprogresswidget.h
index b890ac8c..c429a108 100644
--- a/kdepim/libkdepim/progresswidget/statusbarprogresswidget.h
+++ b/kdepim/libkdepim/progresswidget/statusbarprogresswidget.h
@@ -41,12 +41,12 @@
 
 #include <QFrame>
 
-class QEvent;
-class QProgressBar;
-class QPushButton;
-class QStackedWidget;
-class QLabel;
-class QTimer;
+#include <QEvent>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QTimer>
 
 namespace KPIM {
 class SSLLabel;
diff --git a/kdepim/libkdepim/widgets/customlogwidget.h b/kdepim/libkdepim/widgets/customlogwidget.h
index fb1e7f51..a7c4b931 100644
--- a/kdepim/libkdepim/widgets/customlogwidget.h
+++ b/kdepim/libkdepim/widgets/customlogwidget.h
@@ -22,7 +22,7 @@
 #include <QStyledItemDelegate>
 #include <QListWidget>
 
-class QTextDocument;
+#include <QTextDocument>
 
 namespace KPIM {
 class LogItemDelegate : public QStyledItemDelegate
diff --git a/kdepim/libkdepim/widgets/overlaywidget.h b/kdepim/libkdepim/widgets/overlaywidget.h
index 7ef837d4..ed86d84b 100644
--- a/kdepim/libkdepim/widgets/overlaywidget.h
+++ b/kdepim/libkdepim/widgets/overlaywidget.h
@@ -34,8 +34,8 @@
 
 #include <KHBox>
 
-class QResizeEvent;
-class QEvent;
+#include <QResizeEvent>
+#include <QEvent>
 
 namespace KPIM {
 
diff --git a/kdepim/libkdepim/widgets/spellchecklineedit.h b/kdepim/libkdepim/widgets/spellchecklineedit.h
index 5f2157b1..7540f2c2 100644
--- a/kdepim/libkdepim/widgets/spellchecklineedit.h
+++ b/kdepim/libkdepim/widgets/spellchecklineedit.h
@@ -32,7 +32,7 @@
 
 #include <KTextEdit>
 
-class QMimeData;
+#include <QMimeData>
 namespace KPIM {
 
 class KDEPIM_EXPORT SpellCheckLineEdit : public KTextEdit
diff --git a/kdepim/libkdepimdbusinterfaces/urihandler.h b/kdepim/libkdepimdbusinterfaces/urihandler.h
index 3b44370f..b1f74bb9 100644
--- a/kdepim/libkdepimdbusinterfaces/urihandler.h
+++ b/kdepim/libkdepimdbusinterfaces/urihandler.h
@@ -26,7 +26,7 @@
 
 #include "kdepimdbusinterfaces_export.h"
 #include <akonadi/item.h>
-class QString;
+#include <QString>
 
 class KDEPIMDBUSINTERFACES_EXPORT UriHandler
 {
diff --git a/kdepim/libkleo/backends/chiasmus/chiasmusbackend.h b/kdepim/libkleo/backends/chiasmus/chiasmusbackend.h
index a04798a6..0254d0f9 100644
--- a/kdepim/libkleo/backends/chiasmus/chiasmusbackend.h
+++ b/kdepim/libkleo/backends/chiasmus/chiasmusbackend.h
@@ -40,7 +40,7 @@
 namespace Kleo {
   class CryptoConfig;
 }
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/backends/chiasmus/symcryptrunprocessbase.h b/kdepim/libkleo/backends/chiasmus/symcryptrunprocessbase.h
index 167e7530..9562a429 100644
--- a/kdepim/libkleo/backends/chiasmus/symcryptrunprocessbase.h
+++ b/kdepim/libkleo/backends/chiasmus/symcryptrunprocessbase.h
@@ -35,7 +35,7 @@
 
 #include <kprocess.h>
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/backends/qgpgme/qgpgmebackend.h b/kdepim/libkleo/backends/qgpgme/qgpgmebackend.h
index c1a40239..9cc417e4 100644
--- a/kdepim/libkleo/backends/qgpgme/qgpgmebackend.h
+++ b/kdepim/libkleo/backends/qgpgme/qgpgmebackend.h
@@ -40,7 +40,7 @@ namespace Kleo {
   class CryptoConfig;
 }
 class QGpgMECryptoConfig;
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.h b/kdepim/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.h
index 5aaceda1..5e318ced 100644
--- a/kdepim/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.h
+++ b/kdepim/libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.h
@@ -35,7 +35,7 @@
 #define __KLEO_QGPGMEPROGRESSTOKENMAPPER_H__
 
 
-class QString;
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/changeexpiryjob.h b/kdepim/libkleo/kleo/changeexpiryjob.h
index 77aedddd..315c3b42 100644
--- a/kdepim/libkleo/kleo/changeexpiryjob.h
+++ b/kdepim/libkleo/kleo/changeexpiryjob.h
@@ -40,7 +40,7 @@ namespace GpgME {
     class Key;
 }
 
-class QDateTime;
+#include <QDateTime>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/checksumdefinition.h b/kdepim/libkleo/kleo/checksumdefinition.h
index 6769feb8..6707086f 100644
--- a/kdepim/libkleo/kleo/checksumdefinition.h
+++ b/kdepim/libkleo/kleo/checksumdefinition.h
@@ -40,7 +40,7 @@
 
 #include <vector>
 
-class QProcess;
+#include <QProcess>
 
 namespace boost {
     template <typename T> class shared_ptr;
diff --git a/kdepim/libkleo/kleo/cryptobackend.h b/kdepim/libkleo/kleo/cryptobackend.h
index 112b0e22..97bf13f9 100644
--- a/kdepim/libkleo/kleo/cryptobackend.h
+++ b/kdepim/libkleo/kleo/cryptobackend.h
@@ -61,9 +61,9 @@ namespace Kleo {
   class SpecialJob;
 }
 
-class QString;
-class QVariant;
-template <typename T_Key, typename T_Value> class QMap;
+#include <QString>
+#include <QVariant>
+#include <QMap>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/cryptobackendfactory.h b/kdepim/libkleo/kleo/cryptobackendfactory.h
index a0137b2a..91bf0e42 100644
--- a/kdepim/libkleo/kleo/cryptobackendfactory.h
+++ b/kdepim/libkleo/kleo/cryptobackendfactory.h
@@ -43,7 +43,7 @@
 #include <vector>
 #include <map>
 
-class QString;
+#include <QString>
 class KConfig;
 
 namespace Kleo {
diff --git a/kdepim/libkleo/kleo/decryptjob.h b/kdepim/libkleo/kleo/decryptjob.h
index b037996d..bbdcf181 100644
--- a/kdepim/libkleo/kleo/decryptjob.h
+++ b/kdepim/libkleo/kleo/decryptjob.h
@@ -37,8 +37,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/kleo/decryptverifyjob.h b/kdepim/libkleo/kleo/decryptverifyjob.h
index 7db7f4e5..61a24a9d 100644
--- a/kdepim/libkleo/kleo/decryptverifyjob.h
+++ b/kdepim/libkleo/kleo/decryptverifyjob.h
@@ -37,8 +37,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/kleo/dn.h b/kdepim/libkleo/kleo/dn.h
index 7ccf508e..1c2bd881 100644
--- a/kdepim/libkleo/kleo/dn.h
+++ b/kdepim/libkleo/kleo/dn.h
@@ -38,8 +38,8 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
-class QStringList;
-class QWidget;
+#include <QStringList>
+#include <QWidget>
 
 namespace Kleo {
   class DNAttributeOrderConfigWidget;
diff --git a/kdepim/libkleo/kleo/downloadjob.h b/kdepim/libkleo/kleo/downloadjob.h
index aa3a05c3..863f93f9 100644
--- a/kdepim/libkleo/kleo/downloadjob.h
+++ b/kdepim/libkleo/kleo/downloadjob.h
@@ -45,9 +45,9 @@ namespace boost {
     template <typename T> class shared_ptr;
 }
 
-class QStringList;
-class QIODevice;
-class QByteArray;
+#include <QStringList>
+#include <QIODevice>
+#include <QByteArray>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/encryptjob.h b/kdepim/libkleo/kleo/encryptjob.h
index e9fefff9..7235c68b 100644
--- a/kdepim/libkleo/kleo/encryptjob.h
+++ b/kdepim/libkleo/kleo/encryptjob.h
@@ -39,8 +39,8 @@
 
 #include <vector>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/kleo/enum.h b/kdepim/libkleo/kleo/enum.h
index 8c45c332..9eff6765 100644
--- a/kdepim/libkleo/kleo/enum.h
+++ b/kdepim/libkleo/kleo/enum.h
@@ -35,8 +35,8 @@
 
 #include "kleo/kleo_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/exportjob.h b/kdepim/libkleo/kleo/exportjob.h
index 6b128672..695aa857 100644
--- a/kdepim/libkleo/kleo/exportjob.h
+++ b/kdepim/libkleo/kleo/exportjob.h
@@ -41,7 +41,7 @@ namespace GpgME {
   class Error;
 }
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/job.h b/kdepim/libkleo/kleo/job.h
index f335bbbc..ab21d7b8 100644
--- a/kdepim/libkleo/kleo/job.h
+++ b/kdepim/libkleo/kleo/job.h
@@ -42,7 +42,7 @@
 
 #include <gpgme++/error.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/keyfilter.h b/kdepim/libkleo/kleo/keyfilter.h
index f661f674..4b10d40e 100644
--- a/kdepim/libkleo/kleo/keyfilter.h
+++ b/kdepim/libkleo/kleo/keyfilter.h
@@ -41,9 +41,9 @@ namespace GpgME {
   class Key;
 }
 
-class QFont;
-class QColor;
-class QString;
+#include <QFont>
+#include <QColor>
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/keyfiltermanager.h b/kdepim/libkleo/kleo/keyfiltermanager.h
index 66a65302..3f7e9702 100644
--- a/kdepim/libkleo/kleo/keyfiltermanager.h
+++ b/kdepim/libkleo/kleo/keyfiltermanager.h
@@ -46,11 +46,11 @@ namespace GpgME {
   class Key;
 }
 
-class QAbstractItemModel;
-class QModelIndex;
-class QFont;
-class QColor;
-class QIcon;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QFont>
+#include <QColor>
+#include <QIcon>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/keylistjob.h b/kdepim/libkleo/kleo/keylistjob.h
index 16113062..253708c3 100644
--- a/kdepim/libkleo/kleo/keylistjob.h
+++ b/kdepim/libkleo/kleo/keylistjob.h
@@ -44,7 +44,7 @@ namespace GpgME {
   class KeyListResult;
 }
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/listallkeysjob.h b/kdepim/libkleo/kleo/listallkeysjob.h
index ae5c1845..013f4d67 100644
--- a/kdepim/libkleo/kleo/listallkeysjob.h
+++ b/kdepim/libkleo/kleo/listallkeysjob.h
@@ -44,7 +44,7 @@ namespace GpgME {
   class KeyListResult;
 }
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/refreshkeysjob.h b/kdepim/libkleo/kleo/refreshkeysjob.h
index 137f22fd..a19463dc 100644
--- a/kdepim/libkleo/kleo/refreshkeysjob.h
+++ b/kdepim/libkleo/kleo/refreshkeysjob.h
@@ -42,7 +42,7 @@ namespace GpgME {
   class Key;
 }
 
-class QStringList;
+#include <QStringList>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/kleo/signencryptjob.h b/kdepim/libkleo/kleo/signencryptjob.h
index aa095bae..4f5d0896 100644
--- a/kdepim/libkleo/kleo/signencryptjob.h
+++ b/kdepim/libkleo/kleo/signencryptjob.h
@@ -42,8 +42,8 @@
 #include <vector>
 #include <utility>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/kleo/signjob.h b/kdepim/libkleo/kleo/signjob.h
index 79ee85fc..998310f7 100644
--- a/kdepim/libkleo/kleo/signjob.h
+++ b/kdepim/libkleo/kleo/signjob.h
@@ -41,8 +41,8 @@
 
 #include <vector>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/kleo/verifydetachedjob.h b/kdepim/libkleo/kleo/verifydetachedjob.h
index 3c3508a4..95621ce8 100644
--- a/kdepim/libkleo/kleo/verifydetachedjob.h
+++ b/kdepim/libkleo/kleo/verifydetachedjob.h
@@ -37,8 +37,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
     class Error;
diff --git a/kdepim/libkleo/kleo/verifyopaquejob.h b/kdepim/libkleo/kleo/verifyopaquejob.h
index f6901800..bb6ab7ae 100644
--- a/kdepim/libkleo/kleo/verifyopaquejob.h
+++ b/kdepim/libkleo/kleo/verifyopaquejob.h
@@ -37,8 +37,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 namespace GpgME {
   class Error;
diff --git a/kdepim/libkleo/tests/gnupgviewer.h b/kdepim/libkleo/tests/gnupgviewer.h
index f529ef4b..fc55887d 100644
--- a/kdepim/libkleo/tests/gnupgviewer.h
+++ b/kdepim/libkleo/tests/gnupgviewer.h
@@ -39,7 +39,7 @@
 namespace Kleo {
   class GnuPGProcessBase;
 }
-class QStringList;
+#include <QStringList>
 
 class GnuPGViewer : public QTextEdit {
   Q_OBJECT
diff --git a/kdepim/libkleo/tests/test_keygen.h b/kdepim/libkleo/tests/test_keygen.h
index 212f1271..e3bfc87a 100644
--- a/kdepim/libkleo/tests/test_keygen.h
+++ b/kdepim/libkleo/tests/test_keygen.h
@@ -41,7 +41,7 @@ namespace GpgME {
   class KeyGenerationResult;
 }
 
-class QLineEdit;
+#include <QLineEdit>
 
 class KeyGenerator : public KDialog {
   Q_OBJECT
diff --git a/kdepim/libkleo/ui/cryptoconfigmodule_p.h b/kdepim/libkleo/ui/cryptoconfigmodule_p.h
index 11e20062..f0c376ea 100644
--- a/kdepim/libkleo/ui/cryptoconfigmodule_p.h
+++ b/kdepim/libkleo/ui/cryptoconfigmodule_p.h
@@ -42,12 +42,12 @@ class KLineEdit;
 class KIntNumInput;
 class KUrlRequester;
 
-class QPushButton;
-class QGridLayout;
-class QLineEdit;
-class QLabel;
-class QCheckBox;
-class QComboBox;
+#include <QPushButton>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QLabel>
+#include <QCheckBox>
+#include <QComboBox>
 
 namespace Kleo {
     class FileNameRequester;
diff --git a/kdepim/libkleo/ui/dnattributeorderconfigwidget.h b/kdepim/libkleo/ui/dnattributeorderconfigwidget.h
index bad941b4..8f1a86f6 100644
--- a/kdepim/libkleo/ui/dnattributeorderconfigwidget.h
+++ b/kdepim/libkleo/ui/dnattributeorderconfigwidget.h
@@ -41,7 +41,7 @@ namespace Kleo {
   class DNAttributeMapper;
 }
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/ui/keylistview.h b/kdepim/libkleo/ui/keylistview.h
index b37fe7d3..ebf8bb08 100644
--- a/kdepim/libkleo/ui/keylistview.h
+++ b/kdepim/libkleo/ui/keylistview.h
@@ -42,10 +42,10 @@
 #include <QHeaderView>
 #include <KIcon>
 
-class QPainter;
+#include <QPainter>
 class QColorGroup;
-class QFont;
-class QColor;
+#include <QFont>
+#include <QColor>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/ui/keyrequester.h b/kdepim/libkleo/ui/keyrequester.h
index 5ea40276..e2127e13 100644
--- a/kdepim/libkleo/ui/keyrequester.h
+++ b/kdepim/libkleo/ui/keyrequester.h
@@ -63,10 +63,10 @@ namespace GpgME {
   class KeyListResult;
 }
 
-class QStringList;
-class QString;
-class QPushButton;
-class QLabel;
+#include <QStringList>
+#include <QString>
+#include <QPushButton>
+#include <QLabel>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/ui/keyselectiondialog.h b/kdepim/libkleo/ui/keyselectiondialog.h
index 89962cf7..769604b3 100644
--- a/kdepim/libkleo/ui/keyselectiondialog.h
+++ b/kdepim/libkleo/ui/keyselectiondialog.h
@@ -48,12 +48,12 @@
 
 #include <vector>
 
-class QVBoxLayout;
-class QCheckBox;
-class QPixmap;
-class QTimer;
-class QRegExp;
-class QPoint;
+#include <QVBoxLayout>
+#include <QCheckBox>
+#include <QPixmap>
+#include <QTimer>
+#include <QRegExp>
+#include <QPoint>
 
 namespace Kleo {
   class KeyListView;
diff --git a/kdepim/libkleo/ui/messagebox.h b/kdepim/libkleo/ui/messagebox.h
index 7cca4175..95d78a6e 100644
--- a/kdepim/libkleo/ui/messagebox.h
+++ b/kdepim/libkleo/ui/messagebox.h
@@ -51,8 +51,8 @@ namespace Kleo {
     class Job;
 }
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 namespace Kleo {
 
diff --git a/kdepim/libkleo/ui/messagebox_p.h b/kdepim/libkleo/ui/messagebox_p.h
index 6a1c87d2..9b5aaf51 100644
--- a/kdepim/libkleo/ui/messagebox_p.h
+++ b/kdepim/libkleo/ui/messagebox_p.h
@@ -35,7 +35,7 @@
 
 #include <KDialog>
 
-class QString;
+#include <QString>
 class KTextEdit;
 
 namespace Kleo {
diff --git a/kdepim/libkleo/ui/progressbar.h b/kdepim/libkleo/ui/progressbar.h
index a6a82910..076d503c 100644
--- a/kdepim/libkleo/ui/progressbar.h
+++ b/kdepim/libkleo/ui/progressbar.h
@@ -35,7 +35,7 @@
 
 #include "kleo/kleo_export.h"
 #include <QProgressBar>
-class QTimer;
+#include <QTimer>
 
 namespace Kleo {
 
diff --git a/kdepim/libkpgp/kpgp.h b/kdepim/libkpgp/kpgp.h
index b0a0291d..7d7bb31d 100644
--- a/kdepim/libkpgp/kpgp.h
+++ b/kdepim/libkpgp/kpgp.h
@@ -34,8 +34,8 @@
 
 #include <stdio.h>
 
-class QCheckBox;
-class QGridLayout;
+#include <QCheckBox>
+#include <QGridLayout>
 
 class KConfig;
 
diff --git a/kdepim/libkpgp/kpgpui.h b/kdepim/libkpgp/kpgpui.h
index 894f8a0e..8a5799b8 100644
--- a/kdepim/libkpgp/kpgpui.h
+++ b/kdepim/libkpgp/kpgpui.h
@@ -34,19 +34,19 @@
 #include <kdialog.h>      // base class of all dialogs here
 #include <kpassworddialog.h>
 
-class QString;
-class QRegExp;
-class QByteArray;
-class QCheckBox;            // needed by Config, KeySelectionDialog
-class QTextEdit;            // needed by CipherTextDialog
-class QComboBox;            // needed by Config
-class QPixmap;              // needed by KeySelectionDialog
-class QPushButton;          // needed by KeyRequester
-class QTimer;               // needed by KeySelectionDialog
-class QGroupBox;
-class QTreeWidgetItem;
+#include <QString>
+#include <QRegExp>
+#include <QByteArray>
+#include <QCheckBox>            // needed by Config, KeySelectionDialog
+#include <QTextEdit>            // needed by CipherTextDialog
+#include <QComboBox>            // needed by Config
+#include <QPixmap>              // needed by KeySelectionDialog
+#include <QPushButton>          // needed by KeyRequester
+#include <QTimer>               // needed by KeySelectionDialog
+#include <QGroupBox>
+#include <QTreeWidgetItem>
 
-class QTreeWidget;          // needed by KeySelectionDialog
+#include <QTreeWidget>          // needed by KeySelectionDialog
 class KPasswordEdit;        // needed by PassphraseDialog
 
 namespace Kpgp {
diff --git a/kdepim/libksieve/kmanagesieve/session.h b/kdepim/libksieve/kmanagesieve/session.h
index f6dca363..288130cc 100644
--- a/kdepim/libksieve/kmanagesieve/session.h
+++ b/kdepim/libksieve/kmanagesieve/session.h
@@ -29,7 +29,7 @@
 #include <QtCore/QQueue>
 #include <QStringList>
 
-class QTimer;
+#include <QTimer>
 class KTcpSocket;
 
 namespace KManageSieve {
diff --git a/kdepim/libksieve/ksieve/lexer.h b/kdepim/libksieve/ksieve/lexer.h
index b87f7a01..5789e740 100644
--- a/kdepim/libksieve/ksieve/lexer.h
+++ b/kdepim/libksieve/ksieve/lexer.h
@@ -35,7 +35,7 @@
 
 #include "libksieve_export.h"
 
-class QString;
+#include <QString>
 
 namespace KSieve {
 
diff --git a/kdepim/libksieve/ksieve/scriptbuilder.h b/kdepim/libksieve/ksieve/scriptbuilder.h
index 9d95b363..2111b51a 100644
--- a/kdepim/libksieve/ksieve/scriptbuilder.h
+++ b/kdepim/libksieve/ksieve/scriptbuilder.h
@@ -33,7 +33,7 @@
 #ifndef KSIEVE_KSIEVE_SCRIPTBUILDER_H
 #define KSIEVE_KSIEVE_SCRIPTBUILDER_H
 
-class QString;
+#include <QString>
 
 namespace KSieve {
 
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.h b/kdepim/libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.h
index 368ba69b..f49fe559 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/autocreatescriptdialog.h
@@ -22,7 +22,7 @@
 
 #include <KDialog>
 
-class QDomDocument;
+#include <QDomDocument>
 
 namespace KSieveUi {
 class SieveEditorGraphicalModeWidget;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.h
index 5063d7ad..319e80f1 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.h
@@ -19,7 +19,7 @@
 #define SELECTCONVERTPARAMETERWIDGET_H
 
 #include <QWidget>
-class QSpinBox;
+#include <QSpinBox>
 namespace KSieveUi {
 class SelectConvertParameterWidget : public QWidget
 {
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
index 057bf1ef..a72f84de 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
@@ -19,7 +19,7 @@
 #define SIEVEACTION_H
 
 #include <QObject>
-class QDomElement;
+#include <QDomElement>
 namespace KSieveUi {
 class SieveAction : public QObject
 {
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.h
index 7b9ac551..5d001cf5 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.h
@@ -23,9 +23,9 @@
 
 class KPushButton;
 
-class QGridLayout;
-class QToolButton;
-class QDomElement;
+#include <QGridLayout>
+#include <QToolButton>
+#include <QDomElement>
 
 namespace PimCommon {
 class MinimumComboBox;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
index 49397792..8d9c936c 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/sievecondition.h
@@ -19,7 +19,7 @@
 #define SIEVECONDITION_H
 
 #include <QObject>
-class QDomElement;
+#include <QDomElement>
 namespace KSieveUi {
 class SieveCondition : public QObject
 {
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.h
index f4bb5d50..9b0d7764 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.h
@@ -22,8 +22,8 @@
 
 class KComboBox;
 class KLineEdit;
-class QStackedWidget;
-class QSpinBox;
+#include <QStackedWidget>
+#include <QSpinBox>
 class KDateComboBox;
 class KTimeComboBox;
 namespace KSieveUi {
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.h
index 3618d1a5..e7904bc8 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 
-class QSpinBox;
+#include <QSpinBox>
 namespace KSieveUi {
 class SelectSizeTypeComboBox;
 class SelectSizeWidget : public QWidget
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
index c7243f1f..364ae24a 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveconditionwidgetlister.h
@@ -22,9 +22,9 @@
 #include <libkdepim/widgets/kwidgetlister.h>
 
 class KPushButton;
-class QGridLayout;
-class QToolButton;
-class QDomElement;
+#include <QGridLayout>
+#include <QToolButton>
+#include <QDomElement>
 
 namespace PimCommon {
 class MinimumComboBox;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
index e5ef12b6..ce1220fe 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.h
@@ -22,9 +22,9 @@
 
 #include "editor/sieveeditorabstractwidget.h"
 
-class QSplitter;
-class QStackedWidget;
-class QDomDocument;
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QDomDocument>
 
 namespace KSieveUi {
 class SieveScriptPage;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.h
index b2c5310e..52a9d4d5 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveforeverypartwidget.h
@@ -19,9 +19,9 @@
 #define SIEVEFOREVERYPARTWIDGET_H
 
 #include "sievewidgetpageabstract.h"
-class QCheckBox;
+#include <QCheckBox>
 class KLineEdit;
-class QDomElement;
+#include <QDomElement>
 
 namespace KSieveUi {
 class SieveHelpButton;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.h
index 22530450..7e7e7d8f 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveglobalvariablewidget.h
@@ -23,9 +23,9 @@
 
 class KPushButton;
 class KLineEdit;
-class QGridLayout;
-class QCheckBox;
-class QDomElement;
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QDomElement>
 
 namespace KSieveUi {
 class SieveHelpButton;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sieveincludewidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sieveincludewidget.h
index d300a060..99945510 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sieveincludewidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sieveincludewidget.h
@@ -24,9 +24,9 @@
 
 class KPushButton;
 class KLineEdit;
-class QGridLayout;
-class QCheckBox;
-class QDomElement;
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QDomElement>
 namespace KSieveUi {
 class SieveHelpButton;
 class SieveIncludeLocation : public KComboBox
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.h b/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.h
index 078721a0..2908e511 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptblockwidget.h
@@ -20,12 +20,12 @@
 
 #include "sievewidgetpageabstract.h"
 
-class QRadioButton;
-class QGroupBox;
-class QAbstractButton;
+#include <QRadioButton>
+#include <QGroupBox>
+#include <QAbstractButton>
 class KComboBox;
 class KPushButton;
-class QDomElement;
+#include <QDomElement>
 
 namespace KSieveUi {
 class SieveConditionWidgetLister;
diff --git a/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptlistbox.h b/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptlistbox.h
index e439f09c..af10b953 100644
--- a/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptlistbox.h
+++ b/kdepim/libksieve/ksieveui/autocreatescripts/sievescriptlistbox.h
@@ -20,9 +20,9 @@
 
 #include <QGroupBox>
 #include <QListWidgetItem>
-class QListWidget;
-class QDomDocument;
-class QDomNode;
+#include <QListWidget>
+#include <QDomDocument>
+#include <QDomNode>
 class KPushButton;
 
 namespace KSieveUi {
diff --git a/kdepim/libksieve/ksieveui/debug/sievedebugdialog.h b/kdepim/libksieve/ksieveui/debug/sievedebugdialog.h
index 46180244..26bebe9e 100644
--- a/kdepim/libksieve/ksieveui/debug/sievedebugdialog.h
+++ b/kdepim/libksieve/ksieveui/debug/sievedebugdialog.h
@@ -19,7 +19,7 @@
 #include <kdialog.h>
 #include <kurl.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace KManageSieve {
 class SieveJob;
diff --git a/kdepim/libksieve/ksieveui/editor/sieveeditortextmodewidget.h b/kdepim/libksieve/ksieveui/editor/sieveeditortextmodewidget.h
index 6ec1964c..d7f622a9 100644
--- a/kdepim/libksieve/ksieveui/editor/sieveeditortextmodewidget.h
+++ b/kdepim/libksieve/ksieveui/editor/sieveeditortextmodewidget.h
@@ -21,7 +21,7 @@
 
 #include "sieveeditorabstractwidget.h"
 
-class QSplitter;
+#include <QSplitter>
 class KTabWidget;
 
 namespace PimCommon {
diff --git a/kdepim/libksieve/ksieveui/editor/sieveeditorwidget.h b/kdepim/libksieve/ksieveui/editor/sieveeditorwidget.h
index 4ea2e145..2b36a275 100644
--- a/kdepim/libksieve/ksieveui/editor/sieveeditorwidget.h
+++ b/kdepim/libksieve/ksieveui/editor/sieveeditorwidget.h
@@ -24,9 +24,9 @@
 
 #include <QWidget>
 
-class QStackedWidget;
-class QLineEdit;
-class QAction;
+#include <QStackedWidget>
+#include <QLineEdit>
+#include <QAction>
 namespace KSieveUi {
 class SieveEditorTextModeWidget;
 class SieveEditorGraphicalModeWidget;
diff --git a/kdepim/libksieve/ksieveui/editor/sievetextedit.h b/kdepim/libksieve/ksieveui/editor/sievetextedit.h
index bd584d23..30cf64b7 100644
--- a/kdepim/libksieve/ksieveui/editor/sievetextedit.h
+++ b/kdepim/libksieve/ksieveui/editor/sievetextedit.h
@@ -23,8 +23,8 @@
 
 #include "pimcommon/texteditor/plaintexteditor/plaintexteditor.h"
 
-class QCompleter;
-class QMenu;
+#include <QCompleter>
+#include <QMenu>
 namespace PimCommon {
 class SieveSyntaxHighlighter;
 }
diff --git a/kdepim/libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h b/kdepim/libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h
index 165a0626..9120dcf7 100644
--- a/kdepim/libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h
+++ b/kdepim/libksieve/ksieveui/managescriptsjob/parseuserscriptjob.h
@@ -21,8 +21,8 @@
 #include <QObject>
 #include <KUrl>
 #include "ksieveui_export.h"
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 namespace KManageSieve {
 class SieveJob;
 }
diff --git a/kdepim/libksieve/ksieveui/managesievescriptsdialog.h b/kdepim/libksieve/ksieveui/managesievescriptsdialog.h
index bacf94c7..7ab88abd 100644
--- a/kdepim/libksieve/ksieveui/managesievescriptsdialog.h
+++ b/kdepim/libksieve/ksieveui/managesievescriptsdialog.h
@@ -26,7 +26,7 @@
 
 #include <QMap>
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 class KPushButton;
 
 namespace KManageSieve {
diff --git a/kdepim/libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.h b/kdepim/libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.h
index 589e503f..0a5afa25 100644
--- a/kdepim/libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.h
+++ b/kdepim/libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.h
@@ -22,7 +22,7 @@
 #include <QRegExp>
 #include <QSyntaxHighlighter>
 
-class QTextDocument;
+#include <QTextDocument>
 
 class XMLPrintingSyntaxHighLighter : public QSyntaxHighlighter
 {
diff --git a/kdepim/libksieve/ksieveui/util/util.h b/kdepim/libksieve/ksieveui/util/util.h
index a1a83cc6..1e8c0205 100644
--- a/kdepim/libksieve/ksieveui/util/util.h
+++ b/kdepim/libksieve/ksieveui/util/util.h
@@ -44,7 +44,7 @@
 #include <akonadi/agentinstance.h>
 
 class KUrl;
-class QString;
+#include <QString>
 
 namespace KSieveUi
 {
diff --git a/kdepim/libksieve/ksieveui/vacation/multiimapvacationdialog.h b/kdepim/libksieve/ksieveui/vacation/multiimapvacationdialog.h
index b6035882..608d75b7 100644
--- a/kdepim/libksieve/ksieveui/vacation/multiimapvacationdialog.h
+++ b/kdepim/libksieve/ksieveui/vacation/multiimapvacationdialog.h
@@ -23,7 +23,7 @@
 #include "ksieveui_export.h"
 
 class KTabWidget;
-class QStackedWidget;
+#include <QStackedWidget>
 namespace KSieveUi {
 class VacationCreateScriptJob;
 class KSIEVEUI_EXPORT MultiImapVacationDialog : public KDialog
diff --git a/kdepim/libksieve/ksieveui/vacation/vacation.h b/kdepim/libksieve/ksieveui/vacation/vacation.h
index 4429727a..0ebd861e 100644
--- a/kdepim/libksieve/ksieveui/vacation/vacation.h
+++ b/kdepim/libksieve/ksieveui/vacation/vacation.h
@@ -20,9 +20,9 @@
 
 #include <QtCore/QObject>
 
-class QString;
-class QStringList;
-template <typename T> class QList;
+#include <QString>
+#include <QStringList>
+#include <QList>
 
 namespace KManageSieve {
 class SieveJob;
diff --git a/kdepim/libksieve/ksieveui/vacation/vacationdialog.h b/kdepim/libksieve/ksieveui/vacation/vacationdialog.h
index b0ad8388..c544da73 100644
--- a/kdepim/libksieve/ksieveui/vacation/vacationdialog.h
+++ b/kdepim/libksieve/ksieveui/vacation/vacationdialog.h
@@ -16,7 +16,7 @@
 
 #include <kdialog.h>
 
-template <typename T> class QList;
+#include <QList>
 
 namespace KMime {
 namespace Types {
diff --git a/kdepim/libksieve/ksieveui/vacation/vacationeditwidget.h b/kdepim/libksieve/ksieveui/vacation/vacationeditwidget.h
index b2c4421b..1094be2c 100644
--- a/kdepim/libksieve/ksieveui/vacation/vacationeditwidget.h
+++ b/kdepim/libksieve/ksieveui/vacation/vacationeditwidget.h
@@ -26,8 +26,8 @@ namespace PimCommon {
 class RichTextEditorWidget;
 }
 
-class QCheckBox;
-template <typename T> class QList;
+#include <QCheckBox>
+#include <QList>
 
 namespace KMime {
 namespace Types {
diff --git a/kdepim/libksieve/ksieveui/vacation/vacationmanager.h b/kdepim/libksieve/ksieveui/vacation/vacationmanager.h
index 55fc540d..dc2be988 100644
--- a/kdepim/libksieve/ksieveui/vacation/vacationmanager.h
+++ b/kdepim/libksieve/ksieveui/vacation/vacationmanager.h
@@ -24,7 +24,7 @@
 #include <QPointer>
 
 
-class QWidget;
+#include <QWidget>
 namespace KSieveUi {
 class MultiImapVacationManager;
 class MultiImapVacationDialog;
diff --git a/kdepim/libksieve/ksieveui/vacation/vacationpagewidget.h b/kdepim/libksieve/ksieveui/vacation/vacationpagewidget.h
index 2e112353..02ce13d9 100644
--- a/kdepim/libksieve/ksieveui/vacation/vacationpagewidget.h
+++ b/kdepim/libksieve/ksieveui/vacation/vacationpagewidget.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 #include <KUrl>
-class QStackedWidget;
+#include <QStackedWidget>
 namespace KManageSieve {
 class SieveJob;
 }
diff --git a/kdepim/libksieve/ksieveui/widgets/managesievewidget.h b/kdepim/libksieve/ksieveui/widgets/managesievewidget.h
index 0411d26a..32082e1d 100644
--- a/kdepim/libksieve/ksieveui/widgets/managesievewidget.h
+++ b/kdepim/libksieve/ksieveui/widgets/managesievewidget.h
@@ -27,7 +27,7 @@
 #include <QWidget>
 #include <QMap>
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 namespace KManageSieve {
 class SieveJob;
diff --git a/kdepim/libksieve/ksieveui/widgets/sievetreewidgetitem.h b/kdepim/libksieve/ksieveui/widgets/sievetreewidgetitem.h
index 15217c98..71896582 100644
--- a/kdepim/libksieve/ksieveui/widgets/sievetreewidgetitem.h
+++ b/kdepim/libksieve/ksieveui/widgets/sievetreewidgetitem.h
@@ -23,9 +23,9 @@
 
 #include "ksieveui_export.h"
 
-class QTimer;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTimer>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 namespace KSieveUi {
 class SieveTreeWidgetProgress;
diff --git a/kdepim/mailcommon/collectionpage/collectionexpirypage.h b/kdepim/mailcommon/collectionpage/collectionexpirypage.h
index 77783579..7e4d6360 100644
--- a/kdepim/mailcommon/collectionpage/collectionexpirypage.h
+++ b/kdepim/mailcommon/collectionpage/collectionexpirypage.h
@@ -27,9 +27,9 @@
 class KIntSpinBox;
 class KJob;
 
-class QCheckBox;
-class QPushButton;
-class QRadioButton;
+#include <QCheckBox>
+#include <QPushButton>
+#include <QRadioButton>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/collectionpage/collectiongeneralpage.h b/kdepim/mailcommon/collectionpage/collectiongeneralpage.h
index 93129266..98aa46a1 100644
--- a/kdepim/mailcommon/collectionpage/collectiongeneralpage.h
+++ b/kdepim/mailcommon/collectionpage/collectiongeneralpage.h
@@ -25,9 +25,9 @@
 class KComboBox;
 class KLineEdit;
 
-class QCheckBox;
+#include <QCheckBox>
 
-template <typename T> class QSharedPointer;
+#include <QSharedPointer>
 
 namespace KPIMIdentities {
 class IdentityCombo;
diff --git a/kdepim/mailcommon/filter/dialog/filteractionmissingargumentdialog.h b/kdepim/mailcommon/filter/dialog/filteractionmissingargumentdialog.h
index 0b000bbb..db92cbbc 100644
--- a/kdepim/mailcommon/filter/dialog/filteractionmissingargumentdialog.h
+++ b/kdepim/mailcommon/filter/dialog/filteractionmissingargumentdialog.h
@@ -28,10 +28,10 @@
 class KComboBox;
 class KUrlRequester;
 
-class QAbstractItemModel;
-class QListWidget;
-class QListWidgetItem;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QModelIndex>
 
 namespace MailCommon {
 class FolderRequester;
diff --git a/kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h b/kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
index f8836ed1..67407fb5 100644
--- a/kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
+++ b/kdepim/mailcommon/filter/dialog/selectthunderbirdfilterfileswidget.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 class KUrl;
-class QAbstractButton;
+#include <QAbstractButton>
 
 namespace Ui {
 class SelectThunderbirdFilterFilesWidget;
diff --git a/kdepim/mailcommon/filter/filteraction.h b/kdepim/mailcommon/filter/filteraction.h
index 5318258f..4fc0a6ad 100644
--- a/kdepim/mailcommon/filter/filteraction.h
+++ b/kdepim/mailcommon/filter/filteraction.h
@@ -34,7 +34,7 @@
 #include <QtCore/QList>
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filtercontroller.h b/kdepim/mailcommon/filter/filtercontroller.h
index baef289e..9e3edf83 100644
--- a/kdepim/mailcommon/filter/filtercontroller.h
+++ b/kdepim/mailcommon/filter/filtercontroller.h
@@ -25,9 +25,9 @@
 
 #include <QObject>
 
-class QAbstractItemModel;
-class QAction;
-class QItemSelectionModel;
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QItemSelectionModel>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterabstract_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterabstract_p.h
index e31266dc..936e5034 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterabstract_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterabstract_p.h
@@ -23,7 +23,7 @@
 #include <QList>
 #include <QStringList>
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterbalsa_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterbalsa_p.h
index 6f349d20..8bf8c960 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterbalsa_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterbalsa_p.h
@@ -21,7 +21,7 @@
 #include "filter/filterimporter/filterimporterabstract_p.h"
 
 
-class QFile;
+#include <QFile>
 class KConfigGroup;
 
 namespace MailCommon {
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
index a69c9874..13a5e5a1 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterclawsmail_p.h
@@ -21,7 +21,7 @@
 #include "filterimporter/filterimporterabstract_p.h"
 #include "mailcommon_export.h"
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterevolution_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterevolution_p.h
index d2162db3..dcc063fa 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterevolution_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterevolution_p.h
@@ -22,7 +22,7 @@
 
 #include <QDomElement>
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterprocmail_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterprocmail_p.h
index d2481c4f..9fcb388d 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterprocmail_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterprocmail_p.h
@@ -22,7 +22,7 @@
 
 #include <QTextStream>
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimportersylpheed_p.h b/kdepim/mailcommon/filter/filterimporter/filterimportersylpheed_p.h
index 96cabd53..0b1ff394 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimportersylpheed_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimportersylpheed_p.h
@@ -22,7 +22,7 @@
 
 #include <QDomElement>
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h b/kdepim/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
index 63fdaeff..30c34211 100644
--- a/kdepim/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
+++ b/kdepim/mailcommon/filter/filterimporter/filterimporterthunderbird_p.h
@@ -22,7 +22,7 @@
 #include "mailcommon_export.h"
 #include <QTextStream>
 
-class QFile;
+#include <QFile>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/filterimporterexporter.h b/kdepim/mailcommon/filter/filterimporterexporter.h
index 586e00a3..59d7fb70 100644
--- a/kdepim/mailcommon/filter/filterimporterexporter.h
+++ b/kdepim/mailcommon/filter/filterimporterexporter.h
@@ -38,7 +38,7 @@
 #include <QList>
 #include <QStringList>
 
-class QWidget;
+#include <QWidget>
 
 namespace MailCommon
 {
diff --git a/kdepim/mailcommon/filter/filterselectiondialog.h b/kdepim/mailcommon/filter/filterselectiondialog.h
index 7ba04a50..9a375af8 100644
--- a/kdepim/mailcommon/filter/filterselectiondialog.h
+++ b/kdepim/mailcommon/filter/filterselectiondialog.h
@@ -25,8 +25,8 @@
 
 class KPushButton;
 
-class QListWidget;
-class QWidget;
+#include <QListWidget>
+#include <QWidget>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/filter/kmfilterdialog.h b/kdepim/mailcommon/filter/kmfilterdialog.h
index f67ba728..9da80a3c 100644
--- a/kdepim/mailcommon/filter/kmfilterdialog.h
+++ b/kdepim/mailcommon/filter/kmfilterdialog.h
@@ -40,12 +40,12 @@ class KActionCollection;
 class KIconButton;
 class KKeySequenceWidget;
 
-class QCheckBox;
-class QLabel;
-class QListWidget;
-class QModelIndex;
-class QPushButton;
-class QRadioButton;
+#include <QCheckBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QModelIndex>
+#include <QPushButton>
+#include <QRadioButton>
 
 namespace MailCommon {
 class SearchPatternEdit;
diff --git a/kdepim/mailcommon/filter/soundtestwidget.h b/kdepim/mailcommon/filter/soundtestwidget.h
index 1c316cd9..e379570d 100644
--- a/kdepim/mailcommon/filter/soundtestwidget.h
+++ b/kdepim/mailcommon/filter/soundtestwidget.h
@@ -23,7 +23,7 @@
 
 #include <QWidget>
 
-class QPushButton;
+#include <QPushButton>
 class KUrlRequester;
 
 namespace MailCommon {
diff --git a/kdepim/mailcommon/folder/accountconfigorderdialog.h b/kdepim/mailcommon/folder/accountconfigorderdialog.h
index ce191ede..6dcf2c7d 100644
--- a/kdepim/mailcommon/folder/accountconfigorderdialog.h
+++ b/kdepim/mailcommon/folder/accountconfigorderdialog.h
@@ -21,9 +21,9 @@
 #include <KDialog>
 #include "mailcommon_export.h"
 
-class QListWidget;
+#include <QListWidget>
 class KPushButton;
-class QCheckBox;
+#include <QCheckBox>
 namespace MailCommon {
 
 class MAILCOMMON_EXPORT AccountConfigOrderDialog : public KDialog
diff --git a/kdepim/mailcommon/folder/foldercollectionmonitor.h b/kdepim/mailcommon/folder/foldercollectionmonitor.h
index 06707da0..bfa3b03e 100644
--- a/kdepim/mailcommon/folder/foldercollectionmonitor.h
+++ b/kdepim/mailcommon/folder/foldercollectionmonitor.h
@@ -26,7 +26,7 @@
 #include <QModelIndex>
 #include <QObject>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 class ChangeRecorder;
diff --git a/kdepim/mailcommon/folder/folderrequester.h b/kdepim/mailcommon/folder/folderrequester.h
index b0fb27f2..85364a17 100644
--- a/kdepim/mailcommon/folder/folderrequester.h
+++ b/kdepim/mailcommon/folder/folderrequester.h
@@ -37,7 +37,7 @@
 
 #include <QWidget>
 
-class QKeyEvent;
+#include <QKeyEvent>
 
 class KJob;
 
diff --git a/kdepim/mailcommon/folder/foldertreeview.h b/kdepim/mailcommon/folder/foldertreeview.h
index 61fcd527..9a583226 100644
--- a/kdepim/mailcommon/folder/foldertreeview.h
+++ b/kdepim/mailcommon/folder/foldertreeview.h
@@ -26,7 +26,7 @@
 #include <Akonadi/EntityTreeView>
 #include <Akonadi/Collection>
 
-class QMouseEvent;
+#include <QMouseEvent>
 
 namespace Akonadi {
 class CollectionStatisticsDelegate;
diff --git a/kdepim/mailcommon/folder/foldertreewidget.h b/kdepim/mailcommon/folder/foldertreewidget.h
index 1b46abca..67165e63 100644
--- a/kdepim/mailcommon/folder/foldertreewidget.h
+++ b/kdepim/mailcommon/folder/foldertreewidget.h
@@ -34,7 +34,7 @@ class StatisticsProxyModel;
 class KLineEdit;
 class KXMLGUIClient;
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/interfaces/rulewidgethandler.h b/kdepim/mailcommon/interfaces/rulewidgethandler.h
index 1d682f20..ddd78854 100644
--- a/kdepim/mailcommon/interfaces/rulewidgethandler.h
+++ b/kdepim/mailcommon/interfaces/rulewidgethandler.h
@@ -35,11 +35,11 @@
 
 #include <QByteArray>
 
-class QWidget;
-class QStackedWidget;
-class QByteArray;
-class QString;
-class QObject;
+#include <QWidget>
+#include <QStackedWidget>
+#include <QByteArray>
+#include <QString>
+#include <QObject>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/job/backupjob.h b/kdepim/mailcommon/job/backupjob.h
index 195deb74..27dbbbb6 100644
--- a/kdepim/mailcommon/job/backupjob.h
+++ b/kdepim/mailcommon/job/backupjob.h
@@ -36,7 +36,7 @@
 class KArchive;
 class KJob;
 
-class QWidget;
+#include <QWidget>
 
 namespace Akonadi {
 class ItemFetchJob;
diff --git a/kdepim/mailcommon/search/rulewidgethandlermanager.h b/kdepim/mailcommon/search/rulewidgethandlermanager.h
index 7b0b8b8c..840c3d2b 100644
--- a/kdepim/mailcommon/search/rulewidgethandlermanager.h
+++ b/kdepim/mailcommon/search/rulewidgethandlermanager.h
@@ -36,9 +36,9 @@
 #include <QByteArray>
 #include <QVector>
 
-class QObject;
-class QString;
-class QStackedWidget;
+#include <QObject>
+#include <QString>
+#include <QStackedWidget>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/search/searchpatternedit.h b/kdepim/mailcommon/search/searchpatternedit.h
index ee6a5891..50541610 100644
--- a/kdepim/mailcommon/search/searchpatternedit.h
+++ b/kdepim/mailcommon/search/searchpatternedit.h
@@ -31,9 +31,9 @@
 class KComboBox;
 class KPushButton;
 
-class QAbstractButton;
-class QRadioButton;
-class QStackedWidget;
+#include <QAbstractButton>
+#include <QRadioButton>
+#include <QStackedWidget>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/snippets/snippetdialog_p.h b/kdepim/mailcommon/snippets/snippetdialog_p.h
index f65aeb15..22e00847 100644
--- a/kdepim/mailcommon/snippets/snippetdialog_p.h
+++ b/kdepim/mailcommon/snippets/snippetdialog_p.h
@@ -22,8 +22,8 @@ class SnippetDialog;
 
 class KActionCollection;
 
-class QAbstractItemModel;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QModelIndex>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/snippets/snippetsmanager.h b/kdepim/mailcommon/snippets/snippetsmanager.h
index 8ce3be09..42111c81 100644
--- a/kdepim/mailcommon/snippets/snippetsmanager.h
+++ b/kdepim/mailcommon/snippets/snippetsmanager.h
@@ -27,9 +27,9 @@
 
 class KActionCollection;
 
-class QAbstractItemModel;
-class QAction;
-class QItemSelectionModel;
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QItemSelectionModel>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/snippets/snippetvariabledialog_p.h b/kdepim/mailcommon/snippets/snippetvariabledialog_p.h
index 803093a0..0fd480d5 100644
--- a/kdepim/mailcommon/snippets/snippetvariabledialog_p.h
+++ b/kdepim/mailcommon/snippets/snippetvariabledialog_p.h
@@ -24,7 +24,7 @@
 #include <KDialog>
 
 class KTextEdit;
-class QCheckBox;
+#include <QCheckBox>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/tag/tagwidget.h b/kdepim/mailcommon/tag/tagwidget.h
index 758382e1..769706e0 100644
--- a/kdepim/mailcommon/tag/tagwidget.h
+++ b/kdepim/mailcommon/tag/tagwidget.h
@@ -29,7 +29,7 @@ class KColorCombo;
 class KFontRequester;
 class KIconButton;
 class KKeySequenceWidget;
-class QCheckBox;
+#include <QCheckBox>
 class KActionCollection;
 
 namespace MailCommon {
diff --git a/kdepim/mailcommon/util/mailutil.h b/kdepim/mailcommon/util/mailutil.h
index 7653ca2f..b35b2de2 100644
--- a/kdepim/mailcommon/util/mailutil.h
+++ b/kdepim/mailcommon/util/mailutil.h
@@ -51,9 +51,9 @@ class Item;
 
 class KJob;
 
-class QAbstractItemModel;
-class QModelIndex;
-class QString;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QString>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailcommon/widgets/redirectdialog.h b/kdepim/mailcommon/widgets/redirectdialog.h
index bc56bfbe..024e93d5 100644
--- a/kdepim/mailcommon/widgets/redirectdialog.h
+++ b/kdepim/mailcommon/widgets/redirectdialog.h
@@ -33,7 +33,7 @@
 #include "mailcommon_export.h"
 
 #include <KDialog>
-class QFormLayout;
+#include <QFormLayout>
 
 namespace MessageComposer {
 class ComposerLineEdit;
diff --git a/kdepim/mailcommon/widgets/regexplineedit.h b/kdepim/mailcommon/widgets/regexplineedit.h
index 375c899e..9dd6c12f 100644
--- a/kdepim/mailcommon/widgets/regexplineedit.h
+++ b/kdepim/mailcommon/widgets/regexplineedit.h
@@ -38,8 +38,8 @@
 class KDialog;
 class KLineEdit;
 
-class QPushButton;
-class QString;
+#include <QPushButton>
+#include <QString>
 
 namespace MailCommon {
 
diff --git a/kdepim/mailimporter/importmailswidget.h b/kdepim/mailimporter/importmailswidget.h
index d9a1e80a..a01661fa 100644
--- a/kdepim/mailimporter/importmailswidget.h
+++ b/kdepim/mailimporter/importmailswidget.h
@@ -19,7 +19,7 @@
 
 #include <QWidget>
 #include "mailimporter_export.h"
-class QListWidgetItem;
+#include <QListWidgetItem>
 namespace Ui {
 class ImportMailsWidget;
 }
diff --git a/kdepim/messagecomposer/attachment/attachmentcontrollerbase.h b/kdepim/messagecomposer/attachment/attachmentcontrollerbase.h
index 1a910e39..dbc17d2b 100644
--- a/kdepim/messagecomposer/attachment/attachmentcontrollerbase.h
+++ b/kdepim/messagecomposer/attachment/attachmentcontrollerbase.h
@@ -34,7 +34,7 @@
 #include <KService>
 #include "messagecomposer_export.h"
 class KActionCollection;
-class QAction;
+#include <QAction>
 namespace MessageCore {
 class AttachmentFromUrlBaseJob;
 }
diff --git a/kdepim/messagecomposer/composer/composerviewbase.h b/kdepim/messagecomposer/composer/composerviewbase.h
index 9f3e209c..a64054b8 100644
--- a/kdepim/messagecomposer/composer/composerviewbase.h
+++ b/kdepim/messagecomposer/composer/composerviewbase.h
@@ -32,9 +32,9 @@
 #include <KUrl>
 #include <kleo/enum.h>
 
-class QTimer;
+#include <QTimer>
 class KJob;
-class QWidget;
+#include <QWidget>
 
 namespace SendLater {
 class SendLaterInfo;
diff --git a/kdepim/messagecomposer/composer/keyresolver.h b/kdepim/messagecomposer/composer/keyresolver.h
index e1527ee7..40a382e4 100644
--- a/kdepim/messagecomposer/composer/keyresolver.h
+++ b/kdepim/messagecomposer/composer/keyresolver.h
@@ -46,7 +46,7 @@
 
 #include <vector>
 
-class QStringList;
+#include <QStringList>
 
 namespace KABC {
 class Addressee;
diff --git a/kdepim/messagecomposer/imagescaling/imagescalingselectformat.h b/kdepim/messagecomposer/imagescaling/imagescalingselectformat.h
index 2be28025..f9da089a 100644
--- a/kdepim/messagecomposer/imagescaling/imagescalingselectformat.h
+++ b/kdepim/messagecomposer/imagescaling/imagescalingselectformat.h
@@ -21,7 +21,7 @@
 
 class KLineEdit;
 class KPushButton;
-class QListWidget;
+#include <QListWidget>
 
 namespace MessageComposer {
 
diff --git a/kdepim/messagecomposer/imagescaling/imagescalingwidget.h b/kdepim/messagecomposer/imagescaling/imagescalingwidget.h
index 1d1d13f3..2dcd608a 100644
--- a/kdepim/messagecomposer/imagescaling/imagescalingwidget.h
+++ b/kdepim/messagecomposer/imagescaling/imagescalingwidget.h
@@ -25,7 +25,7 @@ namespace Ui {
 class ImageScalingWidget;
 }
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 namespace MessageComposer {
 class MESSAGECOMPOSER_EXPORT ImageScalingWidget : public QWidget
diff --git a/kdepim/messagecomposer/job/inserttextfilejob.h b/kdepim/messagecomposer/job/inserttextfilejob.h
index 2a01412c..3f50a982 100644
--- a/kdepim/messagecomposer/job/inserttextfilejob.h
+++ b/kdepim/messagecomposer/job/inserttextfilejob.h
@@ -26,7 +26,7 @@
 
 #include <QPointer>
 
-class QTextEdit;
+#include <QTextEdit>
 
 namespace KIO {
 class Job;
diff --git a/kdepim/messagecomposer/recipient/distributionlistdialog.h b/kdepim/messagecomposer/recipient/distributionlistdialog.h
index c13bcae3..f2e0e860 100644
--- a/kdepim/messagecomposer/recipient/distributionlistdialog.h
+++ b/kdepim/messagecomposer/recipient/distributionlistdialog.h
@@ -26,7 +26,7 @@
 
 class KJob;
 class KLineEdit;
-class QTreeWidget;
+#include <QTreeWidget>
 
 namespace MessageComposer {
 
diff --git a/kdepim/messagecomposer/recipient/recipientseditorsidewidget.h b/kdepim/messagecomposer/recipient/recipientseditorsidewidget.h
index 788c0808..2fc42c86 100644
--- a/kdepim/messagecomposer/recipient/recipientseditorsidewidget.h
+++ b/kdepim/messagecomposer/recipient/recipientseditorsidewidget.h
@@ -27,8 +27,8 @@
 
 #include "recipientseditor.h"
 
-class QLabel;
-class QPushButton;
+#include <QLabel>
+#include <QPushButton>
 
 namespace MessageComposer {
 class KWindowPositioner;
diff --git a/kdepim/messagecomposer/settings/messagecomposersettings.h b/kdepim/messagecomposer/settings/messagecomposersettings.h
index 3a6dddb8..82495796 100644
--- a/kdepim/messagecomposer/settings/messagecomposersettings.h
+++ b/kdepim/messagecomposer/settings/messagecomposersettings.h
@@ -28,7 +28,7 @@
 #include "messagecomposersettings_base.h"
 
 
-class QTimer;
+#include <QTimer>
 
 namespace MessageComposer {
 
diff --git a/kdepim/messagelist/core/aggregation.h b/kdepim/messagelist/core/aggregation.h
index b3548978..e5c322b1 100644
--- a/kdepim/messagelist/core/aggregation.h
+++ b/kdepim/messagelist/core/aggregation.h
@@ -21,7 +21,7 @@
 #ifndef __MESSAGELIST_CORE_AGGREGATION_H__
 #define __MESSAGELIST_CORE_AGGREGATION_H__
 
-class QDataStream;
+#include <QDataStream>
 
 #include <QList>
 #include <QPair>
diff --git a/kdepim/messagelist/core/manager.h b/kdepim/messagelist/core/manager.h
index 28e07921..cd5137da 100644
--- a/kdepim/messagelist/core/manager.h
+++ b/kdepim/messagelist/core/manager.h
@@ -28,7 +28,7 @@
 
 #include <messagelist/messagelist_export.h>
 #include <akonadi/collection.h>
-class QPixmap;
+#include <QPixmap>
 
 namespace KMime
 {
diff --git a/kdepim/messagelist/core/model.h b/kdepim/messagelist/core/model.h
index 54bd6d2b..93fea76e 100644
--- a/kdepim/messagelist/core/model.h
+++ b/kdepim/messagelist/core/model.h
@@ -36,7 +36,7 @@
 
 #include <messagelist/messagelist_export.h>
 
-class QTime;
+#include <QTime>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/core/modelinvariantrowmapper.h b/kdepim/messagelist/core/modelinvariantrowmapper.h
index 64062662..c8958c0a 100644
--- a/kdepim/messagelist/core/modelinvariantrowmapper.h
+++ b/kdepim/messagelist/core/modelinvariantrowmapper.h
@@ -27,7 +27,7 @@
 #include <messagelist/core/modelinvariantindex.h>
 #include <messagelist/messagelist_export.h>
 
-class QTimer;
+#include <QTimer>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/core/optionset.h b/kdepim/messagelist/core/optionset.h
index ab2ce10c..f13062e7 100644
--- a/kdepim/messagelist/core/optionset.h
+++ b/kdepim/messagelist/core/optionset.h
@@ -23,7 +23,7 @@
 
 #include <QString>
 
-class QDataStream;
+#include <QDataStream>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/core/quicksearchline.h b/kdepim/messagelist/core/quicksearchline.h
index 3ae5e74a..01aff645 100644
--- a/kdepim/messagelist/core/quicksearchline.h
+++ b/kdepim/messagelist/core/quicksearchline.h
@@ -27,9 +27,9 @@
 
 class KLineEdit;
 class KComboBox;
-class QToolButton;
-class QPushButton;
-class QSignalMapper;
+#include <QToolButton>
+#include <QPushButton>
+#include <QSignalMapper>
 class KPushButton;
 namespace MessageList {
 namespace Core {
diff --git a/kdepim/messagelist/core/theme.h b/kdepim/messagelist/core/theme.h
index e3786a96..53d43072 100644
--- a/kdepim/messagelist/core/theme.h
+++ b/kdepim/messagelist/core/theme.h
@@ -32,7 +32,7 @@
 #include <messagelist/core/optionset.h>
 #include <messagelist/core/sortorder.h>
 
-class QPaintDevice;
+#include <QPaintDevice>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/core/themedelegate.h b/kdepim/messagelist/core/themedelegate.h
index 06265d6a..a929f052 100644
--- a/kdepim/messagelist/core/themedelegate.h
+++ b/kdepim/messagelist/core/themedelegate.h
@@ -28,7 +28,7 @@
 #include <messagelist/core/theme.h>
 #include <messagelist/core/item.h>
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/core/view.h b/kdepim/messagelist/core/view.h
index 049dc013..e3ee1ec6 100644
--- a/kdepim/messagelist/core/view.h
+++ b/kdepim/messagelist/core/view.h
@@ -30,7 +30,7 @@
 
 class KMenu;
 
-class QTimer;
+#include <QTimer>
 
 namespace Akonadi
 {
diff --git a/kdepim/messagelist/core/widgetbase.h b/kdepim/messagelist/core/widgetbase.h
index 17cdcba2..563fdd93 100644
--- a/kdepim/messagelist/core/widgetbase.h
+++ b/kdepim/messagelist/core/widgetbase.h
@@ -31,8 +31,8 @@
 #include <messagelist/messagelist_export.h>
 
 class KLineEdit;
-class QTimer;
-class QActionGroup;
+#include <QTimer>
+#include <QActionGroup>
 class KComboBox;
 class KMenu;
 
diff --git a/kdepim/messagelist/pane.h b/kdepim/messagelist/pane.h
index d5a76311..8a908af7 100644
--- a/kdepim/messagelist/pane.h
+++ b/kdepim/messagelist/pane.h
@@ -30,11 +30,11 @@
 #include <messagelist/messagelist_export.h>
 
 class KXMLGUIClient;
-class QAbstractItemModel;
-class QAbstractProxyModel;
-class QItemSelectionModel;
-class QItemSelection;
-class QToolButton;
+#include <QAbstractItemModel>
+#include <QAbstractProxyModel>
+#include <QItemSelectionModel>
+#include <QItemSelection>
+#include <QToolButton>
 
 namespace KPIM
 {
diff --git a/kdepim/messagelist/storagemodel.h b/kdepim/messagelist/storagemodel.h
index 7a1044b8..0fa9f56c 100644
--- a/kdepim/messagelist/storagemodel.h
+++ b/kdepim/messagelist/storagemodel.h
@@ -31,8 +31,8 @@
 
 #include <messagelist/messagelist_export.h>
 
-class QAbstractItemModel;
-class QItemSelectionModel;
+#include <QAbstractItemModel>
+#include <QItemSelectionModel>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/utils/configureaggregationsdialog.h b/kdepim/messagelist/utils/configureaggregationsdialog.h
index 0fd78c5a..5fac7b83 100644
--- a/kdepim/messagelist/utils/configureaggregationsdialog.h
+++ b/kdepim/messagelist/utils/configureaggregationsdialog.h
@@ -27,7 +27,7 @@
 
 #include <messagelist/messagelist_export.h>
 
-class QPushButton;
+#include <QPushButton>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/utils/configurethemesdialog.h b/kdepim/messagelist/utils/configurethemesdialog.h
index 1e849f87..3147bb10 100644
--- a/kdepim/messagelist/utils/configurethemesdialog.h
+++ b/kdepim/messagelist/utils/configurethemesdialog.h
@@ -27,7 +27,7 @@
 
 #include <messagelist/messagelist_export.h>
 
-class QPushButton;
+#include <QPushButton>
 
 namespace MessageList
 {
diff --git a/kdepim/messagelist/utils/themeeditor.h b/kdepim/messagelist/utils/themeeditor.h
index 0fe630aa..8f17efd9 100644
--- a/kdepim/messagelist/utils/themeeditor.h
+++ b/kdepim/messagelist/utils/themeeditor.h
@@ -31,8 +31,8 @@
 
 #include <KDialog>
 
-class QPaintDevice;
-class QCheckBox;
+#include <QPaintDevice>
+#include <QCheckBox>
 
 class KComboBox;
 class KIntSpinBox;
diff --git a/kdepim/messagelist/widget.h b/kdepim/messagelist/widget.h
index a6ee651b..92c1d00d 100644
--- a/kdepim/messagelist/widget.h
+++ b/kdepim/messagelist/widget.h
@@ -29,7 +29,7 @@
 #include <messagelist/messagelist_export.h>
 
 class KXMLGUIClient;
-class QWidget;
+#include <QWidget>
 
 namespace MessageList
 {
diff --git a/kdepim/messageviewer/adblock/adblockaddsubscriptiondialog.h b/kdepim/messageviewer/adblock/adblockaddsubscriptiondialog.h
index de4c7eb2..5947080b 100644
--- a/kdepim/messageviewer/adblock/adblockaddsubscriptiondialog.h
+++ b/kdepim/messageviewer/adblock/adblockaddsubscriptiondialog.h
@@ -20,7 +20,7 @@
 
 #include <KDialog>
 
-class QComboBox;
+#include <QComboBox>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/adblock/adblocklistwidget.h b/kdepim/messageviewer/adblock/adblocklistwidget.h
index 3a5174d5..a306d826 100644
--- a/kdepim/messageviewer/adblock/adblocklistwidget.h
+++ b/kdepim/messageviewer/adblock/adblocklistwidget.h
@@ -20,7 +20,7 @@
 
 #include <QListWidget>
 
-class QPaintEvent;
+#include <QPaintEvent>
 namespace MessageViewer {
 class AdBlockListWidget : public QListWidget
 {
diff --git a/kdepim/messageviewer/adblock/adblockmanager.h b/kdepim/messageviewer/adblock/adblockmanager.h
index a06115d0..437116f1 100644
--- a/kdepim/messageviewer/adblock/adblockmanager.h
+++ b/kdepim/messageviewer/adblock/adblockmanager.h
@@ -137,7 +137,7 @@
 #include <QByteArray>
 
 // Forward Includes
-class QNetworkRequest;
+#include <QNetworkRequest>
 class QWebFrame;
 
 // Definitions
diff --git a/kdepim/messageviewer/adblock/adblockrule.h b/kdepim/messageviewer/adblock/adblockrule.h
index 277f8d4f..9fde880d 100644
--- a/kdepim/messageviewer/adblock/adblockrule.h
+++ b/kdepim/messageviewer/adblock/adblockrule.h
@@ -34,8 +34,8 @@
 #include <QSharedPointer>
 
 // Forward Includes
-class QNetworkRequest;
-class QString;
+#include <QNetworkRequest>
+#include <QString>
 
 namespace MessageViewer {
 enum RuleTypes
diff --git a/kdepim/messageviewer/adblock/adblockruleimpl.h b/kdepim/messageviewer/adblock/adblockruleimpl.h
index b1d69ce9..9cb3f8f8 100644
--- a/kdepim/messageviewer/adblock/adblockruleimpl.h
+++ b/kdepim/messageviewer/adblock/adblockruleimpl.h
@@ -26,8 +26,8 @@
 #ifndef ADBLOCKRULEIMPL_H
 #define ADBLOCKRULEIMPL_H
 
-class QString;
-class QNetworkRequest;
+#include <QString>
+#include <QNetworkRequest>
 
 class AdBlockRuleImpl
 {
diff --git a/kdepim/messageviewer/antispam/antispamconfig.h b/kdepim/messageviewer/antispam/antispamconfig.h
index a2d45a97..ca24a1c3 100644
--- a/kdepim/messageviewer/antispam/antispamconfig.h
+++ b/kdepim/messageviewer/antispam/antispamconfig.h
@@ -38,7 +38,7 @@
 #include <QVector>
 #include "messageviewer_export.h"
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/findbar/findbarbase.h b/kdepim/messageviewer/findbar/findbarbase.h
index 62cea914..f1922a1f 100644
--- a/kdepim/messageviewer/findbar/findbarbase.h
+++ b/kdepim/messageviewer/findbar/findbarbase.h
@@ -22,11 +22,11 @@
 
 #include <QWidget>
 
-class QAction;
+#include <QAction>
 class KLineEdit;
-class QPushButton;
-class QMenu;
-class QLabel;
+#include <QPushButton>
+#include <QMenu>
+#include <QLabel>
 
 namespace MessageViewer
 {
diff --git a/kdepim/messageviewer/findbar/findbarsourceview.h b/kdepim/messageviewer/findbar/findbarsourceview.h
index aa717b6c..676078bd 100644
--- a/kdepim/messageviewer/findbar/findbarsourceview.h
+++ b/kdepim/messageviewer/findbar/findbarsourceview.h
@@ -22,7 +22,7 @@
 
 #include "findbarbase.h"
 
-class QPlainTextEdit;
+#include <QPlainTextEdit>
 
 namespace MessageViewer
 {
diff --git a/kdepim/messageviewer/header/customheadersettingwidget.h b/kdepim/messageviewer/header/customheadersettingwidget.h
index cd7cd006..d8e54679 100644
--- a/kdepim/messageviewer/header/customheadersettingwidget.h
+++ b/kdepim/messageviewer/header/customheadersettingwidget.h
@@ -26,8 +26,8 @@ namespace PimCommon {
 class SimpleStringListEditor;
 }
 
-class QRadioButton;
-class QButtonGroup;
+#include <QRadioButton>
+#include <QButtonGroup>
 namespace MessageViewer {
 
 class MESSAGEVIEWER_EXPORT CustomHeaderSettingWidget : public QWidget
diff --git a/kdepim/messageviewer/header/headerstrategy.h b/kdepim/messageviewer/header/headerstrategy.h
index 9487a3e3..ffd01f13 100644
--- a/kdepim/messageviewer/header/headerstrategy.h
+++ b/kdepim/messageviewer/header/headerstrategy.h
@@ -34,8 +34,8 @@
 
 #include "messageviewer_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/header/headerstyle.h b/kdepim/messageviewer/header/headerstyle.h
index 66a857c0..0aacdf07 100644
--- a/kdepim/messageviewer/header/headerstyle.h
+++ b/kdepim/messageviewer/header/headerstyle.h
@@ -41,7 +41,7 @@
 #include <akonadi/kmime/messagestatus.h>
 #include <KMime/Message>
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/header/kxface.h b/kdepim/messageviewer/header/kxface.h
index b864cc37..92fdd057 100644
--- a/kdepim/messageviewer/header/kxface.h
+++ b/kdepim/messageviewer/header/kxface.h
@@ -513,8 +513,8 @@ static const Prob freqs[16] = {
 static const char HexDigits[] = "0123456789ABCDEF";
 
 
-class QImage;
-class QString;
+#include <QImage>
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/htmlwriter/filehtmlwriter.h b/kdepim/messageviewer/htmlwriter/filehtmlwriter.h
index 12aff1dd..df13d6fc 100644
--- a/kdepim/messageviewer/htmlwriter/filehtmlwriter.h
+++ b/kdepim/messageviewer/htmlwriter/filehtmlwriter.h
@@ -38,7 +38,7 @@
 #include <QFile>
 #include <QTextStream>
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/htmlwriter/teehtmlwriter.h b/kdepim/messageviewer/htmlwriter/teehtmlwriter.h
index 592e170e..db8f72f3 100644
--- a/kdepim/messageviewer/htmlwriter/teehtmlwriter.h
+++ b/kdepim/messageviewer/htmlwriter/teehtmlwriter.h
@@ -36,7 +36,7 @@
 
 #include <QList>
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/interfaces/bodypart.h b/kdepim/messageviewer/interfaces/bodypart.h
index fea768cd..bc023885 100644
--- a/kdepim/messageviewer/interfaces/bodypart.h
+++ b/kdepim/messageviewer/interfaces/bodypart.h
@@ -34,8 +34,8 @@
 #ifndef __KMAIL_INTERFACES_BODYPART_H__
 #define __KMAIL_INTERFACES_BODYPART_H__
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace KMime {
   class Content;
diff --git a/kdepim/messageviewer/interfaces/bodyparturlhandler.h b/kdepim/messageviewer/interfaces/bodyparturlhandler.h
index 8bebafe5..9eaeef00 100644
--- a/kdepim/messageviewer/interfaces/bodyparturlhandler.h
+++ b/kdepim/messageviewer/interfaces/bodyparturlhandler.h
@@ -33,8 +33,8 @@
 #ifndef __KMAIL_INTERFACE_BODYPARTURLHANDLER_H__
 #define __KMAIL_INTERFACE_BODYPARTURLHANDLER_H__
 
-class QString;
-class QPoint;
+#include <QString>
+#include <QPoint>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/interfaces/htmlwriter.h b/kdepim/messageviewer/interfaces/htmlwriter.h
index 25058db6..6380f3f3 100644
--- a/kdepim/messageviewer/interfaces/htmlwriter.h
+++ b/kdepim/messageviewer/interfaces/htmlwriter.h
@@ -33,8 +33,8 @@
 #ifndef __KMAIL_INTERFACES_HTMLWRITER_H__
 #define __KMAIL_INTERFACES_HTMLWRITER_H__
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace MessageViewer {
 /**
diff --git a/kdepim/messageviewer/interfaces/urlhandler.h b/kdepim/messageviewer/interfaces/urlhandler.h
index 2042048e..d45fc4c7 100644
--- a/kdepim/messageviewer/interfaces/urlhandler.h
+++ b/kdepim/messageviewer/interfaces/urlhandler.h
@@ -34,8 +34,8 @@
 
 #include <kurl.h>
 
-class QString;
-class QPoint;
+#include <QString>
+#include <QPoint>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/objecttreesourceif.h b/kdepim/messageviewer/objecttreesourceif.h
index 66a9e9b6..49fe10ab 100644
--- a/kdepim/messageviewer/objecttreesourceif.h
+++ b/kdepim/messageviewer/objecttreesourceif.h
@@ -25,8 +25,8 @@
 
 #include <KMime/Message>
 
-class QObject;
-class QTextCodec;
+#include <QObject>
+#include <QTextCodec>
 
 namespace MessageViewer {
   class HtmlWriter;
diff --git a/kdepim/messageviewer/scamdetection/scamcheckshorturl.h b/kdepim/messageviewer/scamdetection/scamcheckshorturl.h
index 9af7abc4..8041ea78 100644
--- a/kdepim/messageviewer/scamdetection/scamcheckshorturl.h
+++ b/kdepim/messageviewer/scamdetection/scamcheckshorturl.h
@@ -29,8 +29,8 @@
 #include <QNetworkReply>
 #include <Solid/Networking>
 
-class QNetworkAccessManager;
-class QNetworkReply;
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 namespace MessageViewer {
 class MESSAGEVIEWER_EXPORT ScamCheckShortUrl : public QObject
 {
diff --git a/kdepim/messageviewer/settings/globalsettings.h b/kdepim/messageviewer/settings/globalsettings.h
index 8b224054..bd328e8c 100644
--- a/kdepim/messageviewer/settings/globalsettings.h
+++ b/kdepim/messageviewer/settings/globalsettings.h
@@ -26,7 +26,7 @@
 
 #include "messageviewer/globalsettings_base.h"
 
-class QTimer;
+#include <QTimer>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/utils/util.h b/kdepim/messageviewer/utils/util.h
index 878b7e56..58944e4e 100644
--- a/kdepim/messageviewer/utils/util.h
+++ b/kdepim/messageviewer/utils/util.h
@@ -45,8 +45,8 @@
 #include <KService>
 
 class KUrl;
-class QWidget;
-class QActionGroup;
+#include <QWidget>
+#include <QActionGroup>
 class KAction;
 
 namespace KMime {
diff --git a/kdepim/messageviewer/viewer/attachmentstrategy.h b/kdepim/messageviewer/viewer/attachmentstrategy.h
index bb8b8eb0..82c0cd2c 100644
--- a/kdepim/messageviewer/viewer/attachmentstrategy.h
+++ b/kdepim/messageviewer/viewer/attachmentstrategy.h
@@ -36,7 +36,7 @@
 
 #include "messageviewer_export.h"
 
-class QString;
+#include <QString>
 namespace KMime {
 class Content;
 }
diff --git a/kdepim/messageviewer/viewer/bodypartformatterfactory.h b/kdepim/messageviewer/viewer/bodypartformatterfactory.h
index 0d6cf9e0..93460bf5 100644
--- a/kdepim/messageviewer/viewer/bodypartformatterfactory.h
+++ b/kdepim/messageviewer/viewer/bodypartformatterfactory.h
@@ -36,7 +36,7 @@
 
 #include <QByteArray>
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/chiasmuskeyselector.h b/kdepim/messageviewer/viewer/chiasmuskeyselector.h
index c901be47..aae6359d 100644
--- a/kdepim/messageviewer/viewer/chiasmuskeyselector.h
+++ b/kdepim/messageviewer/viewer/chiasmuskeyselector.h
@@ -6,7 +6,7 @@
 
 class KListWidget;
 class KLineEdit;
-class QLabel;
+#include <QLabel>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/csshelperbase.h b/kdepim/messageviewer/viewer/csshelperbase.h
index 5041b803..68843168 100644
--- a/kdepim/messageviewer/viewer/csshelperbase.h
+++ b/kdepim/messageviewer/viewer/csshelperbase.h
@@ -36,8 +36,8 @@
 #include <QColor>
 #include <QFont>
 
-class QString;
-class QPaintDevice;
+#include <QString>
+#include <QPaintDevice>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/kleojobexecutor.h b/kdepim/messageviewer/viewer/kleojobexecutor.h
index 848dd4a7..4355d929 100644
--- a/kdepim/messageviewer/viewer/kleojobexecutor.h
+++ b/kdepim/messageviewer/viewer/kleojobexecutor.h
@@ -27,7 +27,7 @@
 
 #include <utility>
 
-class QEventLoop;
+#include <QEventLoop>
 
 namespace Kleo {
 class DecryptVerifyJob;
diff --git a/kdepim/messageviewer/viewer/mailwebview.h b/kdepim/messageviewer/viewer/mailwebview.h
index 5cf540cc..c5039225 100644
--- a/kdepim/messageviewer/viewer/mailwebview.h
+++ b/kdepim/messageviewer/viewer/mailwebview.h
@@ -30,7 +30,7 @@
 
 #include <boost/function.hpp>
 
-class QLabel;
+#include <QLabel>
 class KActionCollection;
 
 namespace MessageViewer {
diff --git a/kdepim/messageviewer/viewer/nodehelper.h b/kdepim/messageviewer/viewer/nodehelper.h
index d29e4749..b0ba176d 100644
--- a/kdepim/messageviewer/viewer/nodehelper.h
+++ b/kdepim/messageviewer/viewer/nodehelper.h
@@ -32,7 +32,7 @@
 #include <QSet>
 
 class KUrl;
-class QTextCodec;
+#include <QTextCodec>
 
 namespace MessageViewer {
   namespace Interface {
diff --git a/kdepim/messageviewer/viewer/objecttreeemptysource.h b/kdepim/messageviewer/viewer/objecttreeemptysource.h
index ef7a3789..32204175 100644
--- a/kdepim/messageviewer/viewer/objecttreeemptysource.h
+++ b/kdepim/messageviewer/viewer/objecttreeemptysource.h
@@ -23,7 +23,7 @@
 #include "objecttreesourceif.h"
 #include "utils/util.h"
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/objecttreeparser.h b/kdepim/messageviewer/viewer/objecttreeparser.h
index 0ec61de9..93d6f6a8 100644
--- a/kdepim/messageviewer/viewer/objecttreeparser.h
+++ b/kdepim/messageviewer/viewer/objecttreeparser.h
@@ -45,7 +45,7 @@
 #include <QList>
 #include "objecttreeemptysource.h"
 
-class QString;
+#include <QString>
 
 namespace KMime {
 class Content;
diff --git a/kdepim/messageviewer/viewer/objecttreeparser_p.h b/kdepim/messageviewer/viewer/objecttreeparser_p.h
index b4967ee0..7dbfc18e 100644
--- a/kdepim/messageviewer/viewer/objecttreeparser_p.h
+++ b/kdepim/messageviewer/viewer/objecttreeparser_p.h
@@ -51,7 +51,7 @@ class VerifyOpaqueJob;
 class KeyListJob;
 }
 
-class QStringList;
+#include <QStringList>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/objecttreeviewersource.h b/kdepim/messageviewer/viewer/objecttreeviewersource.h
index eaf98773..53cf0bc2 100644
--- a/kdepim/messageviewer/viewer/objecttreeviewersource.h
+++ b/kdepim/messageviewer/viewer/objecttreeviewersource.h
@@ -22,7 +22,7 @@
 
 #include "objecttreesourceif.h"
 
-class QString;
+#include <QString>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/partnodebodypart.h b/kdepim/messageviewer/viewer/partnodebodypart.h
index 4d7feb61..b075ff49 100644
--- a/kdepim/messageviewer/viewer/partnodebodypart.h
+++ b/kdepim/messageviewer/viewer/partnodebodypart.h
@@ -37,7 +37,7 @@
 #include "interfaces/bodypart.h"
 #include <akonadi/item.h>
 
-class QTextCodec;
+#include <QTextCodec>
 
 namespace KMime {
 class Content;
diff --git a/kdepim/messageviewer/viewer/pluginloaderbase.h b/kdepim/messageviewer/viewer/pluginloaderbase.h
index 1aec86fc..3a75e0ea 100644
--- a/kdepim/messageviewer/viewer/pluginloaderbase.h
+++ b/kdepim/messageviewer/viewer/pluginloaderbase.h
@@ -26,7 +26,7 @@
 #include <QMap>
 #include <KLibrary>
 
-class QStringList;
+#include <QStringList>
 
 class PluginMetaData
 {
diff --git a/kdepim/messageviewer/viewer/urlhandlermanager.h b/kdepim/messageviewer/viewer/urlhandlermanager.h
index aba80101..2e0b0ee7 100644
--- a/kdepim/messageviewer/viewer/urlhandlermanager.h
+++ b/kdepim/messageviewer/viewer/urlhandlermanager.h
@@ -38,8 +38,8 @@
 
 class KUrl;
 
-class QString;
-class QPoint;
+#include <QString>
+#include <QPoint>
 
 namespace MessageViewer {
 namespace Interface {
diff --git a/kdepim/messageviewer/viewer/viewer.h b/kdepim/messageviewer/viewer/viewer.h
index 058fc371..5d0e28ca 100644
--- a/kdepim/messageviewer/viewer/viewer.h
+++ b/kdepim/messageviewer/viewer/viewer.h
@@ -38,10 +38,10 @@ class KAction;
 class KToggleAction;
 class KUrl;
 
-class QAbstractItemModel;
-class QCloseEvent;
-class QEvent;
-class QResizeEvent;
+#include <QAbstractItemModel>
+#include <QCloseEvent>
+#include <QEvent>
+#include <QResizeEvent>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/viewer/viewer_p.h b/kdepim/messageviewer/viewer/viewer_p.h
index 6f830a85..331e02a8 100644
--- a/kdepim/messageviewer/viewer/viewer_p.h
+++ b/kdepim/messageviewer/viewer/viewer_p.h
@@ -55,9 +55,9 @@ class KToggleAction;
 class KHBox;
 class KMenu;
 
-class QPoint;
-class QSplitter;
-class QModelIndex;
+#include <QPoint>
+#include <QSplitter>
+#include <QModelIndex>
 
 namespace GrantleeTheme {
 class GrantleeThemeManager;
diff --git a/kdepim/messageviewer/widgets/htmlstatusbar.h b/kdepim/messageviewer/widgets/htmlstatusbar.h
index d80cd4fc..06d8e0cc 100644
--- a/kdepim/messageviewer/widgets/htmlstatusbar.h
+++ b/kdepim/messageviewer/widgets/htmlstatusbar.h
@@ -34,7 +34,7 @@
 
 #include "utils/util.h"
 #include <QLabel>
-class QMouseEvent;
+#include <QMouseEvent>
 
 namespace MessageViewer {
 
diff --git a/kdepim/messageviewer/widgets/openattachmentfolderwidget.h b/kdepim/messageviewer/widgets/openattachmentfolderwidget.h
index 93aa1b4a..47a6ed03 100644
--- a/kdepim/messageviewer/widgets/openattachmentfolderwidget.h
+++ b/kdepim/messageviewer/widgets/openattachmentfolderwidget.h
@@ -20,7 +20,7 @@
 
 #include <KMessageWidget>
 #include <KUrl>
-class QTimer;
+#include <QTimer>
 namespace MessageViewer {
 class OpenAttachmentFolderWidget : public KMessageWidget
 {
diff --git a/kdepim/noteshared/alarms/notealarmdialog.h b/kdepim/noteshared/alarms/notealarmdialog.h
index a1983c49..b28321b9 100644
--- a/kdepim/noteshared/alarms/notealarmdialog.h
+++ b/kdepim/noteshared/alarms/notealarmdialog.h
@@ -36,7 +36,7 @@
 #include "noteshared_export.h"
 class KDateComboBox;
 class KTimeComboBox;
-class QButtonGroup;
+#include <QButtonGroup>
 class KDateTime;
 namespace NoteShared {
 class NOTESHARED_EXPORT NoteAlarmDialog : public KDialog
diff --git a/kdepim/noteshared/config/notenetworkconfig.h b/kdepim/noteshared/config/notenetworkconfig.h
index ea568fea..db1c2111 100644
--- a/kdepim/noteshared/config/notenetworkconfig.h
+++ b/kdepim/noteshared/config/notenetworkconfig.h
@@ -21,7 +21,7 @@
 #include "noteshared_export.h"
 #include <KCModule>
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 class KComponentData;
 class KIntNumInput;
 namespace NoteShared {
diff --git a/kdepim/noteshared/editor/noteeditorutils.h b/kdepim/noteshared/editor/noteeditorutils.h
index b7822469..0407a9e4 100644
--- a/kdepim/noteshared/editor/noteeditorutils.h
+++ b/kdepim/noteshared/editor/noteeditorutils.h
@@ -19,8 +19,8 @@
 #define NOTEEDITORUTILS_H
 
 #include "noteshared_export.h"
-class QTextCursor;
-class QTextEdit;
+#include <QTextCursor>
+#include <QTextEdit>
 namespace NoteShared
 {
 namespace NoteEditorUtils {
diff --git a/kdepim/noteshared/network/notehostdialog.h b/kdepim/noteshared/network/notehostdialog.h
index 69e333be..678711f3 100644
--- a/kdepim/noteshared/network/notehostdialog.h
+++ b/kdepim/noteshared/network/notehostdialog.h
@@ -36,8 +36,8 @@
 #include <kdialog.h>
 #include "noteshared_export.h"
 class KHistoryComboBox;
-class QTreeView;
-class QModelIndex;
+#include <QTreeView>
+#include <QModelIndex>
 
 
 /**
diff --git a/kdepim/noteshared/network/notesnetworkreceiver.h b/kdepim/noteshared/network/notesnetworkreceiver.h
index 61b5ae4a..c9e6021a 100644
--- a/kdepim/noteshared/network/notesnetworkreceiver.h
+++ b/kdepim/noteshared/network/notesnetworkreceiver.h
@@ -37,8 +37,8 @@
 #include <QObject>
 #include <QAbstractSocket>
 
-class QTcpSocket;
-class QTimer;
+#include <QTcpSocket>
+#include <QTimer>
 
 
 namespace NoteShared {
diff --git a/kdepim/noteshared/noteutils.h b/kdepim/noteshared/noteutils.h
index e4401cc4..d57b4045 100644
--- a/kdepim/noteshared/noteutils.h
+++ b/kdepim/noteshared/noteutils.h
@@ -21,7 +21,7 @@
 #include "noteshared_export.h"
 #include <Akonadi/Item>
 #include <QString>
-class QWidget;
+#include <QWidget>
 namespace NoteShared
 {
 namespace NoteUtils {
diff --git a/kdepim/noteshared/settings/globalsettings.h b/kdepim/noteshared/settings/globalsettings.h
index 839530cb..5871a89a 100644
--- a/kdepim/noteshared/settings/globalsettings.h
+++ b/kdepim/noteshared/settings/globalsettings.h
@@ -21,7 +21,7 @@
 
 #include "notesharedglobalconfig.h"
 #include "noteshared_export.h"
-class QTimer;
+#include <QTimer>
 namespace NoteShared {
 class NOTESHARED_EXPORT GlobalSettings : public NoteSharedGlobalConfig
 {
diff --git a/kdepim/pimcommon/acl/aclmanager.h b/kdepim/pimcommon/acl/aclmanager.h
index 4e49337e..521eb4b6 100644
--- a/kdepim/pimcommon/acl/aclmanager.h
+++ b/kdepim/pimcommon/acl/aclmanager.h
@@ -26,9 +26,9 @@
 
 #include <QObject>
 
-class QAbstractItemModel;
-class QAction;
-class QItemSelectionModel;
+#include <QAbstractItemModel>
+#include <QAction>
+#include <QItemSelectionModel>
 
 namespace PimCommon {
 
diff --git a/kdepim/pimcommon/autocorrection/autocorrectionwidget.h b/kdepim/pimcommon/autocorrection/autocorrectionwidget.h
index b1d0eb10..39b96f61 100644
--- a/kdepim/pimcommon/autocorrection/autocorrectionwidget.h
+++ b/kdepim/pimcommon/autocorrection/autocorrectionwidget.h
@@ -22,7 +22,7 @@
 #include "autocorrection/autocorrection.h"
 #include <QWidget>
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 namespace Ui {
 class AutoCorrectionWidget;
diff --git a/kdepim/pimcommon/autocorrection/import/importlibreofficeautocorrection.h b/kdepim/pimcommon/autocorrection/import/importlibreofficeautocorrection.h
index 1240ac4c..ef46b672 100644
--- a/kdepim/pimcommon/autocorrection/import/importlibreofficeautocorrection.h
+++ b/kdepim/pimcommon/autocorrection/import/importlibreofficeautocorrection.h
@@ -22,8 +22,8 @@
 
 class KTempDir;
 class KZip;
-class QDomDocument;
-class QFile;
+#include <QDomDocument>
+#include <QFile>
 class KArchiveDirectory;
 
 namespace PimCommon {
diff --git a/kdepim/pimcommon/baloodebug/baloodebugsearchjob.h b/kdepim/pimcommon/baloodebug/baloodebugsearchjob.h
index fa7995f6..f4c2704d 100644
--- a/kdepim/pimcommon/baloodebug/baloodebugsearchjob.h
+++ b/kdepim/pimcommon/baloodebug/baloodebugsearchjob.h
@@ -21,7 +21,7 @@
 
 #include <QObject>
 #include <QStringList>
-class QProcess;
+#include <QProcess>
 namespace PimCommon {
 class BalooDebugSearchJob : public QObject
 {
diff --git a/kdepim/pimcommon/baloodebug/baloodebugwidget.h b/kdepim/pimcommon/baloodebug/baloodebugwidget.h
index ead31691..fd140e5a 100644
--- a/kdepim/pimcommon/baloodebug/baloodebugwidget.h
+++ b/kdepim/pimcommon/baloodebug/baloodebugwidget.h
@@ -23,7 +23,7 @@
 #include "baloodebugsearchpathcombobox.h"
 #include <Akonadi/Item>
 class KLineEdit;
-class QPushButton;
+#include <QPushButton>
 namespace PimCommon {
 class PlainTextEditorWidget;
 class PIMCOMMON_EXPORT BalooDebugWidget : public QWidget
diff --git a/kdepim/pimcommon/folderdialog/checkedcollectionwidget.h b/kdepim/pimcommon/folderdialog/checkedcollectionwidget.h
index 94f02ce4..c6c8d2d3 100644
--- a/kdepim/pimcommon/folderdialog/checkedcollectionwidget.h
+++ b/kdepim/pimcommon/folderdialog/checkedcollectionwidget.h
@@ -22,9 +22,9 @@
 #include <QWidget>
 #include "pimcommon_export.h"
 
-class QItemSelectionModel;
+#include <QItemSelectionModel>
 class KRecursiveFilterProxyModel;
-class QTreeView;
+#include <QTreeView>
 class KCheckableProxyModel;
 
 namespace Akonadi {
diff --git a/kdepim/pimcommon/settings/pimcommonsettings.h b/kdepim/pimcommon/settings/pimcommonsettings.h
index 03efd265..e74aa9d0 100644
--- a/kdepim/pimcommon/settings/pimcommonsettings.h
+++ b/kdepim/pimcommon/settings/pimcommonsettings.h
@@ -22,7 +22,7 @@
 #include "pimcommonsetting_base.h"
 
 
-class QTimer;
+#include <QTimer>
 
 namespace PimCommon {
 
diff --git a/kdepim/pimcommon/shorturl/shorturlwidget.h b/kdepim/pimcommon/shorturl/shorturlwidget.h
index 10203554..f9568a6e 100644
--- a/kdepim/pimcommon/shorturl/shorturlwidget.h
+++ b/kdepim/pimcommon/shorturl/shorturlwidget.h
@@ -25,8 +25,8 @@
 
 class KLineEdit;
 class KToggleAction;
-class QPushButton;
-class QLabel;
+#include <QPushButton>
+#include <QLabel>
 namespace KPIMUtils {
 class ProgressIndicatorLabel;
 }
diff --git a/kdepim/pimcommon/sievehighlighter/sievesyntaxhighlighter.h b/kdepim/pimcommon/sievehighlighter/sievesyntaxhighlighter.h
index a2017558..ac867cf1 100644
--- a/kdepim/pimcommon/sievehighlighter/sievesyntaxhighlighter.h
+++ b/kdepim/pimcommon/sievehighlighter/sievesyntaxhighlighter.h
@@ -25,7 +25,7 @@
 #include <QRegExp>
 #include <QSyntaxHighlighter>
 
-class QTextDocument;
+#include <QTextDocument>
 
 namespace PimCommon {
 
diff --git a/kdepim/pimcommon/storageservice/authdialog/logindialog.h b/kdepim/pimcommon/storageservice/authdialog/logindialog.h
index 0b902837..0c3a6144 100644
--- a/kdepim/pimcommon/storageservice/authdialog/logindialog.h
+++ b/kdepim/pimcommon/storageservice/authdialog/logindialog.h
@@ -21,7 +21,7 @@
 #include <KDialog>
 
 class KLineEdit;
-class QLabel;
+#include <QLabel>
 namespace PimCommon {
 class LoginDialog : public KDialog
 {
diff --git a/kdepim/pimcommon/storageservice/authdialog/storageauthviewwidget.h b/kdepim/pimcommon/storageservice/authdialog/storageauthviewwidget.h
index 53cac2a9..a81138e2 100644
--- a/kdepim/pimcommon/storageservice/authdialog/storageauthviewwidget.h
+++ b/kdepim/pimcommon/storageservice/authdialog/storageauthviewwidget.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 #include <QUrl>
-class QProgressBar;
+#include <QProgressBar>
 namespace PimCommon {
 class StorageAuthWebView;
 class StorageAuthViewWidget : public QWidget
diff --git a/kdepim/pimcommon/storageservice/dialog/storageservicechecknamedialog.h b/kdepim/pimcommon/storageservice/dialog/storageservicechecknamedialog.h
index 3266a26e..8aab2e7f 100644
--- a/kdepim/pimcommon/storageservice/dialog/storageservicechecknamedialog.h
+++ b/kdepim/pimcommon/storageservice/dialog/storageservicechecknamedialog.h
@@ -22,7 +22,7 @@
 #include <KDialog>
 #include "pimcommon_export.h"
 class KLineEdit;
-class QLabel;
+#include <QLabel>
 namespace PimCommon {
 class PIMCOMMON_EXPORT StorageServiceCheckNameDialog : public KDialog
 {
diff --git a/kdepim/pimcommon/storageservice/dialog/storageservicedeletedialog.h b/kdepim/pimcommon/storageservice/dialog/storageservicedeletedialog.h
index 536b0142..e1ab3a38 100644
--- a/kdepim/pimcommon/storageservice/dialog/storageservicedeletedialog.h
+++ b/kdepim/pimcommon/storageservice/dialog/storageservicedeletedialog.h
@@ -23,8 +23,8 @@
 #include "pimcommon_export.h"
 #include "storageservice/widgets/storageservicetreewidget.h"
 
-class QTreeWidgetItem;
-class QLabel;
+#include <QTreeWidgetItem>
+#include <QLabel>
 class KMenu;
 namespace PimCommon {
 class StorageServiceAbstract;
diff --git a/kdepim/pimcommon/storageservice/dialog/storageservicedownloaddialog.h b/kdepim/pimcommon/storageservice/dialog/storageservicedownloaddialog.h
index 2e4b853c..f215887d 100644
--- a/kdepim/pimcommon/storageservice/dialog/storageservicedownloaddialog.h
+++ b/kdepim/pimcommon/storageservice/dialog/storageservicedownloaddialog.h
@@ -22,8 +22,8 @@
 #include "pimcommon_export.h"
 #include "storageservice/widgets/storageservicetreewidget.h"
 
-class QTreeWidgetItem;
-class QLabel;
+#include <QTreeWidgetItem>
+#include <QLabel>
 namespace PimCommon {
 class StorageServiceAbstract;
 class StorageServiceProgressWidget;
diff --git a/kdepim/pimcommon/storageservice/job/storageserviceabstractjob.h b/kdepim/pimcommon/storageservice/job/storageserviceabstractjob.h
index fca04840..960192ee 100644
--- a/kdepim/pimcommon/storageservice/job/storageserviceabstractjob.h
+++ b/kdepim/pimcommon/storageservice/job/storageserviceabstractjob.h
@@ -22,8 +22,8 @@
 #include <QNetworkReply>
 #include "storageservice/storageserviceabstract.h"
 
-class QFile;
-class QNetworkAccessManager;
+#include <QFile>
+#include <QNetworkAccessManager>
 namespace PimCommon {
 class AccountInfo;
 class StorageServiceAbstractJob : public QObject
diff --git a/kdepim/pimcommon/storageservice/settings/addservicestoragedialog.h b/kdepim/pimcommon/storageservice/settings/addservicestoragedialog.h
index dec239b7..76bb7049 100644
--- a/kdepim/pimcommon/storageservice/settings/addservicestoragedialog.h
+++ b/kdepim/pimcommon/storageservice/settings/addservicestoragedialog.h
@@ -18,7 +18,7 @@
 #define ADDSERVICESTORAGEDIALOG_H
 #include <KDialog>
 #include "storageservice/storageservicemanager.h"
-class QStackedWidget;
+#include <QStackedWidget>
 namespace PimCommon {
 class StorageServiceComboBox;
 class AddServiceStorageDialog : public KDialog
diff --git a/kdepim/pimcommon/storageservice/settings/storagelistwidgetitem.h b/kdepim/pimcommon/storageservice/settings/storagelistwidgetitem.h
index 6be8243c..aaed6c53 100644
--- a/kdepim/pimcommon/storageservice/settings/storagelistwidgetitem.h
+++ b/kdepim/pimcommon/storageservice/settings/storagelistwidgetitem.h
@@ -21,8 +21,8 @@
 #include <KPixmapSequence>
 #include <KIcon>
 
-class QTimer;
-class QListWidget;
+#include <QTimer>
+#include <QListWidget>
 namespace PimCommon {
 class StorageListWidgetItemProgress;
 class StorageListWidgetItem : public QListWidgetItem
diff --git a/kdepim/pimcommon/storageservice/settings/storageservicesettingswidget.h b/kdepim/pimcommon/storageservice/settings/storageservicesettingswidget.h
index b1638bb5..f252787c 100644
--- a/kdepim/pimcommon/storageservice/settings/storageservicesettingswidget.h
+++ b/kdepim/pimcommon/storageservice/settings/storageservicesettingswidget.h
@@ -23,11 +23,11 @@
 #include "pimcommon_export.h"
 #include "storageservice/storageserviceabstract.h"
 #include "storageservice/storageservicemanager.h"
-class QListWidget;
-class QPushButton;
-class QLabel;
+#include <QListWidget>
+#include <QPushButton>
+#include <QLabel>
 class KTextBrowser;
-class QStackedWidget;
+#include <QStackedWidget>
 namespace PimCommon {
 class StorageListWidgetItem;
 
diff --git a/kdepim/pimcommon/storageservice/tests/servicetestwidget.h b/kdepim/pimcommon/storageservice/tests/servicetestwidget.h
index 6a8165f6..f69115e9 100644
--- a/kdepim/pimcommon/storageservice/tests/servicetestwidget.h
+++ b/kdepim/pimcommon/storageservice/tests/servicetestwidget.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 #include "storageservice/storageserviceabstract.h"
-class QTextEdit;
+#include <QTextEdit>
 
 namespace PimCommon {
 class StorageServiceAbstract;
diff --git a/kdepim/pimcommon/storageservice/tests/storageservice_gui.h b/kdepim/pimcommon/storageservice/tests/storageservice_gui.h
index 16335a48..c84ec9cc 100644
--- a/kdepim/pimcommon/storageservice/tests/storageservice_gui.h
+++ b/kdepim/pimcommon/storageservice/tests/storageservice_gui.h
@@ -20,7 +20,7 @@
 
 #include <QWidget>
 #include <KDialog>
-class QTextEdit;
+#include <QTextEdit>
 namespace PimCommon {
 class StorageServiceManager;
 class StorageServiceSettingsWidget;
diff --git a/kdepim/pimcommon/storageservice/webdav/webdavjob.h b/kdepim/pimcommon/storageservice/webdav/webdavjob.h
index 1d2e778e..1195e735 100644
--- a/kdepim/pimcommon/storageservice/webdav/webdavjob.h
+++ b/kdepim/pimcommon/storageservice/webdav/webdavjob.h
@@ -20,7 +20,7 @@
 
 #include <QObject>
 #include "storageservice/job/storageserviceabstractjob.h"
-class QNetworkReply;
+#include <QNetworkReply>
 namespace PimCommon {
 class WebDavJob : public PimCommon::StorageServiceAbstractJob
 {
diff --git a/kdepim/pimcommon/storageservice/widgets/storageserviceprogressindicator.h b/kdepim/pimcommon/storageservice/widgets/storageserviceprogressindicator.h
index 0c8208ff..438bc330 100644
--- a/kdepim/pimcommon/storageservice/widgets/storageserviceprogressindicator.h
+++ b/kdepim/pimcommon/storageservice/widgets/storageserviceprogressindicator.h
@@ -25,7 +25,7 @@
 #include <KPixmapSequence>
 #include <QPixmap>
 
-class QTimer;
+#include <QTimer>
 namespace PimCommon {
 class PIMCOMMON_EXPORT StorageServiceProgressIndicator : public QObject
 {
diff --git a/kdepim/pimcommon/storageservice/widgets/storageserviceprogresswidget.h b/kdepim/pimcommon/storageservice/widgets/storageserviceprogresswidget.h
index 9f9581b7..42a2b52d 100644
--- a/kdepim/pimcommon/storageservice/widgets/storageserviceprogresswidget.h
+++ b/kdepim/pimcommon/storageservice/widgets/storageserviceprogresswidget.h
@@ -21,9 +21,9 @@
 #include "pimcommon_export.h"
 
 #include <QFrame>
-class QProgressBar;
-class QLabel;
-class QToolButton;
+#include <QProgressBar>
+#include <QLabel>
+#include <QToolButton>
 namespace PimCommon {
 class StorageServiceAbstract;
 class PIMCOMMON_EXPORT StorageServiceProgressWidget : public QFrame
diff --git a/kdepim/pimcommon/storageservice/yousendit/yousenditjob.h b/kdepim/pimcommon/storageservice/yousendit/yousenditjob.h
index 8bc6c31f..eeae28f9 100644
--- a/kdepim/pimcommon/storageservice/yousendit/yousenditjob.h
+++ b/kdepim/pimcommon/storageservice/yousendit/yousenditjob.h
@@ -20,7 +20,7 @@
 
 #include <QObject>
 #include "storageservice/job/storageserviceabstractjob.h"
-class QNetworkReply;
+#include <QNetworkReply>
 namespace PimCommon {
 class YouSendItJob : public PimCommon::StorageServiceAbstractJob
 {
diff --git a/kdepim/pimcommon/texteditor/commonwidget/textfindreplacewidget.h b/kdepim/pimcommon/texteditor/commonwidget/textfindreplacewidget.h
index d07f0e27..a5c3606d 100644
--- a/kdepim/pimcommon/texteditor/commonwidget/textfindreplacewidget.h
+++ b/kdepim/pimcommon/texteditor/commonwidget/textfindreplacewidget.h
@@ -21,9 +21,9 @@
 #include <QWidget>
 #include <QTextDocument>
 
-class QAction;
+#include <QAction>
 class KLineEdit;
-class QPushButton;
+#include <QPushButton>
 namespace PimCommon {
 
 class TextFindWidget : public QWidget
diff --git a/kdepim/pimcommon/texteditor/commonwidget/textgotolinewidget.h b/kdepim/pimcommon/texteditor/commonwidget/textgotolinewidget.h
index 676b8ad1..0a8dce60 100644
--- a/kdepim/pimcommon/texteditor/commonwidget/textgotolinewidget.h
+++ b/kdepim/pimcommon/texteditor/commonwidget/textgotolinewidget.h
@@ -21,7 +21,7 @@
 #include "pimcommon_export.h"
 #include <QWidget>
 
-class QSpinBox;
+#include <QSpinBox>
 class KPushButton;
 namespace PimCommon {
 class PIMCOMMON_EXPORT TextGoToLineWidget : public QWidget
diff --git a/kdepim/pimcommon/texteditor/commonwidget/textmessageindicator.h b/kdepim/pimcommon/texteditor/commonwidget/textmessageindicator.h
index 0522a11d..7dae0045 100644
--- a/kdepim/pimcommon/texteditor/commonwidget/textmessageindicator.h
+++ b/kdepim/pimcommon/texteditor/commonwidget/textmessageindicator.h
@@ -28,7 +28,7 @@
  */
 #include <QWidget>
 #include "pimcommon_export.h"
-class QTimer;
+#include <QTimer>
 namespace PimCommon {
 class PIMCOMMON_EXPORT TextMessageIndicator : public QWidget
 {
diff --git a/kdepim/pimcommon/texteditor/plaintexteditor/plaintexteditfindbar.h b/kdepim/pimcommon/texteditor/plaintexteditor/plaintexteditfindbar.h
index dabf9503..fd7bdd58 100644
--- a/kdepim/pimcommon/texteditor/plaintexteditor/plaintexteditfindbar.h
+++ b/kdepim/pimcommon/texteditor/plaintexteditor/plaintexteditfindbar.h
@@ -23,7 +23,7 @@
 #include "pimcommon/texteditor/commonwidget/texteditfindbarbase.h"
 #include <QTextDocument>
 
-class QPlainTextEdit;
+#include <QPlainTextEdit>
 namespace PimCommon {
 class PIMCOMMON_EXPORT PlainTextEditFindBar : public TextEditFindBarBase
 {
diff --git a/kdepim/pimcommon/texteditor/richtexteditor/richtexteditfindbar.h b/kdepim/pimcommon/texteditor/richtexteditor/richtexteditfindbar.h
index 76b2e89c..68c1a5df 100644
--- a/kdepim/pimcommon/texteditor/richtexteditor/richtexteditfindbar.h
+++ b/kdepim/pimcommon/texteditor/richtexteditor/richtexteditfindbar.h
@@ -22,7 +22,7 @@
 #include "pimcommon/texteditor/commonwidget/texteditfindbarbase.h"
 #include <QTextDocument>
 
-class QTextEdit;
+#include <QTextEdit>
 namespace PimCommon {
 class PIMCOMMON_EXPORT RichTextEditFindBar : public TextEditFindBarBase
 {
diff --git a/kdepim/pimcommon/texteditor/richtexteditor/richtexteditor.h b/kdepim/pimcommon/texteditor/richtexteditor/richtexteditor.h
index f45bb117..89ae1cf8 100644
--- a/kdepim/pimcommon/texteditor/richtexteditor/richtexteditor.h
+++ b/kdepim/pimcommon/texteditor/richtexteditor/richtexteditor.h
@@ -21,9 +21,9 @@
 #include "pimcommon_export.h"
 #include <QTextEdit>
 
-class QContextMenuEvent;
-class QMenu;
-class QWheelEvent;
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QWheelEvent>
 namespace Sonnet {
 class Highlighter;
 }
diff --git a/kdepim/pimcommon/translator/googletranslator.h b/kdepim/pimcommon/translator/googletranslator.h
index cf4851ab..10ea3ea8 100644
--- a/kdepim/pimcommon/translator/googletranslator.h
+++ b/kdepim/pimcommon/translator/googletranslator.h
@@ -20,9 +20,9 @@
 
 #include "abstracttranslator.h"
 #include <QNetworkReply>
-class QNetworkAccessManager;
+#include <QNetworkAccessManager>
 class KComboBox;
-class QNetworkReply;
+#include <QNetworkReply>
 
 namespace PimCommon {
 class GoogleTranslator : public AbstractTranslator
diff --git a/kdepim/pimcommon/util/pimutil.h b/kdepim/pimcommon/util/pimutil.h
index fe791873..07137a98 100644
--- a/kdepim/pimcommon/util/pimutil.h
+++ b/kdepim/pimcommon/util/pimutil.h
@@ -42,7 +42,7 @@
 
 #include <KUrl>
 class OrgKdeAkonadiImapSettingsInterface;
-class QWidget;
+#include <QWidget>
 
 #define IMAP_RESOURCE_IDENTIFIER QLatin1String("akonadi_imap_resource")
 #define KOLAB_RESOURCE_IDENTIFIER QLatin1String("akonadi_kolab_resource")
diff --git a/kdepim/pimcommon/widgets/configureimmutablewidgetutils.h b/kdepim/pimcommon/widgets/configureimmutablewidgetutils.h
index 4e923930..f7322a9c 100644
--- a/kdepim/pimcommon/widgets/configureimmutablewidgetutils.h
+++ b/kdepim/pimcommon/widgets/configureimmutablewidgetutils.h
@@ -24,15 +24,15 @@
 #include <KConfigSkeletonItem>
 #include <KConfigSkeleton>
 
-class QWidget;
-class QGroupBox;
-class QCheckBox;
-class QButtonGroup;
-class QLineEdit;
+#include <QWidget>
+#include <QGroupBox>
+#include <QCheckBox>
+#include <QButtonGroup>
+#include <QLineEdit>
 class KConfigSkeletonItem;
 class KUrlRequester;
-class QSpinBox;
-class QComboBox;
+#include <QSpinBox>
+#include <QComboBox>
 
 namespace PimCommon {
 class SimpleStringListEditor;
diff --git a/kdepim/pimcommon/widgets/customtextedit.h b/kdepim/pimcommon/widgets/customtextedit.h
index b98e882d..a32b8a66 100644
--- a/kdepim/pimcommon/widgets/customtextedit.h
+++ b/kdepim/pimcommon/widgets/customtextedit.h
@@ -21,7 +21,7 @@
 #include "pimcommon_export.h"
 #include <KTextEdit>
 
-class QMenu;
+#include <QMenu>
 namespace PimCommon {
 class PIMCOMMON_EXPORT CustomTextEdit : public KTextEdit
 {
diff --git a/kdepim/pimcommon/widgets/customtoolswidget.h b/kdepim/pimcommon/widgets/customtoolswidget.h
index 3213b60b..256515ca 100644
--- a/kdepim/pimcommon/widgets/customtoolswidget.h
+++ b/kdepim/pimcommon/widgets/customtoolswidget.h
@@ -22,7 +22,7 @@
 
 #include <QWidget>
 class KToggleAction;
-class QStackedWidget;
+#include <QStackedWidget>
 namespace PimCommon {
 class ShortUrlWidget;
 class TranslatorWidget;
diff --git a/kdepim/pimcommon/widgets/customtreeview.h b/kdepim/pimcommon/widgets/customtreeview.h
index de3185e4..52381def 100644
--- a/kdepim/pimcommon/widgets/customtreeview.h
+++ b/kdepim/pimcommon/widgets/customtreeview.h
@@ -21,7 +21,7 @@
 
 #include <QTreeWidget>
 #include "pimcommon_export.h"
-class QPaintEvent;
+#include <QPaintEvent>
 namespace PimCommon {
 class PIMCOMMON_EXPORT CustomTreeView : public QTreeWidget
 {
diff --git a/kdepim/pimcommon/widgets/manageaccountwidget.h b/kdepim/pimcommon/widgets/manageaccountwidget.h
index 9ff3ceaf..a9400c86 100644
--- a/kdepim/pimcommon/widgets/manageaccountwidget.h
+++ b/kdepim/pimcommon/widgets/manageaccountwidget.h
@@ -26,8 +26,8 @@ class ManageAccountWidget;
 namespace Akonadi {
 class AgentInstance;
 }
-class QAbstractItemDelegate;
-class QAbstractItemView;
+#include <QAbstractItemDelegate>
+#include <QAbstractItemView>
 namespace PimCommon {
 class PIMCOMMON_EXPORT ManageAccountWidget : public QWidget
 {
diff --git a/kdepim/pimcommon/widgets/simplestringlisteditor.h b/kdepim/pimcommon/widgets/simplestringlisteditor.h
index 8cc483c7..02e1f9cd 100644
--- a/kdepim/pimcommon/widgets/simplestringlisteditor.h
+++ b/kdepim/pimcommon/widgets/simplestringlisteditor.h
@@ -39,10 +39,10 @@
 
 #include "pimcommon_export.h"
 
-class QListWidget;
-class QListWidgetItem;
-class QPushButton;
-class QVBoxLayout;
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 //
 //
diff --git a/kdepim/pimcommon/widgets/slidecontainer.h b/kdepim/pimcommon/widgets/slidecontainer.h
index dde0e485..2cf75f8d 100644
--- a/kdepim/pimcommon/widgets/slidecontainer.h
+++ b/kdepim/pimcommon/widgets/slidecontainer.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "pimcommon_export.h"
 
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 
 namespace PimCommon
 {
diff --git a/kdepim/pimcommon/widgets/splittercollapser.h b/kdepim/pimcommon/widgets/splittercollapser.h
index 8eb0809d..bcb8d8f6 100644
--- a/kdepim/pimcommon/widgets/splittercollapser.h
+++ b/kdepim/pimcommon/widgets/splittercollapser.h
@@ -27,7 +27,7 @@ License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QToolButton>
 #include "pimcommon_export.h"
 
-class QSplitter;
+#include <QSplitter>
 
 namespace PimCommon
 {
diff --git a/kdepim/pimcommon/widgets/tests/splittercollapsertest.h b/kdepim/pimcommon/widgets/tests/splittercollapsertest.h
index 52a8a5d8..e4717133 100644
--- a/kdepim/pimcommon/widgets/tests/splittercollapsertest.h
+++ b/kdepim/pimcommon/widgets/tests/splittercollapsertest.h
@@ -19,8 +19,8 @@
 #define SPLITTERCOLLAPSERTEST_H
 
 #include <QWidget>
-class QSplitter;
-class QTextEdit;
+#include <QSplitter>
+#include <QTextEdit>
 
 class TestSplitter : public QWidget
 {
diff --git a/kdepim/pimsettingexporter/abstractimportexportjob.h b/kdepim/pimsettingexporter/abstractimportexportjob.h
index 9f160628..c248b6e2 100644
--- a/kdepim/pimsettingexporter/abstractimportexportjob.h
+++ b/kdepim/pimsettingexporter/abstractimportexportjob.h
@@ -22,8 +22,8 @@
 #include <Akonadi/Collection>
 #include <QStringList>
 
-class QWidget;
-class QProgressDialog;
+#include <QWidget>
+#include <QProgressDialog>
 class ArchiveStorage;
 class KArchiveDirectory;
 class KTempDir;
diff --git a/kdepim/pimsettingexporter/addressbook/exportaddressbookjob.h b/kdepim/pimsettingexporter/addressbook/exportaddressbookjob.h
index 713e162d..1f0d7564 100644
--- a/kdepim/pimsettingexporter/addressbook/exportaddressbookjob.h
+++ b/kdepim/pimsettingexporter/addressbook/exportaddressbookjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportAddressbookJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/addressbook/importaddressbookjob.h b/kdepim/pimsettingexporter/addressbook/importaddressbookjob.h
index 02e0aaf2..0b2eecdf 100644
--- a/kdepim/pimsettingexporter/addressbook/importaddressbookjob.h
+++ b/kdepim/pimsettingexporter/addressbook/importaddressbookjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 class KArchiveFile;
 
 class ImportAddressbookJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/akregator/exportakregatorjob.h b/kdepim/pimsettingexporter/akregator/exportakregatorjob.h
index 1601eb98..3c6a36f1 100644
--- a/kdepim/pimsettingexporter/akregator/exportakregatorjob.h
+++ b/kdepim/pimsettingexporter/akregator/exportakregatorjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportAkregatorJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/akregator/importakregatorjob.h b/kdepim/pimsettingexporter/akregator/importakregatorjob.h
index 8b79bbb6..21842d88 100644
--- a/kdepim/pimsettingexporter/akregator/importakregatorjob.h
+++ b/kdepim/pimsettingexporter/akregator/importakregatorjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportAkregatorJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/alarm/exportalarmjob.h b/kdepim/pimsettingexporter/alarm/exportalarmjob.h
index f0cf9e9f..a74bcc69 100644
--- a/kdepim/pimsettingexporter/alarm/exportalarmjob.h
+++ b/kdepim/pimsettingexporter/alarm/exportalarmjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportAlarmJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/alarm/importalarmjob.h b/kdepim/pimsettingexporter/alarm/importalarmjob.h
index 9276664a..872444e9 100644
--- a/kdepim/pimsettingexporter/alarm/importalarmjob.h
+++ b/kdepim/pimsettingexporter/alarm/importalarmjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportAlarmJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/blogilo/exportblogilojob.h b/kdepim/pimsettingexporter/blogilo/exportblogilojob.h
index f0fd11ec..c3406704 100644
--- a/kdepim/pimsettingexporter/blogilo/exportblogilojob.h
+++ b/kdepim/pimsettingexporter/blogilo/exportblogilojob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportBlogiloJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/blogilo/importblogilojob.h b/kdepim/pimsettingexporter/blogilo/importblogilojob.h
index e2ce579e..1b04fad0 100644
--- a/kdepim/pimsettingexporter/blogilo/importblogilojob.h
+++ b/kdepim/pimsettingexporter/blogilo/importblogilojob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportBlogiloJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/calendar/exportcalendarjob.h b/kdepim/pimsettingexporter/calendar/exportcalendarjob.h
index 85844db4..4b75b3ae 100644
--- a/kdepim/pimsettingexporter/calendar/exportcalendarjob.h
+++ b/kdepim/pimsettingexporter/calendar/exportcalendarjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportCalendarJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/calendar/importcalendarjob.h b/kdepim/pimsettingexporter/calendar/importcalendarjob.h
index 4124e52b..cd1b7de2 100644
--- a/kdepim/pimsettingexporter/calendar/importcalendarjob.h
+++ b/kdepim/pimsettingexporter/calendar/importcalendarjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportCalendarJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/dialog/showarchivestructuredialog.h b/kdepim/pimsettingexporter/dialog/showarchivestructuredialog.h
index fb3e3e88..5bc09ef6 100644
--- a/kdepim/pimsettingexporter/dialog/showarchivestructuredialog.h
+++ b/kdepim/pimsettingexporter/dialog/showarchivestructuredialog.h
@@ -20,8 +20,8 @@
 
 #include <KDialog>
 
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class KArchiveEntry;
 class KArchiveDirectory;
 
diff --git a/kdepim/pimsettingexporter/jot/exportjotjob.h b/kdepim/pimsettingexporter/jot/exportjotjob.h
index e2a1c995..bbc83b27 100644
--- a/kdepim/pimsettingexporter/jot/exportjotjob.h
+++ b/kdepim/pimsettingexporter/jot/exportjotjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportJotJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/jot/importjotjob.h b/kdepim/pimsettingexporter/jot/importjotjob.h
index 9f2b1b51..05ae47d1 100644
--- a/kdepim/pimsettingexporter/jot/importjotjob.h
+++ b/kdepim/pimsettingexporter/jot/importjotjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportJotJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/knode/exportknodejob.h b/kdepim/pimsettingexporter/knode/exportknodejob.h
index 60aa2fb9..d3c05db7 100644
--- a/kdepim/pimsettingexporter/knode/exportknodejob.h
+++ b/kdepim/pimsettingexporter/knode/exportknodejob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportKnodeJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/knode/importknodejob.h b/kdepim/pimsettingexporter/knode/importknodejob.h
index 35705637..a4d22f67 100644
--- a/kdepim/pimsettingexporter/knode/importknodejob.h
+++ b/kdepim/pimsettingexporter/knode/importknodejob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportKnodeJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/notes/exportnotesjob.h b/kdepim/pimsettingexporter/notes/exportnotesjob.h
index 633e0caa..fd067db1 100644
--- a/kdepim/pimsettingexporter/notes/exportnotesjob.h
+++ b/kdepim/pimsettingexporter/notes/exportnotesjob.h
@@ -20,7 +20,7 @@
 
 #include "abstractimportexportjob.h"
 
-class QWidget;
+#include <QWidget>
 class ArchiveStorage;
 
 class ExportNotesJob : public AbstractImportExportJob
diff --git a/kdepim/pimsettingexporter/notes/importnotesjob.h b/kdepim/pimsettingexporter/notes/importnotesjob.h
index ad3ce1e4..9aa62dd5 100644
--- a/kdepim/pimsettingexporter/notes/importnotesjob.h
+++ b/kdepim/pimsettingexporter/notes/importnotesjob.h
@@ -21,7 +21,7 @@
 #include "abstractimportexportjob.h"
 
 class ArchiveStorage;
-class QWidget;
+#include <QWidget>
 
 class ImportNotesJob : public AbstractImportExportJob
 {
diff --git a/kdepim/pimsettingexporter/widgets/selectiontypetreewidget.h b/kdepim/pimsettingexporter/widgets/selectiontypetreewidget.h
index 4f665883..b4042d20 100644
--- a/kdepim/pimsettingexporter/widgets/selectiontypetreewidget.h
+++ b/kdepim/pimsettingexporter/widgets/selectiontypetreewidget.h
@@ -22,7 +22,7 @@
 #include <QHash>
 #include "utils.h"
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 class SelectionTypeTreeWidget : public QTreeWidget
 {
diff --git a/kdepim/plugins/kaddressbook/editorpages/cryptopageplugin.h b/kdepim/plugins/kaddressbook/editorpages/cryptopageplugin.h
index aaa4a5ef..d1221746 100644
--- a/kdepim/plugins/kaddressbook/editorpages/cryptopageplugin.h
+++ b/kdepim/plugins/kaddressbook/editorpages/cryptopageplugin.h
@@ -31,7 +31,7 @@ class KeyRequester;
 }
 
 class KComboBox;
-class QCheckBox;
+#include <QCheckBox>
 
 using namespace Akonadi;
 
diff --git a/kdepim/plugins/messageviewer/bodypartformatter/delegateselector.h b/kdepim/plugins/messageviewer/bodypartformatter/delegateselector.h
index 59fc3862..864e507d 100644
--- a/kdepim/plugins/messageviewer/bodypartformatter/delegateselector.h
+++ b/kdepim/plugins/messageviewer/bodypartformatter/delegateselector.h
@@ -27,7 +27,7 @@ namespace KPIM {
   class AddresseeLineEdit;
 }
 
-class QCheckBox;
+#include <QCheckBox>
 
 /**
   Selection dialog for a delegate.
diff --git a/kdepim/sieveeditor/sieveeditorconfiguredialog.h b/kdepim/sieveeditor/sieveeditorconfiguredialog.h
index 23252645..8b9d13ea 100644
--- a/kdepim/sieveeditor/sieveeditorconfiguredialog.h
+++ b/kdepim/sieveeditor/sieveeditorconfiguredialog.h
@@ -22,8 +22,8 @@
 #define SIEVEEDITORCONFIGUREDIALOG_H
 
 #include <KDialog>
-class QTabWidget;
-class QCheckBox;
+#include <QTabWidget>
+#include <QCheckBox>
 class SieveEditorConfigureServerWidget;
 class SieveEditorConfigureDialog : public KDialog
 {
diff --git a/kdepim/sieveeditor/sieveeditormainwindow.h b/kdepim/sieveeditor/sieveeditormainwindow.h
index c756fc06..427b8b33 100644
--- a/kdepim/sieveeditor/sieveeditormainwindow.h
+++ b/kdepim/sieveeditor/sieveeditormainwindow.h
@@ -26,7 +26,7 @@
 
 class KAction;
 class SieveEditorCentralWidget;
-class QLabel;
+#include <QLabel>
 class SieveEditorMainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
diff --git a/kdepim/sieveeditor/sieveeditorscriptmanagerwidget.h b/kdepim/sieveeditor/sieveeditorscriptmanagerwidget.h
index 7b575c46..d494e26d 100644
--- a/kdepim/sieveeditor/sieveeditorscriptmanagerwidget.h
+++ b/kdepim/sieveeditor/sieveeditorscriptmanagerwidget.h
@@ -25,7 +25,7 @@
 #include <KUrl>
 
 class SieveEditorManageSieveWidget;
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 class SieveEditorScriptManagerWidget : public QWidget
 {
     Q_OBJECT
diff --git a/kdepim/storageservicemanager/storageserviceconfiguredialog.h b/kdepim/storageservicemanager/storageserviceconfiguredialog.h
index ee429d44..220b48bb 100644
--- a/kdepim/storageservicemanager/storageserviceconfiguredialog.h
+++ b/kdepim/storageservicemanager/storageserviceconfiguredialog.h
@@ -23,7 +23,7 @@
 
 #include "pimcommon/storageservice/dialog/storageserviceconfiguredialog.h"
 
-class QCheckBox;
+#include <QCheckBox>
 
 class StorageServiceConfigureDialog : public PimCommon::StorageServiceConfigureDialog
 {
diff --git a/kdepim/storageservicemanager/storageservicemanagermainwindow.h b/kdepim/storageservicemanager/storageservicemanagermainwindow.h
index f1816d4a..656ccf9b 100644
--- a/kdepim/storageservicemanager/storageservicemanagermainwindow.h
+++ b/kdepim/storageservicemanager/storageservicemanagermainwindow.h
@@ -29,7 +29,7 @@ class StorageServiceManager;
 }
 
 class KAction;
-class QLabel;
+#include <QLabel>
 class StorageServiceManagerMainWidget;
 class StorageServiceManagerMainWindow : public KXmlGuiWindow
 {
diff --git a/kdepim/storageservicemanager/storageservicenavigationbuttons.h b/kdepim/storageservicemanager/storageservicenavigationbuttons.h
index 36535412..3aa1b2b2 100644
--- a/kdepim/storageservicemanager/storageservicenavigationbuttons.h
+++ b/kdepim/storageservicemanager/storageservicenavigationbuttons.h
@@ -24,7 +24,7 @@
 #include <QToolBar>
 #include "storageservicemanagerutil.h"
 
-class QAction;
+#include <QAction>
 
 class StorageServiceNavigationButtons : public QToolBar
 {
diff --git a/kdepim/templateparser/customtemplatesmenu.h b/kdepim/templateparser/customtemplatesmenu.h
index 30c9bb18..ca8d3478 100644
--- a/kdepim/templateparser/customtemplatesmenu.h
+++ b/kdepim/templateparser/customtemplatesmenu.h
@@ -25,7 +25,7 @@
 #include <QObject>
 #include <QStringList>
 
-class QSignalMapper;
+#include <QSignalMapper>
 
 class KActionCollection;
 class KAction;
diff --git a/kdepim/templateparser/templatesconfiguration.h b/kdepim/templateparser/templatesconfiguration.h
index 5dbe5447..fbbb0e20 100644
--- a/kdepim/templateparser/templatesconfiguration.h
+++ b/kdepim/templateparser/templatesconfiguration.h
@@ -21,7 +21,7 @@
 
 #include "templateparser_export.h"
 #include "ui_templatesconfiguration_base.h"
-class QTextEdit;
+#include <QTextEdit>
 namespace TemplateParser {
 
 class TEMPLATEPARSER_EXPORT TemplatesConfiguration : public QWidget, Ui::TemplatesConfigurationBase
diff --git a/kdepim/templateparser/templatestexteditor.h b/kdepim/templateparser/templatestexteditor.h
index 6aa900a8..8203521b 100644
--- a/kdepim/templateparser/templatestexteditor.h
+++ b/kdepim/templateparser/templatestexteditor.h
@@ -18,8 +18,8 @@
 #ifndef TEMPLATESTEXTEDITOR_H
 #define TEMPLATESTEXTEDITOR_H
 #include "pimcommon/texteditor/richtexteditor/richtexteditor.h"
-class QCompleter;
-class QKeyEvent;
+#include <QCompleter>
+#include <QKeyEvent>
 namespace TemplateParser {
 class TemplatesTextEditor : public PimCommon::RichTextEditor
 {
diff --git a/kdepim/templateparser/templatesutil.h b/kdepim/templateparser/templatesutil.h
index 5c21557d..72537b3d 100644
--- a/kdepim/templateparser/templatesutil.h
+++ b/kdepim/templateparser/templatesutil.h
@@ -20,8 +20,8 @@
 
 #include "templateparser_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 namespace TemplateParser {
 
 namespace Util {
diff --git a/kdepimlibs/akonadi/actionstatemanager_p.h b/kdepimlibs/akonadi/actionstatemanager_p.h
index 273684e6..2a5db71e 100644
--- a/kdepimlibs/akonadi/actionstatemanager_p.h
+++ b/kdepimlibs/akonadi/actionstatemanager_p.h
@@ -23,7 +23,7 @@
 #include <akonadi/collection.h>
 #include <akonadi/item.h>
 
-class QObject;
+#include <QObject>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/agentactionmanager.h b/kdepimlibs/akonadi/agentactionmanager.h
index 3dacfb8d..24434a3a 100644
--- a/kdepimlibs/akonadi/agentactionmanager.h
+++ b/kdepimlibs/akonadi/agentactionmanager.h
@@ -29,8 +29,8 @@
 class KAction;
 class KActionCollection;
 class KLocalizedString;
-class QItemSelectionModel;
-class QWidget;
+#include <QItemSelectionModel>
+#include <QWidget>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/agentbase_p.h b/kdepimlibs/akonadi/agentbase_p.h
index e47bcacc..a0acc8a8 100644
--- a/kdepimlibs/akonadi/agentbase_p.h
+++ b/kdepimlibs/akonadi/agentbase_p.h
@@ -28,8 +28,8 @@
 
 #include <solid/networking.h>
 
-class QSettings;
-class QTimer;
+#include <QSettings>
+#include <QTimer>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/agentinstance.h b/kdepimlibs/akonadi/agentinstance.h
index dda46c6c..77daea70 100644
--- a/kdepimlibs/akonadi/agentinstance.h
+++ b/kdepimlibs/akonadi/agentinstance.h
@@ -26,9 +26,9 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QSharedDataPointer>
 
-class QString;
-class QStringList;
-class QWidget;
+#include <QString>
+#include <QStringList>
+#include <QWidget>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/agentinstancewidget.h b/kdepimlibs/akonadi/agentinstancewidget.h
index 22665de5..524997c2 100644
--- a/kdepimlibs/akonadi/agentinstancewidget.h
+++ b/kdepimlibs/akonadi/agentinstancewidget.h
@@ -25,7 +25,7 @@
 
 #include <QWidget>
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 namespace Akonadi {
 
 class AgentInstance;
diff --git a/kdepimlibs/akonadi/agenttype.h b/kdepimlibs/akonadi/agenttype.h
index 5dee4909..59076150 100644
--- a/kdepimlibs/akonadi/agenttype.h
+++ b/kdepimlibs/akonadi/agenttype.h
@@ -26,10 +26,10 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QSharedDataPointer>
 
-class QIcon;
-class QString;
-class QStringList;
-class QVariant;
+#include <QIcon>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
 typedef QMap<QString, QVariant> QVariantMap;
 
 namespace Akonadi
diff --git a/kdepimlibs/akonadi/asyncselectionhandler_p.h b/kdepimlibs/akonadi/asyncselectionhandler_p.h
index f00242c6..0e776c5f 100644
--- a/kdepimlibs/akonadi/asyncselectionhandler_p.h
+++ b/kdepimlibs/akonadi/asyncselectionhandler_p.h
@@ -25,8 +25,8 @@
 #include <akonadi/collection.h>
 #include <akonadi/item.h>
 
-class QAbstractItemModel;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QModelIndex>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/calendar/etmcalendar.h b/kdepimlibs/akonadi/calendar/etmcalendar.h
index e4d3126e..13eede8f 100644
--- a/kdepimlibs/akonadi/calendar/etmcalendar.h
+++ b/kdepimlibs/akonadi/calendar/etmcalendar.h
@@ -26,7 +26,7 @@
 
 #include <akonadi/collection.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 class KCheckableProxyModel;
 
 namespace Akonadi {
diff --git a/kdepimlibs/akonadi/calendar/etmcalendar_p.h b/kdepimlibs/akonadi/calendar/etmcalendar_p.h
index ec57722e..7a594d48 100644
--- a/kdepimlibs/akonadi/calendar/etmcalendar_p.h
+++ b/kdepimlibs/akonadi/calendar/etmcalendar_p.h
@@ -31,7 +31,7 @@
 #include <QSet>
 #include <QModelIndex>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 class CheckableProxyModel;
 class KSelectionProxyModel;
 
diff --git a/kdepimlibs/akonadi/calendar/icalimporter_p.h b/kdepimlibs/akonadi/calendar/icalimporter_p.h
index e2b3b3b5..9ef3b2b2 100644
--- a/kdepimlibs/akonadi/calendar/icalimporter_p.h
+++ b/kdepimlibs/akonadi/calendar/icalimporter_p.h
@@ -34,7 +34,7 @@
 
 class KJob;
 class KTemporaryFile;
-class QByteArray;
+#include <QByteArray>
 namespace KIO {
 class Job;
 }
diff --git a/kdepimlibs/akonadi/calendar/incidencechanger_p.h b/kdepimlibs/akonadi/calendar/incidencechanger_p.h
index 82bdfa1d..683ac378 100644
--- a/kdepimlibs/akonadi/calendar/incidencechanger_p.h
+++ b/kdepimlibs/akonadi/calendar/incidencechanger_p.h
@@ -38,7 +38,7 @@
 #include <QVector>
 
 class KJob;
-class QWidget;
+#include <QWidget>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/calendar/itiphandlerhelper_p.h b/kdepimlibs/akonadi/calendar/itiphandlerhelper_p.h
index 11bc6de0..62af3305 100644
--- a/kdepimlibs/akonadi/calendar/itiphandlerhelper_p.h
+++ b/kdepimlibs/akonadi/calendar/itiphandlerhelper_p.h
@@ -35,7 +35,7 @@
 
 #include <QObject>
 
-class QWidget;
+#include <QWidget>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/calendar/kcolumnfilterproxymodel_p.h b/kdepimlibs/akonadi/calendar/kcolumnfilterproxymodel_p.h
index 56751d5a..df1a6173 100644
--- a/kdepimlibs/akonadi/calendar/kcolumnfilterproxymodel_p.h
+++ b/kdepimlibs/akonadi/calendar/kcolumnfilterproxymodel_p.h
@@ -24,7 +24,7 @@
 
 #include <QSortFilterProxyModel>
 
-template <class T> class QVector;
+#include <QVector>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/calendar/standardcalendaractionmanager.h b/kdepimlibs/akonadi/calendar/standardcalendaractionmanager.h
index 843f420a..560c408e 100644
--- a/kdepimlibs/akonadi/calendar/standardcalendaractionmanager.h
+++ b/kdepimlibs/akonadi/calendar/standardcalendaractionmanager.h
@@ -33,8 +33,8 @@
 
 class KAction;
 class KActionCollection;
-class QItemSelectionModel;
-class QWidget;
+#include <QItemSelectionModel>
+#include <QWidget>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/calendar/utils_p.h b/kdepimlibs/akonadi/calendar/utils_p.h
index f4cb12e6..6c71f5d7 100644
--- a/kdepimlibs/akonadi/calendar/utils_p.h
+++ b/kdepimlibs/akonadi/calendar/utils_p.h
@@ -32,7 +32,7 @@
  * Util functions that have no place to live.
  */
 
-class QWidget;
+#include <QWidget>
 
 namespace Akonadi {
 namespace CalendarUtils {
diff --git a/kdepimlibs/akonadi/changerecorder.h b/kdepimlibs/akonadi/changerecorder.h
index d1fa871c..bf06a2d1 100644
--- a/kdepimlibs/akonadi/changerecorder.h
+++ b/kdepimlibs/akonadi/changerecorder.h
@@ -22,7 +22,7 @@
 
 #include <akonadi/monitor.h>
 
-class QSettings;
+#include <QSettings>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectioncombobox.h b/kdepimlibs/akonadi/collectioncombobox.h
index d4fe357b..a5f7b318 100644
--- a/kdepimlibs/akonadi/collectioncombobox.h
+++ b/kdepimlibs/akonadi/collectioncombobox.h
@@ -25,7 +25,7 @@
 #include <akonadi/collection.h>
 #include <kcombobox.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectioncombobox_p.h b/kdepimlibs/akonadi/collectioncombobox_p.h
index f16637f7..bd5200f5 100644
--- a/kdepimlibs/akonadi/collectioncombobox_p.h
+++ b/kdepimlibs/akonadi/collectioncombobox_p.h
@@ -22,8 +22,8 @@
 
 #include <QtCore/QObject>
 
-class QAbstractItemModel;
-class QEvent;
+#include <QAbstractItemModel>
+#include <QEvent>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectiondialog_mobile_p.h b/kdepimlibs/akonadi/collectiondialog_mobile_p.h
index ecde20ac..aebcb3ff 100644
--- a/kdepimlibs/akonadi/collectiondialog_mobile_p.h
+++ b/kdepimlibs/akonadi/collectiondialog_mobile_p.h
@@ -23,8 +23,8 @@
 #include "collectiondialog.h"
 
 class KJob;
-class QDeclarativeView;
-class QSortFilterProxyModel;
+#include <QDeclarativeView>
+#include <QSortFilterProxyModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectionfetchscope.h b/kdepimlibs/akonadi/collectionfetchscope.h
index a857930e..6cd3d1ff 100644
--- a/kdepimlibs/akonadi/collectionfetchscope.h
+++ b/kdepimlibs/akonadi/collectionfetchscope.h
@@ -25,7 +25,7 @@
 
 #include <QtCore/QSharedDataPointer>
 
-class QStringList;
+#include <QStringList>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectionstatisticsdelegate.h b/kdepimlibs/akonadi/collectionstatisticsdelegate.h
index 49d29aab..bbca77ed 100644
--- a/kdepimlibs/akonadi/collectionstatisticsdelegate.h
+++ b/kdepimlibs/akonadi/collectionstatisticsdelegate.h
@@ -23,8 +23,8 @@
 
 #include <QStyledItemDelegate>
 
-class QAbstractItemView;
-class QTreeView;
+#include <QAbstractItemView>
+#include <QTreeView>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/collectionview.h b/kdepimlibs/akonadi/collectionview.h
index 0a41cd67..8512877a 100644
--- a/kdepimlibs/akonadi/collectionview.h
+++ b/kdepimlibs/akonadi/collectionview.h
@@ -25,7 +25,7 @@
 
 class KXMLGUIClient;
 class KXmlGuiWindow;
-class QDragMoveEvent;
+#include <QDragMoveEvent>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/contact/actions/qekigadialer.h b/kdepimlibs/akonadi/contact/actions/qekigadialer.h
index d5f3e967..93f149aa 100644
--- a/kdepimlibs/akonadi/contact/actions/qekigadialer.h
+++ b/kdepimlibs/akonadi/contact/actions/qekigadialer.h
@@ -22,7 +22,7 @@
 #define QEKIGADIALER_H
 
 #include "qdialer.h"
-class QDBusInterface;
+#include <QDBusInterface>
 
 class QEkigaDialer : public QDialer
 {
diff --git a/kdepimlibs/akonadi/contact/actions/qskypedialer.h b/kdepimlibs/akonadi/contact/actions/qskypedialer.h
index d5a17e57..ccbf772b 100644
--- a/kdepimlibs/akonadi/contact/actions/qskypedialer.h
+++ b/kdepimlibs/akonadi/contact/actions/qskypedialer.h
@@ -26,7 +26,7 @@
 
 #include <QtCore/QString>
 
-class QDBusInterface;
+#include <QDBusInterface>
 
 class QSkypeDialer : public QDialer
 {
diff --git a/kdepimlibs/akonadi/contact/actions/smsdialog.h b/kdepimlibs/akonadi/contact/actions/smsdialog.h
index c08ad855..65c2b161 100644
--- a/kdepimlibs/akonadi/contact/actions/smsdialog.h
+++ b/kdepimlibs/akonadi/contact/actions/smsdialog.h
@@ -24,7 +24,7 @@
 
 #include <kdialog.h>
 
-class QLabel;
+#include <QLabel>
 
 class KTextEdit;
 
diff --git a/kdepimlibs/akonadi/contact/contacteditordialog.h b/kdepimlibs/akonadi/contact/contacteditordialog.h
index f0d7beb3..fdf6c991 100644
--- a/kdepimlibs/akonadi/contact/contacteditordialog.h
+++ b/kdepimlibs/akonadi/contact/contacteditordialog.h
@@ -26,7 +26,7 @@
 
 #include <kdialog.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/contact/contactgroupeditordialog.h b/kdepimlibs/akonadi/contact/contactgroupeditordialog.h
index 1ea15b80..d660d277 100644
--- a/kdepimlibs/akonadi/contact/contactgroupeditordialog.h
+++ b/kdepimlibs/akonadi/contact/contactgroupeditordialog.h
@@ -26,7 +26,7 @@
 
 #include <kdialog.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/contact/contactgrouplineedit_p.h b/kdepimlibs/akonadi/contact/contactgrouplineedit_p.h
index f48670fe..b5833b12 100644
--- a/kdepimlibs/akonadi/contact/contactgrouplineedit_p.h
+++ b/kdepimlibs/akonadi/contact/contactgrouplineedit_p.h
@@ -27,9 +27,9 @@
 #include <kabc/contactgroup.h>
 #include <klineedit.h>
 
-class QAbstractItemModel;
-class QCompleter;
-class QModelIndex;
+#include <QAbstractItemModel>
+#include <QCompleter>
+#include <QModelIndex>
 
 class KJob;
 
diff --git a/kdepimlibs/akonadi/contact/contactviewerdialog.h b/kdepimlibs/akonadi/contact/contactviewerdialog.h
index e5841a8d..6058b5c1 100644
--- a/kdepimlibs/akonadi/contact/contactviewerdialog.h
+++ b/kdepimlibs/akonadi/contact/contactviewerdialog.h
@@ -26,7 +26,7 @@
 
 #include <kdialog.h>
 
-class QUrl;
+#include <QUrl>
 
 namespace KABC {
 class Address;
diff --git a/kdepimlibs/akonadi/contact/customfields_p.h b/kdepimlibs/akonadi/contact/customfields_p.h
index ed7901f3..435671e1 100644
--- a/kdepimlibs/akonadi/contact/customfields_p.h
+++ b/kdepimlibs/akonadi/contact/customfields_p.h
@@ -26,7 +26,7 @@
 #include <QtCore/QVariant>
 
 template <typename T>
-class QVector;
+#include <QVector>
 
 /**
  * @short A class that represents non-standard contact fields.
diff --git a/kdepimlibs/akonadi/contact/editor/addresseditwidget.h b/kdepimlibs/akonadi/contact/editor/addresseditwidget.h
index 0539ccde..b07d8111 100644
--- a/kdepimlibs/akonadi/contact/editor/addresseditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/addresseditwidget.h
@@ -29,8 +29,8 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 
 class KLineEdit;
 class KTextEdit;
diff --git a/kdepimlibs/akonadi/contact/editor/customfieldeditordialog.h b/kdepimlibs/akonadi/contact/editor/customfieldeditordialog.h
index d8d281ea..0c9863c1 100644
--- a/kdepimlibs/akonadi/contact/editor/customfieldeditordialog.h
+++ b/kdepimlibs/akonadi/contact/editor/customfieldeditordialog.h
@@ -28,7 +28,7 @@
 
 class KComboBox;
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 
 class CustomFieldEditorDialog : public KDialog
 {
diff --git a/kdepimlibs/akonadi/contact/editor/customfieldseditwidget.h b/kdepimlibs/akonadi/contact/editor/customfieldseditwidget.h
index 95b39792..0b2c48fb 100644
--- a/kdepimlibs/akonadi/contact/editor/customfieldseditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/customfieldseditwidget.h
@@ -30,8 +30,8 @@ namespace KABC {
 class Addressee;
 }
 
-class QPushButton;
-class QTreeView;
+#include <QPushButton>
+#include <QTreeView>
 
 void splitCustomField(const QString &str, QString &app, QString &name, QString &value);
 
diff --git a/kdepimlibs/akonadi/contact/editor/dateeditwidget.h b/kdepimlibs/akonadi/contact/editor/dateeditwidget.h
index 61fcf297..ae18a426 100644
--- a/kdepimlibs/akonadi/contact/editor/dateeditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/dateeditwidget.h
@@ -28,8 +28,8 @@
 
 class KDatePickerPopup;
 
-class QContextMenuEvent;
-class QToolButton;
+#include <QContextMenuEvent>
+#include <QToolButton>
 
 class DateView : public QLabel
 {
diff --git a/kdepimlibs/akonadi/contact/editor/emaileditwidget.h b/kdepimlibs/akonadi/contact/editor/emaileditwidget.h
index 0dd33662..df975d37 100644
--- a/kdepimlibs/akonadi/contact/editor/emaileditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/emaileditwidget.h
@@ -31,7 +31,7 @@ class Addressee;
 
 class KLineEdit;
 class KListWidget;
-class QToolButton;
+#include <QToolButton>
 
 /**
  * @short A widget for editing email addresses.
diff --git a/kdepimlibs/akonadi/contact/editor/geoeditwidget.h b/kdepimlibs/akonadi/contact/editor/geoeditwidget.h
index b0040ea4..348085c1 100644
--- a/kdepimlibs/akonadi/contact/editor/geoeditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/geoeditwidget.h
@@ -32,10 +32,10 @@ namespace KABC
 class Addressee;
 }
 
-class QDoubleSpinBox;
-class QLabel;
-class QPushButton;
-class QSpinBox;
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpinBox>
 
 class KComboBox;
 
diff --git a/kdepimlibs/akonadi/contact/editor/im/imeditordialog.h b/kdepimlibs/akonadi/contact/editor/im/imeditordialog.h
index 0e7ac0b8..f75bd9da 100644
--- a/kdepimlibs/akonadi/contact/editor/im/imeditordialog.h
+++ b/kdepimlibs/akonadi/contact/editor/im/imeditordialog.h
@@ -27,8 +27,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "immodel.h"
 
-class QPushButton;
-class QTreeView;
+#include <QPushButton>
+#include <QTreeView>
 
 class IMEditorDialog : public KDialog
 {
diff --git a/kdepimlibs/akonadi/contact/editor/imeditwidget.h b/kdepimlibs/akonadi/contact/editor/imeditwidget.h
index 55f79529..b0b52fd6 100644
--- a/kdepimlibs/akonadi/contact/editor/imeditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/imeditwidget.h
@@ -29,7 +29,7 @@
 #include "im/immodel.h"
 
 class KLineEdit;
-class QToolButton;
+#include <QToolButton>
 
 /**
  * This widget displays an input field for changing
diff --git a/kdepimlibs/akonadi/contact/editor/nameeditwidget.h b/kdepimlibs/akonadi/contact/editor/nameeditwidget.h
index 2a9f6b22..f88b1958 100644
--- a/kdepimlibs/akonadi/contact/editor/nameeditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/nameeditwidget.h
@@ -27,7 +27,7 @@
 #include <kabc/addressee.h>
 
 class KLineEdit;
-class QToolButton;
+#include <QToolButton>
 /**
  * @short A widget for editing the name of a contact.
  *
diff --git a/kdepimlibs/akonadi/contact/editor/phoneeditwidget.h b/kdepimlibs/akonadi/contact/editor/phoneeditwidget.h
index e9565fbb..ca5e4bcb 100644
--- a/kdepimlibs/akonadi/contact/editor/phoneeditwidget.h
+++ b/kdepimlibs/akonadi/contact/editor/phoneeditwidget.h
@@ -30,11 +30,11 @@
 
 class KLineEdit;
 
-class QButtonGroup;
-class QCheckBox;
-class QScrollArea;
-class QSignalMapper;
-class QVBoxLayout;
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QScrollArea>
+#include <QSignalMapper>
+#include <QVBoxLayout>
 
 /**
  * @short A combobox to select a phone number type.
diff --git a/kdepimlibs/akonadi/contact/emailaddressselectionwidget.h b/kdepimlibs/akonadi/contact/emailaddressselectionwidget.h
index ca35905b..7785053d 100644
--- a/kdepimlibs/akonadi/contact/emailaddressselectionwidget.h
+++ b/kdepimlibs/akonadi/contact/emailaddressselectionwidget.h
@@ -33,8 +33,8 @@
 #include <QWidget>
 
 class KLineEdit;
-class QAbstractItemModel;
-class QTreeView;
+#include <QAbstractItemModel>
+#include <QTreeView>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/contact/standardcontactactionmanager.h b/kdepimlibs/akonadi/contact/standardcontactactionmanager.h
index c5659c74..dc64b1f5 100644
--- a/kdepimlibs/akonadi/contact/standardcontactactionmanager.h
+++ b/kdepimlibs/akonadi/contact/standardcontactactionmanager.h
@@ -30,8 +30,8 @@
 
 class KAction;
 class KActionCollection;
-class QItemSelectionModel;
-class QWidget;
+#include <QItemSelectionModel>
+#include <QWidget>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/entitylistview.h b/kdepimlibs/akonadi/entitylistview.h
index fbd125c5..105db596 100644
--- a/kdepimlibs/akonadi/entitylistview.h
+++ b/kdepimlibs/akonadi/entitylistview.h
@@ -27,7 +27,7 @@
 #include <QListView>
 
 class KXMLGUIClient;
-class QDragMoveEvent;
+#include <QDragMoveEvent>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/entitytreeview.h b/kdepimlibs/akonadi/entitytreeview.h
index 7ab662ae..14138bd1 100644
--- a/kdepimlibs/akonadi/entitytreeview.h
+++ b/kdepimlibs/akonadi/entitytreeview.h
@@ -27,7 +27,7 @@
 #include <QTreeView>
 
 class KXMLGUIClient;
-class QDragMoveEvent;
+#include <QDragMoveEvent>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/entitytreeviewstatesaver.h b/kdepimlibs/akonadi/entitytreeviewstatesaver.h
index da1994a6..7ba0144b 100644
--- a/kdepimlibs/akonadi/entitytreeviewstatesaver.h
+++ b/kdepimlibs/akonadi/entitytreeviewstatesaver.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QTreeView;
+#include <QTreeView>
 class KConfigGroup;
 
 namespace Akonadi {
diff --git a/kdepimlibs/akonadi/exception.h b/kdepimlibs/akonadi/exception.h
index 05e2fb30..4783b3f7 100644
--- a/kdepimlibs/akonadi/exception.h
+++ b/kdepimlibs/akonadi/exception.h
@@ -25,7 +25,7 @@
 #include <QtCore/QByteArray>
 #include <exception>
 
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/firstrun_p.h b/kdepimlibs/akonadi/firstrun_p.h
index 5cccedd1..151805ce 100644
--- a/kdepimlibs/akonadi/firstrun_p.h
+++ b/kdepimlibs/akonadi/firstrun_p.h
@@ -27,7 +27,7 @@
 class KConfig;
 class KJob;
 class KProcess;
-struct QMetaObject;
+#include <QMetaObject>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/item.h b/kdepimlibs/akonadi/item.h
index 73c82259..795b1f16 100644
--- a/kdepimlibs/akonadi/item.h
+++ b/kdepimlibs/akonadi/item.h
@@ -43,7 +43,7 @@
 class KUrl;
 
 template <typename T>
-class QVector;
+#include <QVector>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/itemfetchscope.h b/kdepimlibs/akonadi/itemfetchscope.h
index bb014618..fc2cdc4b 100644
--- a/kdepimlibs/akonadi/itemfetchscope.h
+++ b/kdepimlibs/akonadi/itemfetchscope.h
@@ -25,8 +25,8 @@
 #include <QtCore/QSharedDataPointer>
 #include <KDE/KDateTime>
 
-class QStringList;
-template <typename T> class QSet;
+#include <QStringList>
+#include <QSet>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/itemmonitor.h b/kdepimlibs/akonadi/itemmonitor.h
index 6b6d94e5..26331b5d 100644
--- a/kdepimlibs/akonadi/itemmonitor.h
+++ b/kdepimlibs/akonadi/itemmonitor.h
@@ -23,7 +23,7 @@
 #include "akonadi_export.h"
 #include <qglobal.h>
 
-class QStringList;
+#include <QStringList>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/itemserializer_p.h b/kdepimlibs/akonadi/itemserializer_p.h
index 40a6a069..4ee21c29 100644
--- a/kdepimlibs/akonadi/itemserializer_p.h
+++ b/kdepimlibs/akonadi/itemserializer_p.h
@@ -30,7 +30,7 @@
 
 #include <memory>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/itemserializerplugin.h b/kdepimlibs/akonadi/itemserializerplugin.h
index 8204d2da..6cafdd28 100644
--- a/kdepimlibs/akonadi/itemserializerplugin.h
+++ b/kdepimlibs/akonadi/itemserializerplugin.h
@@ -27,7 +27,7 @@
 #include "item.h"
 #include "akonadi_export.h"
 
-class QIODevice;
+#include <QIODevice>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/job.h b/kdepimlibs/akonadi/job.h
index 06e59131..a9c9b5f8 100644
--- a/kdepimlibs/akonadi/job.h
+++ b/kdepimlibs/akonadi/job.h
@@ -26,7 +26,7 @@
 
 #include <kcompositejob.h>
 
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/kdsignalblocker.h b/kdepimlibs/akonadi/kdsignalblocker.h
index f65f26f8..7af03142 100644
--- a/kdepimlibs/akonadi/kdsignalblocker.h
+++ b/kdepimlibs/akonadi/kdsignalblocker.h
@@ -26,7 +26,7 @@
 #include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
-class QObject;
+#include <QObject>
 QT_END_NAMESPACE
 
 namespace Akonadi {
diff --git a/kdepimlibs/akonadi/kmime/emptytrashcommand_p.h b/kdepimlibs/akonadi/kmime/emptytrashcommand_p.h
index 0247a453..99f54fd9 100644
--- a/kdepimlibs/akonadi/kmime/emptytrashcommand_p.h
+++ b/kdepimlibs/akonadi/kmime/emptytrashcommand_p.h
@@ -25,7 +25,7 @@
 #include "akonadi/agentinstance.h"
 #include "akonadi/collection.h"
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 class KJob;
 
 class EmptyTrashCommand : public CommandBase
diff --git a/kdepimlibs/akonadi/kmime/messagestatus.h b/kdepimlibs/akonadi/kmime/messagestatus.h
index 40ab6549..8be24e6f 100644
--- a/kdepimlibs/akonadi/kmime/messagestatus.h
+++ b/kdepimlibs/akonadi/kmime/messagestatus.h
@@ -26,7 +26,7 @@
 
 #include "akonadi-kmime_export.h"
 
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.h b/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.h
index 5d62da3f..52924b8a 100644
--- a/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.h
+++ b/kdepimlibs/akonadi/kmime/messagethreaderproxymodel.h
@@ -24,7 +24,7 @@
 #include <QAbstractProxyModel>
 #include <QtCore/QModelIndex>
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/kmime/movetotrashcommand_p.h b/kdepimlibs/akonadi/kmime/movetotrashcommand_p.h
index d1157670..019ec3f9 100644
--- a/kdepimlibs/akonadi/kmime/movetotrashcommand_p.h
+++ b/kdepimlibs/akonadi/kmime/movetotrashcommand_p.h
@@ -27,7 +27,7 @@
 
 #include <QList>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 class KJob;
 class MoveToTrashCommand : public CommandBase
 {
diff --git a/kdepimlibs/akonadi/kmime/removeduplicatesjob.h b/kdepimlibs/akonadi/kmime/removeduplicatesjob.h
index eae56e0c..02efa564 100644
--- a/kdepimlibs/akonadi/kmime/removeduplicatesjob.h
+++ b/kdepimlibs/akonadi/kmime/removeduplicatesjob.h
@@ -26,7 +26,7 @@
 
 #include "akonadi-kmime_export.h"
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/kmime/standardmailactionmanager.h b/kdepimlibs/akonadi/kmime/standardmailactionmanager.h
index c365e564..59a94702 100644
--- a/kdepimlibs/akonadi/kmime/standardmailactionmanager.h
+++ b/kdepimlibs/akonadi/kmime/standardmailactionmanager.h
@@ -31,8 +31,8 @@
 class KAction;
 class KActionCollection;
 class KJob;
-class QItemSelectionModel;
-class QWidget;
+#include <QItemSelectionModel>
+#include <QWidget>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/kmime/util_p.h b/kdepimlibs/akonadi/kmime/util_p.h
index 7b24c000..71d9d702 100644
--- a/kdepimlibs/akonadi/kmime/util_p.h
+++ b/kdepimlibs/akonadi/kmime/util_p.h
@@ -22,7 +22,7 @@
 
 class OrgKdeAkonadiImapSettingsInterface;
 class KJob;
-class QString;
+#include <QString>
 #define IMAP_RESOURCE_IDENTIFIER QString::fromLatin1("akonadi_imap_resource")
 
 namespace Util
diff --git a/kdepimlibs/akonadi/mimetypechecker.h b/kdepimlibs/akonadi/mimetypechecker.h
index ef23bc6f..90f34155 100644
--- a/kdepimlibs/akonadi/mimetypechecker.h
+++ b/kdepimlibs/akonadi/mimetypechecker.h
@@ -24,8 +24,8 @@
 
 #include <QtCore/QSharedDataPointer>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akonadi {
 class Collection;
diff --git a/kdepimlibs/akonadi/notes/noteutils.h b/kdepimlibs/akonadi/notes/noteutils.h
index a82c5d9a..cc6dc3f5 100644
--- a/kdepimlibs/akonadi/notes/noteutils.h
+++ b/kdepimlibs/akonadi/notes/noteutils.h
@@ -25,7 +25,7 @@
 #include <QtCore/QUrl>
 
 class KDateTime;
-class QString;
+#include <QString>
 
 namespace boost {
   template <typename T> class shared_ptr;
diff --git a/kdepimlibs/akonadi/partfetcher.h b/kdepimlibs/akonadi/partfetcher.h
index 8cd430f7..ed3f7148 100644
--- a/kdepimlibs/akonadi/partfetcher.h
+++ b/kdepimlibs/akonadi/partfetcher.h
@@ -24,7 +24,7 @@
 
 #include "akonadi_export.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/pastehelper_p.h b/kdepimlibs/akonadi/pastehelper_p.h
index 8dcec351..b76b4051 100644
--- a/kdepimlibs/akonadi/pastehelper_p.h
+++ b/kdepimlibs/akonadi/pastehelper_p.h
@@ -25,7 +25,7 @@
 #include <QtCore/QList>
 
 class KJob;
-class QMimeData;
+#include <QMimeData>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/pluginloader_p.h b/kdepimlibs/akonadi/pluginloader_p.h
index 258c6534..b00f17ec 100644
--- a/kdepimlibs/akonadi/pluginloader_p.h
+++ b/kdepimlibs/akonadi/pluginloader_p.h
@@ -26,7 +26,7 @@
 #include <QtCore/QString>
 #include <QtCore/QObject>
 
-class QPluginLoader;
+#include <QPluginLoader>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/recentcollectionaction_p.h b/kdepimlibs/akonadi/recentcollectionaction_p.h
index 7d33e284..4bb6613a 100644
--- a/kdepimlibs/akonadi/recentcollectionaction_p.h
+++ b/kdepimlibs/akonadi/recentcollectionaction_p.h
@@ -23,9 +23,9 @@
 #include <akonadi/collection.h>
 #include <ksharedconfig.h>
 #include <akonadi/standardactionmanager.h>
-class QMenu;
-class QAbstractItemModel;
-class QAction;
+#include <QMenu>
+#include <QAbstractItemModel>
+#include <QAction>
 /**
  * @short A class to manage recent selected folder.
  *
diff --git a/kdepimlibs/akonadi/renamefavoritedialog.h b/kdepimlibs/akonadi/renamefavoritedialog.h
index 852b2d0f..6df154b1 100644
--- a/kdepimlibs/akonadi/renamefavoritedialog.h
+++ b/kdepimlibs/akonadi/renamefavoritedialog.h
@@ -23,7 +23,7 @@
 #include <KDialog>
 #include <akonadi/collection.h>
 
-class QLabel;
+#include <QLabel>
 class KLineEdit;
 
 class RenameFavoriteDialog : public KDialog
diff --git a/kdepimlibs/akonadi/selftestdialog_p.h b/kdepimlibs/akonadi/selftestdialog_p.h
index 01420410..6ebd2f8e 100644
--- a/kdepimlibs/akonadi/selftestdialog_p.h
+++ b/kdepimlibs/akonadi/selftestdialog_p.h
@@ -26,8 +26,8 @@
 #include <KDialog>
 #include <KLocalizedString>
 
-class QStandardItem;
-class QStandardItemModel;
+#include <QStandardItem>
+#include <QStandardItemModel>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/servermanager_p.h b/kdepimlibs/akonadi/servermanager_p.h
index 29195197..402332a1 100644
--- a/kdepimlibs/akonadi/servermanager_p.h
+++ b/kdepimlibs/akonadi/servermanager_p.h
@@ -20,7 +20,7 @@
 #ifndef AKONADI_SERVERMANAGER_P_H
 #define AKONADI_SERVERMANAGER_P_H
 
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/session_p.h b/kdepimlibs/akonadi/session_p.h
index 93bfe70e..de0cdb2d 100644
--- a/kdepimlibs/akonadi/session_p.h
+++ b/kdepimlibs/akonadi/session_p.h
@@ -32,7 +32,7 @@
 #include <QtCore/QThreadStorage>
 #include <QFile>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/socialutils/imageprovider.h b/kdepimlibs/akonadi/socialutils/imageprovider.h
index b4b18468..337a3a5e 100644
--- a/kdepimlibs/akonadi/socialutils/imageprovider.h
+++ b/kdepimlibs/akonadi/socialutils/imageprovider.h
@@ -27,7 +27,7 @@
 #include <KDE/KUrl>
 
 class KJob;
-class QImage;
+#include <QImage>
 class KImageCache;
 
 namespace KIO {
diff --git a/kdepimlibs/akonadi/standardactionmanager.h b/kdepimlibs/akonadi/standardactionmanager.h
index 5e1dadaf..7c77c925 100644
--- a/kdepimlibs/akonadi/standardactionmanager.h
+++ b/kdepimlibs/akonadi/standardactionmanager.h
@@ -30,9 +30,9 @@
 class KAction;
 class KActionCollection;
 class KLocalizedString;
-class QItemSelectionModel;
-class QWidget;
-class QMenu;
+#include <QItemSelectionModel>
+#include <QWidget>
+#include <QMenu>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/tagmodel_p.h b/kdepimlibs/akonadi/tagmodel_p.h
index f7a6f604..d6ee1aee 100644
--- a/kdepimlibs/akonadi/tagmodel_p.h
+++ b/kdepimlibs/akonadi/tagmodel_p.h
@@ -22,7 +22,7 @@
 
 #include "tag.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace Akonadi
 {
diff --git a/kdepimlibs/akonadi/tests/testresource/knutresource.h b/kdepimlibs/akonadi/tests/testresource/knutresource.h
index 7d2e635d..08c18f7a 100644
--- a/kdepimlibs/akonadi/tests/testresource/knutresource.h
+++ b/kdepimlibs/akonadi/tests/testresource/knutresource.h
@@ -33,7 +33,7 @@
 
 #include "settings.h"
 
-class QFileSystemWatcher;
+#include <QFileSystemWatcher>
 
 class KnutResource : public Akonadi::ResourceBase,
                      public Akonadi::AgentBase::ObserverV2,
diff --git a/kdepimlibs/akonadi/tests/testrunner/setup.h b/kdepimlibs/akonadi/tests/testrunner/setup.h
index 718a33a6..0240f3ec 100644
--- a/kdepimlibs/akonadi/tests/testrunner/setup.h
+++ b/kdepimlibs/akonadi/tests/testrunner/setup.h
@@ -26,9 +26,9 @@
 #include <QVector>
 #include <QPair>
 
-class QIODevice;
+#include <QIODevice>
 class KProcess;
-class QSignalMapper;
+#include <QSignalMapper>
 class KJob;
 
 class SetupTest : public QObject
diff --git a/kdepimlibs/akonadi/trashsettings.h b/kdepimlibs/akonadi/trashsettings.h
index c5b0860b..8aa3c4cb 100644
--- a/kdepimlibs/akonadi/trashsettings.h
+++ b/kdepimlibs/akonadi/trashsettings.h
@@ -23,7 +23,7 @@
 #include "akonadi_export.h"
 #include <akonadi/collection.h>
 
-class QString;
+#include <QString>
 
 namespace Akonadi {
 
diff --git a/kdepimlibs/akonadi/typepluginloader_p.h b/kdepimlibs/akonadi/typepluginloader_p.h
index 536272b0..110453f6 100644
--- a/kdepimlibs/akonadi/typepluginloader_p.h
+++ b/kdepimlibs/akonadi/typepluginloader_p.h
@@ -23,10 +23,10 @@
 
 #include <QtCore/qglobal.h>
 
-class QObject;
-class QString;
+#include <QObject>
+#include <QString>
 template <typename T>
-class QVector;
+#include <QVector>
 
 namespace Akonadi {
 class ItemSerializerPlugin;
diff --git a/kdepimlibs/gpgme++/global.h b/kdepimlibs/gpgme++/global.h
index 91fb0b05..2fe2191c 100644
--- a/kdepimlibs/gpgme++/global.h
+++ b/kdepimlibs/gpgme++/global.h
@@ -39,7 +39,7 @@ namespace GpgME {
 
 struct _GIOChannel;
 typedef struct _GIOChannel      GIOChannel;
-class QIODevice;
+#include <QIODevice>
 
 namespace GpgME {
 
diff --git a/kdepimlibs/kabc/contactgroup.h b/kdepimlibs/kabc/contactgroup.h
index 11922f91..f77a55a8 100644
--- a/kdepimlibs/kabc/contactgroup.h
+++ b/kdepimlibs/kabc/contactgroup.h
@@ -27,7 +27,7 @@
 
 #include "kabc_export.h"
 
-class QString;
+#include <QString>
 
 namespace KABC {
 
diff --git a/kdepimlibs/kabc/contactgrouptool.h b/kdepimlibs/kabc/contactgrouptool.h
index 9768393b..516957ee 100644
--- a/kdepimlibs/kabc/contactgrouptool.h
+++ b/kdepimlibs/kabc/contactgrouptool.h
@@ -24,10 +24,10 @@
 
 #include "kabc_export.h"
 
-class QIODevice;
-class QString;
+#include <QIODevice>
+#include <QString>
 
-template <class T> class QList;
+#include <QList>
 
 namespace KABC {
 
diff --git a/kdepimlibs/kabc/errorhandler.h b/kdepimlibs/kabc/errorhandler.h
index 00cb9650..d2629824 100644
--- a/kdepimlibs/kabc/errorhandler.h
+++ b/kdepimlibs/kabc/errorhandler.h
@@ -25,7 +25,7 @@
 #include "kabc_export.h"
 #include <QtCore/QString>
 
-class QWidget;
+#include <QWidget>
 
 namespace KABC {
 
diff --git a/kdepimlibs/kabc/plugins/file/resourcefile.h b/kdepimlibs/kabc/plugins/file/resourcefile.h
index 988eab7a..1c3f4450 100644
--- a/kdepimlibs/kabc/plugins/file/resourcefile.h
+++ b/kdepimlibs/kabc/plugins/file/resourcefile.h
@@ -30,7 +30,7 @@
 
 #include <sys/types.h>
 
-class QFile;
+#include <QFile>
 class KTemporaryFile;
 
 class KJob;
diff --git a/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.h b/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.h
index afde68ef..7ddcb3f7 100644
--- a/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.h
+++ b/kdepimlibs/kabc/plugins/ldapkio/resourceldapkioconfig.h
@@ -34,9 +34,9 @@
 #include <QtCore/QHash>
 #include <QtCore/QMap>
 
-class QCheckBox;
-class QPushButton;
-class QString;
+#include <QCheckBox>
+#include <QPushButton>
+#include <QString>
 
 class KComboBox;
 class KLineEdit;
diff --git a/kdepimlibs/kabc/plugins/net/resourcenet.h b/kdepimlibs/kabc/plugins/net/resourcenet.h
index 6ef244c1..0b79b24d 100644
--- a/kdepimlibs/kabc/plugins/net/resourcenet.h
+++ b/kdepimlibs/kabc/plugins/net/resourcenet.h
@@ -26,7 +26,7 @@
 #include "kabc/resource.h"
 #include <sys/types.h>
 
-class QFile;
+#include <QFile>
 class KTemporaryFile;
 
 class KJob;
diff --git a/kdepimlibs/kabc/tests/testlock.h b/kdepimlibs/kabc/tests/testlock.h
index d9e28c27..bf22d186 100644
--- a/kdepimlibs/kabc/tests/testlock.h
+++ b/kdepimlibs/kabc/tests/testlock.h
@@ -26,8 +26,8 @@
 
 #include "kabc/lock.h"
 
-class QLabel;
-class QTreeWidget;
+#include <QLabel>
+#include <QTreeWidget>
 
 class LockWidget : public QWidget
 {
diff --git a/kdepimlibs/kabc/vcardtool.h b/kdepimlibs/kabc/vcardtool.h
index 6f2b3707..de8a1ef5 100644
--- a/kdepimlibs/kabc/vcardtool.h
+++ b/kdepimlibs/kabc/vcardtool.h
@@ -25,7 +25,7 @@
 #include "addressee.h"
 #include "vcardparser/vcardparser.h"
 
-class QDateTime;
+#include <QDateTime>
 
 namespace KABC {
 
diff --git a/kdepimlibs/kalarmcal/identities.h b/kdepimlibs/kalarmcal/identities.h
index 6f18c11f..bf2d480f 100644
--- a/kdepimlibs/kalarmcal/identities.h
+++ b/kdepimlibs/kalarmcal/identities.h
@@ -26,7 +26,7 @@
 #include "kalarmcal_export.h"
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 namespace KPIMIdentities { class IdentityManager; }
 
diff --git a/kdepimlibs/kblog/blog.h b/kdepimlibs/kblog/blog.h
index 2407a776..d2245bc0 100644
--- a/kdepimlibs/kblog/blog.h
+++ b/kdepimlibs/kblog/blog.h
@@ -28,7 +28,7 @@
 
 #include <QtCore/QObject>
 
-template <class T,class S> class QMap;
+#include <QMap>
 
 class KTimeZone;
 class KUrl;
diff --git a/kdepimlibs/kblog/blogpost.h b/kdepimlibs/kblog/blogpost.h
index 06669e09..9c2895ed 100644
--- a/kdepimlibs/kblog/blogpost.h
+++ b/kdepimlibs/kblog/blogpost.h
@@ -29,7 +29,7 @@
 
 #include <QtCore/QtAlgorithms>
 
-class QStringList;
+#include <QStringList>
 
 class KDateTime;
 class KUrl;
diff --git a/kdepimlibs/kblog/gdata_p.h b/kdepimlibs/kblog/gdata_p.h
index 4aa465a2..3b85538d 100644
--- a/kdepimlibs/kblog/gdata_p.h
+++ b/kdepimlibs/kblog/gdata_p.h
@@ -28,9 +28,9 @@
 #include <syndication/loader.h>
 
 class KJob;
-class QDateTime;
-class QByteArray;
-template <class T,class S>class QMap;
+#include <QDateTime>
+#include <QByteArray>
+#include <QMap>
 
 namespace KIO
 {
diff --git a/kdepimlibs/kblog/movabletype_p.h b/kdepimlibs/kblog/movabletype_p.h
index 9f2f398b..b0ea9978 100644
--- a/kdepimlibs/kblog/movabletype_p.h
+++ b/kdepimlibs/kblog/movabletype_p.h
@@ -28,7 +28,7 @@
 
 #include <kxmlrpcclient/client.h>
 class KJob;
-class QByteArray;
+#include <QByteArray>
 
 namespace KIO
 {
diff --git a/kdepimlibs/kblog/wordpressbuggy_p.h b/kdepimlibs/kblog/wordpressbuggy_p.h
index c32d8550..d322ee5e 100644
--- a/kdepimlibs/kblog/wordpressbuggy_p.h
+++ b/kdepimlibs/kblog/wordpressbuggy_p.h
@@ -29,8 +29,8 @@
 #include <kxmlrpcclient/client.h>
 
 class KJob;
-class QByteArray;
-template <class T,class S>class QMap;
+#include <QByteArray>
+#include <QMap>
 
 namespace KIO
 {
diff --git a/kdepimlibs/kcal/calendarresources.h b/kdepimlibs/kcal/calendarresources.h
index 798c161f..4c162653 100644
--- a/kdepimlibs/kcal/calendarresources.h
+++ b/kdepimlibs/kcal/calendarresources.h
@@ -39,7 +39,7 @@
 
 #include "kcal_export.h"
 
-class QWidget;
+#include <QWidget>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/calhelper.h b/kdepimlibs/kcal/calhelper.h
index 8598f437..dc79e251 100644
--- a/kdepimlibs/kcal/calhelper.h
+++ b/kdepimlibs/kcal/calhelper.h
@@ -32,7 +32,7 @@
 #include "kcal_export.h"
 #include <QtCore/QPair>
 
-class QString;
+#include <QString>
 
 namespace KCal {
 class Calendar;
diff --git a/kdepimlibs/kcal/compat.h b/kdepimlibs/kcal/compat.h
index 3f027193..9ff3bfb1 100644
--- a/kdepimlibs/kcal/compat.h
+++ b/kdepimlibs/kcal/compat.h
@@ -34,7 +34,7 @@
 #include "kcal_export.h"
 #include <QtCore/QString>
 
-class QDate;
+#include <QDate>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/dndfactory.h b/kdepimlibs/kcal/dndfactory.h
index df84d262..4d3e362e 100644
--- a/kdepimlibs/kcal/dndfactory.h
+++ b/kdepimlibs/kcal/dndfactory.h
@@ -39,12 +39,12 @@
 
 #include <KDE/KDateTime>
 
-class QDate;
-class QTime;
-class QDrag;
-class QWidget;
-class QDropEvent;
-class QMimeData;
+#include <QDate>
+#include <QTime>
+#include <QDrag>
+#include <QWidget>
+#include <QDropEvent>
+#include <QMimeData>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/freebusycache.h b/kdepimlibs/kcal/freebusycache.h
index 7ad3791f..bd6fa1e1 100644
--- a/kdepimlibs/kcal/freebusycache.h
+++ b/kdepimlibs/kcal/freebusycache.h
@@ -29,7 +29,7 @@
 #ifndef KCAL_FREEBUSYCACHE_H
 #define KCAL_FREEBUSYCACHE_H
 
-class QString;
+#include <QString>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/htmlexport.h b/kdepimlibs/kcal/htmlexport.h
index c0af89b3..e39d5e5a 100644
--- a/kdepimlibs/kcal/htmlexport.h
+++ b/kdepimlibs/kcal/htmlexport.h
@@ -28,7 +28,7 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
-class QTextStream;
+#include <QTextStream>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/icaldrag.h b/kdepimlibs/kcal/icaldrag.h
index 7bb0386a..0e641554 100644
--- a/kdepimlibs/kcal/icaldrag.h
+++ b/kdepimlibs/kcal/icaldrag.h
@@ -26,7 +26,7 @@
 #include "kcal_export.h"
 #include <QtCore/QString>
 
-class QMimeData;
+#include <QMimeData>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcal/resourcelocaldir_p.h b/kdepimlibs/kcal/resourcelocaldir_p.h
index 6697f8d4..f89919a4 100644
--- a/kdepimlibs/kcal/resourcelocaldir_p.h
+++ b/kdepimlibs/kcal/resourcelocaldir_p.h
@@ -24,7 +24,7 @@
 #include <kurl.h>
 #include <kdirwatch.h>
 
-class QString;
+#include <QString>
 namespace KABC { class Lock; }
 
 namespace KCal {
diff --git a/kdepimlibs/kcal/vcaldrag.h b/kdepimlibs/kcal/vcaldrag.h
index 63e6f9d2..990056da 100644
--- a/kdepimlibs/kcal/vcaldrag.h
+++ b/kdepimlibs/kcal/vcaldrag.h
@@ -25,7 +25,7 @@
 #include "kcal_export.h"
 #include <QtCore/QString>
 
-class QMimeData;
+#include <QMimeData>
 
 namespace KCal {
 
diff --git a/kdepimlibs/kcalcore/compat.h b/kdepimlibs/kcalcore/compat.h
index 0c5a4726..b4f43cd9 100644
--- a/kdepimlibs/kcalcore/compat.h
+++ b/kdepimlibs/kcalcore/compat.h
@@ -36,8 +36,8 @@
 
 #include <QtCore/QtGlobal> // for Q_DISABLE_COPY()
 
-class QDate;
-class QString;
+#include <QDate>
+#include <QString>
 
 namespace KCalCore {
 
diff --git a/kdepimlibs/kcalcore/freebusycache.h b/kdepimlibs/kcalcore/freebusycache.h
index 5fb1bb60..0276a7cc 100644
--- a/kdepimlibs/kcalcore/freebusycache.h
+++ b/kdepimlibs/kcalcore/freebusycache.h
@@ -33,7 +33,7 @@
 
 #include "freebusy.h"
 
-class QString;
+#include <QString>
 
 namespace KCalCore {
 
diff --git a/kdepimlibs/kcalcore/icalformat_p.h b/kdepimlibs/kcalcore/icalformat_p.h
index ccc03ecf..9d348be4 100644
--- a/kdepimlibs/kcalcore/icalformat_p.h
+++ b/kdepimlibs/kcalcore/icalformat_p.h
@@ -46,7 +46,7 @@
 
 #include <libical/ical.h>
 
-class QDate;
+#include <QDate>
 
 namespace KCalCore {
 
diff --git a/kdepimlibs/kcalcore/incidencebase.h b/kdepimlibs/kcalcore/incidencebase.h
index e2f08472..3563f59c 100644
--- a/kdepimlibs/kcalcore/incidencebase.h
+++ b/kdepimlibs/kcalcore/incidencebase.h
@@ -68,7 +68,7 @@
 #include <QDataStream>
 
 class KUrl;
-class QDate;
+#include <QDate>
 
 namespace KCalCore {
 
diff --git a/kdepimlibs/kcalcore/recurrence.h b/kdepimlibs/kcalcore/recurrence.h
index acf5ebcc..50c6f0be 100644
--- a/kdepimlibs/kcalcore/recurrence.h
+++ b/kdepimlibs/kcalcore/recurrence.h
@@ -27,7 +27,7 @@
 #include "kcalcore_export.h"
 #include "recurrencerule.h"
 
-class QBitArray;
+#include <QBitArray>
 
 namespace KCalCore {
 
diff --git a/kdepimlibs/kcalcore/vcalformat.h b/kdepimlibs/kcalcore/vcalformat.h
index 08cea733..36f0bb82 100644
--- a/kdepimlibs/kcalcore/vcalformat.h
+++ b/kdepimlibs/kcalcore/vcalformat.h
@@ -49,7 +49,7 @@ struct VObject;
 
 class KDateTime;
 
-class QDate;
+#include <QDate>
 
 #define _VCAL_VERSION "1.0"
 
diff --git a/kdepimlibs/kcalutils/dndfactory.h b/kdepimlibs/kcalutils/dndfactory.h
index 315aad85..1a287678 100644
--- a/kdepimlibs/kcalutils/dndfactory.h
+++ b/kdepimlibs/kcalutils/dndfactory.h
@@ -42,9 +42,9 @@
 
 #include <KDE/KDateTime>
 
-class QDrag;
-class QDropEvent;
-class QMimeData;
+#include <QDrag>
+#include <QDropEvent>
+#include <QMimeData>
 
 namespace KCalUtils {
 
diff --git a/kdepimlibs/kcalutils/htmlexport.h b/kdepimlibs/kcalutils/htmlexport.h
index fd2e7a7c..58a47427 100644
--- a/kdepimlibs/kcalutils/htmlexport.h
+++ b/kdepimlibs/kcalutils/htmlexport.h
@@ -35,7 +35,7 @@ namespace KCalCore {
 class MemoryCalendar;
 }
 
-class QTextStream;
+#include <QTextStream>
 
 namespace KCalUtils {
 
diff --git a/kdepimlibs/kcalutils/icaldrag.h b/kdepimlibs/kcalutils/icaldrag.h
index b4945254..26f6c8ce 100644
--- a/kdepimlibs/kcalutils/icaldrag.h
+++ b/kdepimlibs/kcalutils/icaldrag.h
@@ -26,7 +26,7 @@
 
 #include <kcalcore/memorycalendar.h>
 
-class QMimeData;
+#include <QMimeData>
 
 namespace KCalUtils {
 
diff --git a/kdepimlibs/kcalutils/recurrenceactions.h b/kdepimlibs/kcalutils/recurrenceactions.h
index c0c2d584..c00a9d3f 100644
--- a/kdepimlibs/kcalutils/recurrenceactions.h
+++ b/kdepimlibs/kcalutils/recurrenceactions.h
@@ -29,7 +29,7 @@
 
 class KDateTime;
 class KGuiItem;
-class QWidget;
+#include <QWidget>
 
 namespace KCalUtils {
 
diff --git a/kdepimlibs/kcalutils/vcaldrag.h b/kdepimlibs/kcalutils/vcaldrag.h
index 7d89ed9d..3087daf7 100644
--- a/kdepimlibs/kcalutils/vcaldrag.h
+++ b/kdepimlibs/kcalutils/vcaldrag.h
@@ -25,7 +25,7 @@
 #include "kcalutils_export.h"
 #include <kcalcore/memorycalendar.h>
 
-class QMimeData;
+#include <QMimeData>
 
 namespace KCalUtils {
 
diff --git a/kdepimlibs/kholidays/astroseasons.h b/kdepimlibs/kholidays/astroseasons.h
index 20bea4bb..8c3affe4 100644
--- a/kdepimlibs/kholidays/astroseasons.h
+++ b/kdepimlibs/kholidays/astroseasons.h
@@ -44,8 +44,8 @@
 
 #include "kholidays_export.h"
 
-class QDate;
-class QString;
+#include <QDate>
+#include <QString>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kholidays/holiday.h b/kdepimlibs/kholidays/holiday.h
index 333cab8a..e23b525e 100644
--- a/kdepimlibs/kholidays/holiday.h
+++ b/kdepimlibs/kholidays/holiday.h
@@ -30,8 +30,8 @@
 #include <QtCore/QList>
 #include <QtCore/QSharedDataPointer>
 
-class QDate;
-class QString;
+#include <QDate>
+#include <QString>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kholidays/holidayregion.h b/kdepimlibs/kholidays/holidayregion.h
index 3e778d53..f0c17221 100644
--- a/kdepimlibs/kholidays/holidayregion.h
+++ b/kdepimlibs/kholidays/holidayregion.h
@@ -33,9 +33,9 @@
 
 #include "holiday.h"
 
-class QDate;
-class QStringList;
-class QFileInfo;
+#include <QDate>
+#include <QStringList>
+#include <QFileInfo>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kholidays/holidayregionselector.h b/kdepimlibs/kholidays/holidayregionselector.h
index 0a9b1efe..8a63013b 100644
--- a/kdepimlibs/kholidays/holidayregionselector.h
+++ b/kdepimlibs/kholidays/holidayregionselector.h
@@ -26,8 +26,8 @@
 
 #include <QTreeWidget>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kholidays/lunarphase.h b/kdepimlibs/kholidays/lunarphase.h
index 70992e85..38db4c2c 100644
--- a/kdepimlibs/kholidays/lunarphase.h
+++ b/kdepimlibs/kholidays/lunarphase.h
@@ -24,8 +24,8 @@
 
 #include "kholidays_export.h"
 
-class QDate;
-class QString;
+#include <QDate>
+#include <QString>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kholidays/tests/testholidayregion.h b/kdepimlibs/kholidays/tests/testholidayregion.h
index f44e7355..b89c2626 100644
--- a/kdepimlibs/kholidays/tests/testholidayregion.h
+++ b/kdepimlibs/kholidays/tests/testholidayregion.h
@@ -26,8 +26,8 @@
 
 #include "holidays.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class HolidayRegionTest : public QObject
 {
diff --git a/kdepimlibs/kholidays/zodiac.h b/kdepimlibs/kholidays/zodiac.h
index 71fcc931..ce91dd53 100644
--- a/kdepimlibs/kholidays/zodiac.h
+++ b/kdepimlibs/kholidays/zodiac.h
@@ -55,8 +55,8 @@
 
 #include <QtCore/QSharedDataPointer>
 
-class QDate;
-class QString;
+#include <QDate>
+#include <QString>
 
 namespace KHolidays {
 
diff --git a/kdepimlibs/kimap/imapstreamparser.h b/kdepimlibs/kimap/imapstreamparser.h
index 12e97b0b..a69efa22 100644
--- a/kdepimlibs/kimap/imapstreamparser.h
+++ b/kdepimlibs/kimap/imapstreamparser.h
@@ -29,7 +29,7 @@
 #include <QtCore/QList>
 #include <QtCore/QString>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace KIMAP {
 
diff --git a/kdepimlibs/kimap/rfccodecs.h b/kdepimlibs/kimap/rfccodecs.h
index 922189c1..429fc3bc 100644
--- a/kdepimlibs/kimap/rfccodecs.h
+++ b/kdepimlibs/kimap/rfccodecs.h
@@ -37,7 +37,7 @@
 
 #include "kimap_export.h"
 
-class QTextCodec;
+#include <QTextCodec>
 
 namespace KIMAP {
 
diff --git a/kdepimlibs/kimap/searchjob.h b/kdepimlibs/kimap/searchjob.h
index ef0f197f..1aa3e943 100644
--- a/kdepimlibs/kimap/searchjob.h
+++ b/kdepimlibs/kimap/searchjob.h
@@ -25,7 +25,7 @@
 
 #include "job.h"
 
-class QDate;
+#include <QDate>
 
 namespace KIMAP {
 
diff --git a/kdepimlibs/kioslave/imap4/imapparser.h b/kdepimlibs/kioslave/imap4/imapparser.h
index 24737cae..0eabc98b 100644
--- a/kdepimlibs/kioslave/imap4/imapparser.h
+++ b/kdepimlibs/kioslave/imap4/imapparser.h
@@ -39,7 +39,7 @@
 #include <QByteArray>
 
 class KUrl;
-class QString;
+#include <QString>
 class mailAddress;
 class mimeHeader;
 
diff --git a/kdepimlibs/kioslave/mbox/mbox.h b/kdepimlibs/kioslave/mbox/mbox.h
index ddd94037..815ef6a5 100644
--- a/kdepimlibs/kioslave/mbox/mbox.h
+++ b/kdepimlibs/kioslave/mbox/mbox.h
@@ -23,7 +23,7 @@
 //Added by qt3to4:
 #include <QByteArray>
 
-class QByteArray;
+#include <QByteArray>
 class KUrl;
 
 /**
diff --git a/kdepimlibs/kioslave/mbox/readmbox.h b/kdepimlibs/kioslave/mbox/readmbox.h
index 2210c5f3..d4524b34 100644
--- a/kdepimlibs/kioslave/mbox/readmbox.h
+++ b/kdepimlibs/kioslave/mbox/readmbox.h
@@ -26,9 +26,9 @@
 class UrlInfo;
 class MBox;
 
-class QFile;
-class QString;
-class QTextStream;
+#include <QFile>
+#include <QString>
+#include <QTextStream>
 
 struct utimbuf;
 
diff --git a/kdepimlibs/kioslave/mbox/urlinfo.h b/kdepimlibs/kioslave/mbox/urlinfo.h
index f5978ab2..6c1ea44d 100644
--- a/kdepimlibs/kioslave/mbox/urlinfo.h
+++ b/kdepimlibs/kioslave/mbox/urlinfo.h
@@ -20,7 +20,7 @@
 #define URLINFO_H
 class KUrl;
 
-class QString;
+#include <QString>
 
 class UrlInfo
 {
diff --git a/kdepimlibs/kioslave/smtp/response.h b/kdepimlibs/kioslave/smtp/response.h
index 4558a846..be6be111 100644
--- a/kdepimlibs/kioslave/smtp/response.h
+++ b/kdepimlibs/kioslave/smtp/response.h
@@ -36,7 +36,7 @@
 #include <QString>
 typedef QList<QByteArray> QCStringList;
 
-class QString;
+#include <QString>
 
 namespace KioSMTP {
 
diff --git a/kdepimlibs/kioslave/smtp/smtpsessioninterface.h b/kdepimlibs/kioslave/smtp/smtpsessioninterface.h
index 0c21ff45..4aedde67 100644
--- a/kdepimlibs/kioslave/smtp/smtpsessioninterface.h
+++ b/kdepimlibs/kioslave/smtp/smtpsessioninterface.h
@@ -22,8 +22,8 @@
 
 #include "capabilities.h"
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace KIO {
 class AuthInfo;
diff --git a/kdepimlibs/kioslave/smtp/tests/interactivesmtpserver.h b/kdepimlibs/kioslave/smtp/tests/interactivesmtpserver.h
index 3d0f50fc..8def600a 100644
--- a/kdepimlibs/kioslave/smtp/tests/interactivesmtpserver.h
+++ b/kdepimlibs/kioslave/smtp/tests/interactivesmtpserver.h
@@ -37,10 +37,10 @@
 #include <QWidget>
 #include <QtNetwork/QTcpServer>
 
-class QLabel;
-class QLineEdit;
-class QTcpServer;
-class QTextEdit;
+#include <QLabel>
+#include <QLineEdit>
+#include <QTcpServer>
+#include <QTextEdit>
 
 class InteractiveSMTPServerWindow : public QWidget
 {
diff --git a/kdepimlibs/kmime/kmime_codec_identity.h b/kdepimlibs/kmime/kmime_codec_identity.h
index 65f137ec..c94b2f0a 100644
--- a/kdepimlibs/kmime/kmime_codec_identity.h
+++ b/kdepimlibs/kmime/kmime_codec_identity.h
@@ -37,7 +37,7 @@
 
 #include "kmime_codecs.h"
 
-class QByteArray;
+#include <QByteArray>
 
 namespace KMime {
 
diff --git a/kdepimlibs/kmime/kmime_header_parsing.h b/kdepimlibs/kmime/kmime_header_parsing.h
index 22caa03b..15c4601d 100644
--- a/kdepimlibs/kmime/kmime_header_parsing.h
+++ b/kdepimlibs/kmime/kmime_header_parsing.h
@@ -31,8 +31,8 @@
 
 #include "kmime_export.h"
 
-template <typename K, typename V> class QMap;
-class QStringList;
+#include <QMap>
+#include <QStringList>
 
 namespace KMime {
 
diff --git a/kdepimlibs/kmime/kmime_header_parsing_p.h b/kdepimlibs/kmime/kmime_header_parsing_p.h
index 5238823b..b2b65e8a 100644
--- a/kdepimlibs/kmime/kmime_header_parsing_p.h
+++ b/kdepimlibs/kmime/kmime_header_parsing_p.h
@@ -21,7 +21,7 @@
 
 #include <QList>
 
-class QByteArray;
+#include <QByteArray>
 
 namespace KMime {
 
diff --git a/kdepimlibs/kmime/kmime_mdn.h b/kdepimlibs/kmime/kmime_mdn.h
index 3f3026fa..c2c6ef86 100644
--- a/kdepimlibs/kmime/kmime_mdn.h
+++ b/kdepimlibs/kmime/kmime_mdn.h
@@ -50,7 +50,7 @@
 #include <QtCore/QString>
 #include <QtCore/QList>
 
-class QByteArray;
+#include <QByteArray>
 
 namespace KMime {
 
diff --git a/kdepimlibs/kontactinterface/plugin.h b/kdepimlibs/kontactinterface/plugin.h
index cbc569e3..48b2599a 100644
--- a/kdepimlibs/kontactinterface/plugin.h
+++ b/kdepimlibs/kontactinterface/plugin.h
@@ -36,10 +36,10 @@ class KAboutData;
 class KAction;
 class KConfig;
 class KConfigGroup;
-class QDropEvent;
-class QMimeData;
-class QStringList;
-class QWidget;
+#include <QDropEvent>
+#include <QMimeData>
+#include <QStringList>
+#include <QWidget>
 namespace KParts {
   class ReadOnlyPart;
 }
diff --git a/kdepimlibs/kontactinterface/summary.h b/kdepimlibs/kontactinterface/summary.h
index 6dbe7396..f727f002 100644
--- a/kdepimlibs/kontactinterface/summary.h
+++ b/kdepimlibs/kontactinterface/summary.h
@@ -26,9 +26,9 @@
 #include <QWidget>
 
 class KStatusBar;
-class QMouseEvent;
-class QDragEnterEvent;
-class QDropEvent;
+#include <QMouseEvent>
+#include <QDragEnterEvent>
+#include <QDropEvent>
 
 namespace KontactInterface {
 
diff --git a/kdepimlibs/kpimidentities/identity.h b/kdepimlibs/kpimidentities/identity.h
index ab033f52..9ac0181f 100644
--- a/kdepimlibs/kpimidentities/identity.h
+++ b/kdepimlibs/kpimidentities/identity.h
@@ -39,8 +39,8 @@ namespace KPIMIdentities
   class Signature;
 }
 class KConfigGroup;
-class QDataStream;
-class QMimeData;
+#include <QDataStream>
+#include <QMimeData>
 
 namespace KPIMIdentities
 {
diff --git a/kdepimlibs/kpimidentities/identitycombo.h b/kdepimlibs/kpimidentities/identitycombo.h
index 436f3b42..dc585b4b 100644
--- a/kdepimlibs/kpimidentities/identitycombo.h
+++ b/kdepimlibs/kpimidentities/identitycombo.h
@@ -33,7 +33,7 @@
 #include "kpimidentities_export.h"
 #include <QComboBox>
 
-class QString;
+#include <QString>
 
 namespace KPIMIdentities
 {
diff --git a/kdepimlibs/kpimidentities/identitymanager.h b/kdepimlibs/kpimidentities/identitymanager.h
index 3119801e..a8ca24d5 100644
--- a/kdepimlibs/kpimidentities/identitymanager.h
+++ b/kdepimlibs/kpimidentities/identitymanager.h
@@ -26,7 +26,7 @@
 
 class KConfigBase;
 class KConfig;
-class QStringList;
+#include <QStringList>
 
 namespace KPIMIdentities
 {
diff --git a/kdepimlibs/kpimidentities/signatureconfigurator.h b/kdepimlibs/kpimidentities/signatureconfigurator.h
index 89ec927b..1cd7fc24 100644
--- a/kdepimlibs/kpimidentities/signatureconfigurator.h
+++ b/kdepimlibs/kpimidentities/signatureconfigurator.h
@@ -27,16 +27,16 @@
 
 using KPIMIdentities::Signature;
 
-class QCheckBox;
+#include <QCheckBox>
 class KComboBox;
 class KUrlRequester;
 class KLineEdit;
 class KToolBar;
 class KRichTextWidget;
-class QString;
-class QPushButton;
-class QTextEdit;
-class QTextCharFormat;
+#include <QString>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTextCharFormat>
 
 namespace KPIMIdentities {
 
diff --git a/kdepimlibs/kpimtextedit/textedit.h b/kdepimlibs/kpimtextedit/textedit.h
index 5faa222c..4db8ae77 100644
--- a/kdepimlibs/kpimtextedit/textedit.h
+++ b/kdepimlibs/kpimtextedit/textedit.h
@@ -36,7 +36,7 @@
 #define FIX_KMAIL_INSERT_IMAGE 1
 
 class KUrl;
-class QFileInfo;
+#include <QFileInfo>
 
 namespace KPIMTextEdit {
 
diff --git a/kdepimlibs/kpimtextedit/textutils.h b/kdepimlibs/kpimtextedit/textutils.h
index a22bdce7..46317a9f 100644
--- a/kdepimlibs/kpimtextedit/textutils.h
+++ b/kdepimlibs/kpimtextedit/textutils.h
@@ -26,7 +26,7 @@
 #include "kpimtextedit_export.h"
 #include <qglobal.h>
 
-class QTextDocument;
+#include <QTextDocument>
 
 namespace KPIMTextEdit {
 
diff --git a/kdepimlibs/kpimutils/kfileio.h b/kdepimlibs/kpimutils/kfileio.h
index 900f2c1a..125a2002 100644
--- a/kdepimlibs/kpimutils/kfileio.h
+++ b/kdepimlibs/kpimutils/kfileio.h
@@ -23,9 +23,9 @@
 
 #include "kpimutils_export.h"
 
-class QByteArray;
-class QString;
-class QWidget;
+#include <QByteArray>
+#include <QString>
+#include <QWidget>
 
 namespace KPIMUtils {
 
diff --git a/kdepimlibs/kpimutils/processes.h b/kdepimlibs/kpimutils/processes.h
index fde8d2c7..df4fcbf1 100644
--- a/kdepimlibs/kpimutils/processes.h
+++ b/kdepimlibs/kpimutils/processes.h
@@ -36,7 +36,7 @@
 
 #include <QtCore/QList>
 
-class QString;
+#include <QString>
 
 namespace KPIMUtils {
 
diff --git a/kdepimlibs/kpimutils/progressindicatorwidget.h b/kdepimlibs/kpimutils/progressindicatorwidget.h
index ee671695..fd557a4b 100644
--- a/kdepimlibs/kpimutils/progressindicatorwidget.h
+++ b/kdepimlibs/kpimutils/progressindicatorwidget.h
@@ -26,7 +26,7 @@
 
 #include <QLabel>
 
-class QTimer;
+#include <QTimer>
 namespace KPIMUtils {
 class ProgressIndicatorWidgetPrivate;
 class ProgressIndicatorWidget;
diff --git a/kdepimlibs/kresources/configpage.h b/kdepimlibs/kresources/configpage.h
index d5392f30..16740bb1 100644
--- a/kdepimlibs/kresources/configpage.h
+++ b/kdepimlibs/kresources/configpage.h
@@ -41,8 +41,8 @@
 
 #include "manager.h"
 
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 namespace KRES {
 
diff --git a/kdepimlibs/ktnef/ktnefwriter.h b/kdepimlibs/ktnef/ktnefwriter.h
index 4905c0dd..6d3a9b9c 100644
--- a/kdepimlibs/ktnef/ktnefwriter.h
+++ b/kdepimlibs/ktnef/ktnefwriter.h
@@ -31,12 +31,12 @@
 #ifndef KTNEFWRITER_H
 #define KTNEFWRITER_H
 
-class QString;
-class QVariant;
-class QIODevice;
-class QDataStream;
-class QDateTime;
-class QStringList;
+#include <QString>
+#include <QVariant>
+#include <QIODevice>
+#include <QDataStream>
+#include <QDateTime>
+#include <QStringList>
 
 #include "ktnef_export.h"
 #include <qglobal.h>
diff --git a/kdepimlibs/ktnef/lzfu.h b/kdepimlibs/ktnef/lzfu.h
index eaec9d9a..e3042445 100644
--- a/kdepimlibs/ktnef/lzfu.h
+++ b/kdepimlibs/ktnef/lzfu.h
@@ -31,7 +31,7 @@
 #ifndef LZFU_H
 #define LZFU_H
 
-class QIODevice;
+#include <QIODevice>
 
 /**
  * @acronym LZFU decompress data in compressed Rich Text Format (@acronym RTF).
diff --git a/kdepimlibs/kxmlrpcclient/query.h b/kdepimlibs/kxmlrpcclient/query.h
index 599699ac..27def67c 100644
--- a/kdepimlibs/kxmlrpcclient/query.h
+++ b/kdepimlibs/kxmlrpcclient/query.h
@@ -29,7 +29,7 @@
 #include <QtCore/QMap>
 #include <kio/job.h>
 
-class QString;
+#include <QString>
 
 /** Namespace for XmlRpc related classes */
 namespace KXmlRpc {
diff --git a/kdepimlibs/mailtransport/servertest.h b/kdepimlibs/mailtransport/servertest.h
index 6e530861..acf4ae7c 100644
--- a/kdepimlibs/mailtransport/servertest.h
+++ b/kdepimlibs/mailtransport/servertest.h
@@ -27,7 +27,7 @@
 #include <QWidget>
 #include <QtCore/QHash>
 
-class QProgressBar;
+#include <QProgressBar>
 
 namespace MailTransport {
 
diff --git a/kdepimlibs/mailtransport/smtp/smtpsession.h b/kdepimlibs/mailtransport/smtp/smtpsession.h
index ffbf5826..69348f78 100644
--- a/kdepimlibs/mailtransport/smtp/smtpsession.h
+++ b/kdepimlibs/mailtransport/smtp/smtpsession.h
@@ -22,7 +22,7 @@
 #include <qobject.h>
 #include <ktcpsocket.h>
 
-class QIODevice;
+#include <QIODevice>
 class KUrl;
 
 namespace MailTransport {
diff --git a/kdepimlibs/mailtransport/transportjob.h b/kdepimlibs/mailtransport/transportjob.h
index 8c382f4e..85f3f7e6 100644
--- a/kdepimlibs/mailtransport/transportjob.h
+++ b/kdepimlibs/mailtransport/transportjob.h
@@ -26,7 +26,7 @@
 
 #include <KDE/KCompositeJob>
 
-class QBuffer;
+#include <QBuffer>
 
 namespace MailTransport {
 
diff --git a/kdepimlibs/qgpgme/dataprovider.h b/kdepimlibs/qgpgme/dataprovider.h
index e6c1da57..1a1ce223 100644
--- a/kdepimlibs/qgpgme/dataprovider.h
+++ b/kdepimlibs/qgpgme/dataprovider.h
@@ -29,7 +29,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace QGpgME {
 
diff --git a/kdepimlibs/syndication/abstractparser.h b/kdepimlibs/syndication/abstractparser.h
index 1015eaee..bb41c1ea 100644
--- a/kdepimlibs/syndication/abstractparser.h
+++ b/kdepimlibs/syndication/abstractparser.h
@@ -27,7 +27,7 @@
 
 #include "ksyndication_export.h"
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/atom/atomtools.h b/kdepimlibs/syndication/atom/atomtools.h
index 5ce2c38f..5bc31a25 100644
--- a/kdepimlibs/syndication/atom/atomtools.h
+++ b/kdepimlibs/syndication/atom/atomtools.h
@@ -23,7 +23,7 @@
 #ifndef SYNDICATION_ATOM_TOOLS_H
 #define SYNDICATION_ATOM_TOOLS_H
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/atom/category.h b/kdepimlibs/syndication/atom/category.h
index 3c935443..0c29ae12 100644
--- a/kdepimlibs/syndication/atom/category.h
+++ b/kdepimlibs/syndication/atom/category.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/constants.h b/kdepimlibs/syndication/atom/constants.h
index da05b089..1c6113b7 100644
--- a/kdepimlibs/syndication/atom/constants.h
+++ b/kdepimlibs/syndication/atom/constants.h
@@ -24,7 +24,7 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/content.h b/kdepimlibs/syndication/atom/content.h
index 76178458..67e040a2 100644
--- a/kdepimlibs/syndication/atom/content.h
+++ b/kdepimlibs/syndication/atom/content.h
@@ -29,8 +29,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QByteArray;
-class QDomElement;
+#include <QByteArray>
+#include <QDomElement>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/document.h b/kdepimlibs/syndication/atom/document.h
index 336563c1..6685b718 100644
--- a/kdepimlibs/syndication/atom/document.h
+++ b/kdepimlibs/syndication/atom/document.h
@@ -28,7 +28,7 @@
 
 #include <ctime>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/atom/entry.h b/kdepimlibs/syndication/atom/entry.h
index fc5df2bd..ff564f31 100644
--- a/kdepimlibs/syndication/atom/entry.h
+++ b/kdepimlibs/syndication/atom/entry.h
@@ -30,8 +30,8 @@
 
 #include <ctime>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/atom/generator.h b/kdepimlibs/syndication/atom/generator.h
index 6839e51a..e9edae90 100644
--- a/kdepimlibs/syndication/atom/generator.h
+++ b/kdepimlibs/syndication/atom/generator.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/link.h b/kdepimlibs/syndication/atom/link.h
index ace86066..05c00be9 100644
--- a/kdepimlibs/syndication/atom/link.h
+++ b/kdepimlibs/syndication/atom/link.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/parser.h b/kdepimlibs/syndication/atom/parser.h
index 9aca582b..9be1e22b 100644
--- a/kdepimlibs/syndication/atom/parser.h
+++ b/kdepimlibs/syndication/atom/parser.h
@@ -25,8 +25,8 @@
 
 #include <syndication/abstractparser.h>
 
-class QString;
-template <class T, class U> class QHash;
+#include <QString>
+#include <QHash>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/atom/person.h b/kdepimlibs/syndication/atom/person.h
index c3a96c1d..0247b83d 100644
--- a/kdepimlibs/syndication/atom/person.h
+++ b/kdepimlibs/syndication/atom/person.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/atom/source.h b/kdepimlibs/syndication/atom/source.h
index c25e20af..22af5f3f 100644
--- a/kdepimlibs/syndication/atom/source.h
+++ b/kdepimlibs/syndication/atom/source.h
@@ -27,10 +27,10 @@
 
 #include <ctime>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 namespace Atom {
diff --git a/kdepimlibs/syndication/constants.h b/kdepimlibs/syndication/constants.h
index 5560ef0c..b63c4564 100644
--- a/kdepimlibs/syndication/constants.h
+++ b/kdepimlibs/syndication/constants.h
@@ -25,7 +25,7 @@
 
 #include "ksyndication_export.h"
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/dataretriever.h b/kdepimlibs/syndication/dataretriever.h
index a9cfd882..9257be09 100644
--- a/kdepimlibs/syndication/dataretriever.h
+++ b/kdepimlibs/syndication/dataretriever.h
@@ -23,7 +23,7 @@ namespace KIO
 class KJob;
 class KUrl;
 
-class QByteArray;
+#include <QByteArray>
 
 namespace Syndication
 {
diff --git a/kdepimlibs/syndication/documentsource.h b/kdepimlibs/syndication/documentsource.h
index a4af692c..ff4581bb 100644
--- a/kdepimlibs/syndication/documentsource.h
+++ b/kdepimlibs/syndication/documentsource.h
@@ -28,8 +28,8 @@
 
 #include "ksyndication_export.h"
 
-class QByteArray;
-class QDomDocument;
+#include <QByteArray>
+#include <QDomDocument>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/elementwrapper.h b/kdepimlibs/syndication/elementwrapper.h
index 686ed9c8..913c596f 100644
--- a/kdepimlibs/syndication/elementwrapper.h
+++ b/kdepimlibs/syndication/elementwrapper.h
@@ -28,8 +28,8 @@
 
 #include "ksyndication_export.h"
 
-class QDomElement;
-template <class T> class QList;
+#include <QDomElement>
+#include <QList>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/feed.h b/kdepimlibs/syndication/feed.h
index bce08ac7..ff8209fe 100644
--- a/kdepimlibs/syndication/feed.h
+++ b/kdepimlibs/syndication/feed.h
@@ -27,11 +27,11 @@
 
 #include "ksyndication_export.h"
 
-class QDomElement;
+#include <QDomElement>
 
-template <class T> class QList;
-template <class K, class T> class QMultiMap;
-class QString;
+#include <QList>
+#include <QMultiMap>
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/item.h b/kdepimlibs/syndication/item.h
index 1d439660..b77ffd65 100644
--- a/kdepimlibs/syndication/item.h
+++ b/kdepimlibs/syndication/item.h
@@ -30,9 +30,9 @@
 
 #include <ctime>
 
-class QDomElement;
-template <class T> class QList;
-template <class K, class T> class QMultiMap;
+#include <QDomElement>
+#include <QList>
+#include <QMultiMap>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/rdf/contentvocab.h b/kdepimlibs/syndication/rdf/contentvocab.h
index f6646c33..1d6b91d1 100644
--- a/kdepimlibs/syndication/rdf/contentvocab.h
+++ b/kdepimlibs/syndication/rdf/contentvocab.h
@@ -24,7 +24,7 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
+#include <QString>
 
 namespace boost {
     template <class T> class shared_ptr;
diff --git a/kdepimlibs/syndication/rdf/document.h b/kdepimlibs/syndication/rdf/document.h
index 232837da..f7d00d70 100644
--- a/kdepimlibs/syndication/rdf/document.h
+++ b/kdepimlibs/syndication/rdf/document.h
@@ -27,7 +27,7 @@
 
 #include <syndication/specificdocument.h>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/dublincore.h b/kdepimlibs/syndication/rdf/dublincore.h
index f048b32c..3fdc94e6 100644
--- a/kdepimlibs/syndication/rdf/dublincore.h
+++ b/kdepimlibs/syndication/rdf/dublincore.h
@@ -27,8 +27,8 @@
 
 #include <ctime>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/dublincorevocab.h b/kdepimlibs/syndication/rdf/dublincorevocab.h
index 68f41c50..21539c68 100644
--- a/kdepimlibs/syndication/rdf/dublincorevocab.h
+++ b/kdepimlibs/syndication/rdf/dublincorevocab.h
@@ -25,7 +25,7 @@
 
 #include <syndication/rdf/property.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/item.h b/kdepimlibs/syndication/rdf/item.h
index 47241903..689030c3 100644
--- a/kdepimlibs/syndication/rdf/item.h
+++ b/kdepimlibs/syndication/rdf/item.h
@@ -27,7 +27,7 @@
 
 #include <syndication/specificitem.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/rdf/model.h b/kdepimlibs/syndication/rdf/model.h
index 39e6b167..9b0172cf 100644
--- a/kdepimlibs/syndication/rdf/model.h
+++ b/kdepimlibs/syndication/rdf/model.h
@@ -35,7 +35,7 @@
 
 #include <QtCore/QString>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/modelmaker.h b/kdepimlibs/syndication/rdf/modelmaker.h
index 4abfcd5c..737bb912 100644
--- a/kdepimlibs/syndication/rdf/modelmaker.h
+++ b/kdepimlibs/syndication/rdf/modelmaker.h
@@ -24,8 +24,8 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace boost {
     template <class T> class shared_ptr;
diff --git a/kdepimlibs/syndication/rdf/property.h b/kdepimlibs/syndication/rdf/property.h
index b631db6f..db3ea588 100644
--- a/kdepimlibs/syndication/rdf/property.h
+++ b/kdepimlibs/syndication/rdf/property.h
@@ -25,7 +25,7 @@
 
 #include <syndication/rdf/resource.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/rdfvocab.h b/kdepimlibs/syndication/rdf/rdfvocab.h
index 7ba41619..457210e8 100644
--- a/kdepimlibs/syndication/rdf/rdfvocab.h
+++ b/kdepimlibs/syndication/rdf/rdfvocab.h
@@ -24,7 +24,7 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
+#include <QString>
 
 namespace boost {
     template <class T> class shared_ptr;
diff --git a/kdepimlibs/syndication/rdf/resource.h b/kdepimlibs/syndication/rdf/resource.h
index 78445c51..ae027118 100644
--- a/kdepimlibs/syndication/rdf/resource.h
+++ b/kdepimlibs/syndication/rdf/resource.h
@@ -27,9 +27,9 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/rssvocab.h b/kdepimlibs/syndication/rdf/rssvocab.h
index 2aef6072..9ca39436 100644
--- a/kdepimlibs/syndication/rdf/rssvocab.h
+++ b/kdepimlibs/syndication/rdf/rssvocab.h
@@ -24,8 +24,8 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace boost {
     template <class T> class shared_ptr;
diff --git a/kdepimlibs/syndication/rdf/sequence.h b/kdepimlibs/syndication/rdf/sequence.h
index 04b7cb96..06b73d98 100644
--- a/kdepimlibs/syndication/rdf/sequence.h
+++ b/kdepimlibs/syndication/rdf/sequence.h
@@ -27,7 +27,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/statement.h b/kdepimlibs/syndication/rdf/statement.h
index cb5e1489..8c19a616 100644
--- a/kdepimlibs/syndication/rdf/statement.h
+++ b/kdepimlibs/syndication/rdf/statement.h
@@ -26,7 +26,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/syndicationinfo.h b/kdepimlibs/syndication/rdf/syndicationinfo.h
index f204df15..18a0c801 100644
--- a/kdepimlibs/syndication/rdf/syndicationinfo.h
+++ b/kdepimlibs/syndication/rdf/syndicationinfo.h
@@ -26,7 +26,7 @@
 
 #include <ctime>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/kdepimlibs/syndication/rdf/syndicationvocab.h b/kdepimlibs/syndication/rdf/syndicationvocab.h
index 9b123fd7..37df223b 100644
--- a/kdepimlibs/syndication/rdf/syndicationvocab.h
+++ b/kdepimlibs/syndication/rdf/syndicationvocab.h
@@ -25,7 +25,7 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
+#include <QString>
 
 namespace boost {
     template <class T> class shared_ptr;
diff --git a/kdepimlibs/syndication/rss2/category.h b/kdepimlibs/syndication/rss2/category.h
index 9a0d4681..9b4551cb 100644
--- a/kdepimlibs/syndication/rss2/category.h
+++ b/kdepimlibs/syndication/rss2/category.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/cloud.h b/kdepimlibs/syndication/rss2/cloud.h
index cb5e72a7..105d1005 100644
--- a/kdepimlibs/syndication/rss2/cloud.h
+++ b/kdepimlibs/syndication/rss2/cloud.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace RSS2
diff --git a/kdepimlibs/syndication/rss2/document.h b/kdepimlibs/syndication/rss2/document.h
index f4b8adec..ef5acfea 100644
--- a/kdepimlibs/syndication/rss2/document.h
+++ b/kdepimlibs/syndication/rss2/document.h
@@ -28,12 +28,12 @@
 
 #include <ctime>
 
-class QDomDocument;
-class QDomElement;
-class QString;
+#include <QDomDocument>
+#include <QDomElement>
+#include <QString>
 
-template <class T> class QList;
-template <class T> class QSet;
+#include <QList>
+#include <QSet>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/enclosure.h b/kdepimlibs/syndication/rss2/enclosure.h
index 0d6437df..d2c0dd95 100644
--- a/kdepimlibs/syndication/rss2/enclosure.h
+++ b/kdepimlibs/syndication/rss2/enclosure.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/image.h b/kdepimlibs/syndication/rss2/image.h
index 473fe223..cf9e8aed 100644
--- a/kdepimlibs/syndication/rss2/image.h
+++ b/kdepimlibs/syndication/rss2/image.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/item.h b/kdepimlibs/syndication/rss2/item.h
index e54c39c8..c8925348 100644
--- a/kdepimlibs/syndication/rss2/item.h
+++ b/kdepimlibs/syndication/rss2/item.h
@@ -30,9 +30,9 @@
 
 #include <ctime>
 
-class QDomElement;
-class QString;
-template <class T> class QList;
+#include <QDomElement>
+#include <QString>
+#include <QList>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/rss2/source.h b/kdepimlibs/syndication/rss2/source.h
index 95960ac8..11322ea2 100644
--- a/kdepimlibs/syndication/rss2/source.h
+++ b/kdepimlibs/syndication/rss2/source.h
@@ -25,8 +25,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/textinput.h b/kdepimlibs/syndication/rss2/textinput.h
index a6486033..5873444c 100644
--- a/kdepimlibs/syndication/rss2/textinput.h
+++ b/kdepimlibs/syndication/rss2/textinput.h
@@ -24,8 +24,8 @@
 
 #include <syndication/elementwrapper.h>
 
-class QString;
-class QDomElement;
+#include <QString>
+#include <QDomElement>
 
 namespace Syndication {
 namespace RSS2 {
diff --git a/kdepimlibs/syndication/rss2/tools_p.h b/kdepimlibs/syndication/rss2/tools_p.h
index 1fe23a38..6d8e82ef 100644
--- a/kdepimlibs/syndication/rss2/tools_p.h
+++ b/kdepimlibs/syndication/rss2/tools_p.h
@@ -23,8 +23,8 @@
 #ifndef SYNDICATION_RSS2_TOOLS_P_H
 #define SYNDICATION_RSS2_TOOLS_P_H
 
-class QString;
-template <class T> class QList;
+#include <QString>
+#include <QList>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/specificdocument.h b/kdepimlibs/syndication/specificdocument.h
index 9484e666..63ef6c12 100644
--- a/kdepimlibs/syndication/specificdocument.h
+++ b/kdepimlibs/syndication/specificdocument.h
@@ -26,7 +26,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kdepimlibs/syndication/tools.h b/kdepimlibs/syndication/tools.h
index 557075af..ffce063b 100644
--- a/kdepimlibs/syndication/tools.h
+++ b/kdepimlibs/syndication/tools.h
@@ -31,8 +31,8 @@
 
 #include <ctime>
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace Syndication {
 
diff --git a/kfilereplace/commandengine.h b/kfilereplace/commandengine.h
index 1da55eeb..a0343bb2 100644
--- a/kfilereplace/commandengine.h
+++ b/kfilereplace/commandengine.h
@@ -20,7 +20,7 @@
 #define COMMANDENGINE_H
 
 // QT
-class QString;
+#include <QString>
 #include <qobject.h>
 
 //KDE
diff --git a/kfilereplace/kfilereplaceview.h b/kfilereplace/kfilereplaceview.h
index 96453ece..7fa968fa 100644
--- a/kfilereplace/kfilereplaceview.h
+++ b/kfilereplace/kfilereplaceview.h
@@ -24,7 +24,7 @@
 
 //KDE
 class KMenu;
-class QListWidget;
+#include <QListWidget>
 
 //local
 #include "ui_kfilereplaceviewwdg.h"
diff --git a/kfilereplace/report.h b/kfilereplace/report.h
index e40c0bc5..372d0752 100644
--- a/kfilereplace/report.h
+++ b/kfilereplace/report.h
@@ -20,12 +20,12 @@
 #define REPORT_H
 
 // QT
-class QString;
+#include <QString>
 
 // KDE
 #include <klocale.h>
 #include "configurationclasses.h"
-class QListWidget;
+#include <QListWidget>
 
 /** Report class is used to create a pair of files (a xml and a css file) which are
   * a short statistical report of the operations.
diff --git a/khelpcenter/history.h b/khelpcenter/history.h
index e9e6af27..6fbc9b6e 100644
--- a/khelpcenter/history.h
+++ b/khelpcenter/history.h
@@ -30,7 +30,7 @@
 class KActionCollection;
 class KXmlGuiWindow;
 class KToolBarPopupAction;
-class QMenu;
+#include <QMenu>
 
 namespace KHC {
 
diff --git a/khelpcenter/htmlsearch/htmlsearch.h b/khelpcenter/htmlsearch/htmlsearch.h
index f93cb2b0..1735b2af 100644
--- a/khelpcenter/htmlsearch/htmlsearch.h
+++ b/khelpcenter/htmlsearch/htmlsearch.h
@@ -5,7 +5,7 @@
 
 
 
-class QWidget;
+#include <QWidget>
 
 
 class K3Process;
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.h b/khelpcenter/htmlsearch/kcmhtmlsearch.h
index 40583909..653369db 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.h
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.h
@@ -28,13 +28,13 @@
 #include <QVariantList>
 
 
-class QCheckBox;
-class QPushButton;
+#include <QCheckBox>
+#include <QPushButton>
 class KListWidget;
 class K3Process;
 class KLanguageCombo;
 class KUrlRequester;
-class QStringList;
+#include <QStringList>
 
 class KHTMLSearchConfig : public KCModule
 {
diff --git a/khelpcenter/htmlsearch/progressdialog.h b/khelpcenter/htmlsearch/progressdialog.h
index 2b718572..c82a7167 100644
--- a/khelpcenter/htmlsearch/progressdialog.h
+++ b/khelpcenter/htmlsearch/progressdialog.h
@@ -3,8 +3,8 @@
 
 #include <kdialog.h>
 
-class QLabel;
-class QProgressBar;
+#include <QLabel>
+#include <QProgressBar>
 
 class ProgressDialog : public KDialog
 {
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index ccbeb8f5..368f3767 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -27,15 +27,15 @@
 
 #include "scopeitem.h"
 
-class QPushButton;
-class QProgressBar;
-class QTextEdit;
-class QLabel;
+#include <QPushButton>
+#include <QProgressBar>
+#include <QTextEdit>
+#include <QLabel>
 
 class KAboutData;
 class KTemporaryFile;
 class KUrlRequester;
-class QTreeWidget;
+#include <QTreeWidget>
 
 namespace KHC {
 class HtmlSearchConfig;
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 721aa9a0..53af910f 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -11,7 +11,7 @@
 #include "navigator.h"
 #include "glossary.h"
 
-class QSplitter;
+#include <QSplitter>
 
 class LogDialog;
 
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index d72c7814..540925c6 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -32,7 +32,7 @@
 #include <QTreeWidget>
 #include <QFrame>
 
-class QPushButton;
+#include <QPushButton>
 class KLineEdit;
 class KCMHelpCenter;
 
diff --git a/khelpcenter/plugintraverser.h b/khelpcenter/plugintraverser.h
index 6a76f516..f2992c8f 100644
--- a/khelpcenter/plugintraverser.h
+++ b/khelpcenter/plugintraverser.h
@@ -24,7 +24,7 @@
 
 #include <QTreeWidget>
 
-class QTreeWidget;
+#include <QTreeWidget>
 
 namespace KHC {
   
diff --git a/khelpcenter/scrollkeepertreebuilder.h b/khelpcenter/scrollkeepertreebuilder.h
index 7218dd7b..c5e3d784 100644
--- a/khelpcenter/scrollkeepertreebuilder.h
+++ b/khelpcenter/scrollkeepertreebuilder.h
@@ -24,7 +24,7 @@
 
 #include "navigatoritem.h"
 
-class QDomNode;
+#include <QDomNode>
 
 namespace KHC {
 
diff --git a/khelpcenter/searchwidget.h b/khelpcenter/searchwidget.h
index fb676083..fedfc84d 100644
--- a/khelpcenter/searchwidget.h
+++ b/khelpcenter/searchwidget.h
@@ -26,10 +26,10 @@
 
 #include "docmetainfo.h"
 
-class QTreeWidgetItem;
-class QTreeWidget;
-class QTreeWidgetItem;
-class QComboBox;
+#include <QTreeWidgetItem>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QComboBox>
 
 class KConfig;
 
diff --git a/khelpcenter/slave/xslt.h b/khelpcenter/slave/xslt.h
index 22d9a502..b74e81fe 100644
--- a/khelpcenter/slave/xslt.h
+++ b/khelpcenter/slave/xslt.h
@@ -5,8 +5,8 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 class KComponentData;
 
 QString transform(const QString &file, const QString& stylesheet,
diff --git a/khelpcenter/slave/xslt_kde.h b/khelpcenter/slave/xslt_kde.h
index ab7e5f94..a314d2d6 100644
--- a/khelpcenter/slave/xslt_kde.h
+++ b/khelpcenter/slave/xslt_kde.h
@@ -4,8 +4,8 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 class KComponentData;
 
 void fillInstance(KComponentData &ins, const QString &srcdir = QString() );
diff --git a/kimagesorter/main_window.h b/kimagesorter/main_window.h
index 2d200997..ce4a8619 100644
--- a/kimagesorter/main_window.h
+++ b/kimagesorter/main_window.h
@@ -29,7 +29,7 @@
 class PictureWidget;
 class ImageSorter;
 class SortSettingsDialog;
-class QActionGroup;
+#include <QActionGroup>
 
 
 class MainWindow : public KXmlGuiWindow
diff --git a/kimagesorter/picture_widget.h b/kimagesorter/picture_widget.h
index aa967856..b9ee7b6b 100644
--- a/kimagesorter/picture_widget.h
+++ b/kimagesorter/picture_widget.h
@@ -23,8 +23,8 @@
 
 #include <QWidget>
 
-class QResizeEvent;
-class QLabel;
+#include <QResizeEvent>
+#include <QLabel>
 
 
 class PictureWidget : public QWidget
diff --git a/kwrite/kwritemain.h b/kwrite/kwritemain.h
index 2a92e996..0c584663 100644
--- a/kwrite/kwritemain.h
+++ b/kwrite/kwritemain.h
@@ -30,7 +30,7 @@
 
 #include <QtGui/QKeyEvent>
 
-class QLabel;
+#include <QLabel>
 
 namespace KTextEditor { class EditorChooser; }
 
diff --git a/massif-visualizer/app/allocatorstab.h b/massif-visualizer/app/allocatorstab.h
index 7a69b94f..cd048c47 100644
--- a/massif-visualizer/app/allocatorstab.h
+++ b/massif-visualizer/app/allocatorstab.h
@@ -25,9 +25,9 @@
 
 #include "documenttabinterface.h"
 
-class QTreeView;
-class QSortFilterProxyModel;
-class QModelIndex;
+#include <QTreeView>
+#include <QSortFilterProxyModel>
+#include <QModelIndex>
 
 namespace Massif {
 class AllocatorsModel;
diff --git a/massif-visualizer/app/charttab.h b/massif-visualizer/app/charttab.h
index f1d25b13..332057fd 100644
--- a/massif-visualizer/app/charttab.h
+++ b/massif-visualizer/app/charttab.h
@@ -26,8 +26,8 @@
 #include "documenttabinterface.h"
 #include <QSpinBox>
 
-class QLabel;
-class QModelIndex;
+#include <QLabel>
+#include <QModelIndex>
 
 class KAction;
 
diff --git a/massif-visualizer/app/documenttabinterface.h b/massif-visualizer/app/documenttabinterface.h
index f0092a8f..cc6bac52 100644
--- a/massif-visualizer/app/documenttabinterface.h
+++ b/massif-visualizer/app/documenttabinterface.h
@@ -29,7 +29,7 @@
 
 #include "visualizer/modelitem.h"
 
-class QMenu;
+#include <QMenu>
 
 namespace Massif {
 class FileData;
diff --git a/massif-visualizer/app/documentwidget.h b/massif-visualizer/app/documentwidget.h
index f61a5d7b..df0d2e55 100644
--- a/massif-visualizer/app/documentwidget.h
+++ b/massif-visualizer/app/documentwidget.h
@@ -33,12 +33,12 @@
 
 class DocumentTabInterface;
 
-class QMenu;
-class QLabel;
-class QProgressBar;
-class QToolButton;
-class QStackedWidget;
-class QTabWidget;
+#include <QMenu>
+#include <QLabel>
+#include <QProgressBar>
+#include <QToolButton>
+#include <QStackedWidget>
+#include <QTabWidget>
 
 class KMessageWidget;
 
diff --git a/massif-visualizer/app/mainwindow.h b/massif-visualizer/app/mainwindow.h
index 2a4c4626..940715e1 100644
--- a/massif-visualizer/app/mainwindow.h
+++ b/massif-visualizer/app/mainwindow.h
@@ -31,8 +31,8 @@
 #include "ui_mainwindow.h"
 #include "documentwidget.h"
 
-class QSpinBox;
-class QStringListModel;
+#include <QSpinBox>
+#include <QStringListModel>
 
 namespace KDChart {
 class Chart;
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
index 758cd22a..42253243 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAreaBase.h
@@ -34,8 +34,8 @@
 
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QString;
+#include <QPainter>
+#include <QString>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
index f8d418b2..84057803 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartAbstractAxis.h
@@ -34,8 +34,8 @@
 #include "KDChartRulerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QSizeF;
+#include <QPainter>
+#include <QSizeF>
 QT_END_NAMESPACE
 
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
index 9ef8a2b2..36d00e1a 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartBarDiagram.h
@@ -27,7 +27,7 @@
 #include "KDChartBarAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h b/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
index 9a1e0bc0..e1620de4 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartDiagramObserver.h
@@ -30,7 +30,7 @@
 #include <QModelIndex>
 
 QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
index 0e541524..7e116c94 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartGridAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h b/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
index e5945714..535f2e1b 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLayoutItems.h
@@ -34,7 +34,7 @@
 #include "KDChartMarkerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 class KDTextDocument;
 QT_END_NAMESPACE
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLegend.h b/massif-visualizer/kdchart/include/KDChart/KDChartLegend.h
index b39d1679..b6dea211 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLegend.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLegend.h
@@ -27,7 +27,7 @@
 #include "KDChartPosition.h"
 #include "KDChartMarkerAttributes.h"
 
-class QTextTable;
+#include <QTextTable>
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
index d85ceed6..9731c45b 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsDiagram.h
@@ -27,9 +27,9 @@
 #include "KDChartLeveyJenningsCoordinatePlane.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QPolygonF;
-class QSvgRenderer;
+#include <QPainter>
+#include <QPolygonF>
+#include <QSvgRenderer>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
index 951b5498..07a424c7 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLeveyJenningsGridAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
index 395436c9..2ae9a2bf 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartLineDiagram.h
@@ -28,8 +28,8 @@
 #include "KDChartValueTrackerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QPolygonF;
+#include <QPainter>
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
index d0fbcd2e..366a6d77 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartMarkerAttributes.h
@@ -27,12 +27,12 @@
 #include "KDChartGlobal.h"
 
 QT_BEGIN_NAMESPACE
-class QColor;
-class QSizeF;
-class QPen;
-class QPainterPath;
-class QDebug;
-template <typename T, typename K> class QMap;
+#include <QColor>
+#include <QSizeF>
+#include <QPen>
+#include <QPainterPath>
+#include <QDebug>
+#include <QMap>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h b/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
index 6c457967..b3747272 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartMeasure.h
@@ -35,8 +35,8 @@
  */
 
 QT_BEGIN_NAMESPACE
-class QObject;
-class QPaintDevice;
+#include <QObject>
+#include <QPaintDevice>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h b/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
index 486268ab..318e1e93 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPaintContext.h
@@ -27,7 +27,7 @@
 #include "KDChartGlobal.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
index ef137ca1..547ea3b9 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPolarDiagram.h
@@ -28,7 +28,7 @@
 #include "KDChartAbstractPolarDiagram.h"
 
 QT_BEGIN_NAMESPACE
-class QPolygonF;
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h b/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
index f2c968ea..7de0f304 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartPosition.h
@@ -30,9 +30,9 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QStringList;
-class QByteArray;
-template <typename T> class QList;
+#include <QStringList>
+#include <QByteArray>
+#include <QList>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h b/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
index e4f70e94..1f2b0756 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartRadarDiagram.h
@@ -29,7 +29,7 @@
 #include "KDChartRadarCoordinatePlane.h"
 
 QT_BEGIN_NAMESPACE
-class QPolygonF;
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
index d72dc654..5cf9b64b 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartRulerAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h b/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
index cd65314a..5e3109e5 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartTextAttributes.h
@@ -29,9 +29,9 @@
 #include "KDChartMeasure.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
-class QFont;
-class QTextDocument;
+#include <QPen>
+#include <QFont>
+#include <QTextDocument>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h b/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
index e82ea80f..d2db9335 100644
--- a/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
+++ b/massif-visualizer/kdchart/include/KDChart/KDChartWidget.h
@@ -31,8 +31,8 @@
 #include "KDChartHeaderFooter.h"
 
 QT_BEGIN_NAMESPACE
-template <typename T> class QVector;
-template <typename T1, typename T2> struct QPair;
+#include <QVector>
+#include <QPair>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h b/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
index 51b73665..679ee8e8 100644
--- a/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
+++ b/massif-visualizer/kdchart/include/KDChart/ReverseMapper.h
@@ -27,9 +27,9 @@
 #include <QHash>
 
 QT_BEGIN_NAMESPACE
-class QRectF;
-class QGraphicsScene;
-class QPolygonF;
+#include <QRectF>
+#include <QGraphicsScene>
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
index 9ef8a2b2..36d00e1a 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartBarDiagram.h
@@ -27,7 +27,7 @@
 #include "KDChartBarAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
index 74a05034..2c9a93e7 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartCartesianDiagramDataCompressor_p.h
@@ -49,7 +49,7 @@
 
 class CartesianDiagramDataCompressorTests;
 QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
index d85ceed6..9731c45b 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram.h
@@ -27,9 +27,9 @@
 #include "KDChartLeveyJenningsCoordinatePlane.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QPolygonF;
-class QSvgRenderer;
+#include <QPainter>
+#include <QPolygonF>
+#include <QSvgRenderer>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
index 440269d4..5ac81265 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsDiagram_p.h
@@ -42,7 +42,7 @@
 #include <KDABLibFakes>
 
 QT_BEGIN_NAMESPACE
-class QSvgRenderer;
+#include <QSvgRenderer>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
index 951b5498..07a424c7 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLeveyJenningsGridAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
index 395436c9..2ae9a2bf 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/KDChartLineDiagram.h
@@ -28,8 +28,8 @@
 #include "KDChartValueTrackerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QPolygonF;
+#include <QPainter>
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h b/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
index 2b0bb3d0..7e644a7b 100644
--- a/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/Cartesian/PaintingHelpers_p.h
@@ -29,10 +29,10 @@
 #include <QPointF>
 #include <QVector>
 
-class QBrush;
-class QModelIndex;
-class QPen;
-class QPolygonF;
+#include <QBrush>
+#include <QModelIndex>
+#include <QPen>
+#include <QPolygonF>
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
index 758cd22a..42253243 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAreaBase.h
@@ -34,8 +34,8 @@
 
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QString;
+#include <QPainter>
+#include <QString>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
index f8d418b2..84057803 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractAxis.h
@@ -34,8 +34,8 @@
 #include "KDChartRulerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
-class QSizeF;
+#include <QPainter>
+#include <QSizeF>
 QT_END_NAMESPACE
 
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
index 0d0dfcac..5dcd882b 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartAbstractCoordinatePlane_p.h
@@ -45,7 +45,7 @@
 #include <QStack>
 
 QT_BEGIN_NAMESPACE
-class QRubberBand;
+#include <QRubberBand>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h b/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
index 9a1e0bc0..e1620de4 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartDiagramObserver.h
@@ -30,7 +30,7 @@
 #include <QModelIndex>
 
 QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
index 0e541524..7e116c94 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartGridAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h b/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
index e5945714..535f2e1b 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartLayoutItems.h
@@ -34,7 +34,7 @@
 #include "KDChartMarkerAttributes.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 class KDTextDocument;
 QT_END_NAMESPACE
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartLegend.h b/massif-visualizer/kdchart/src/KDChart/KDChartLegend.h
index 126c73fc..17d28897 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartLegend.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartLegend.h
@@ -27,7 +27,7 @@
 #include "KDChartPosition.h"
 #include "KDChartMarkerAttributes.h"
 
-class QTextTable;
+#include <QTextTable>
 
 namespace KDChart {
 
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
index 68e4c8a8..d75ac7fa 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartLegend_p.h
@@ -47,9 +47,9 @@
 #include <KDABLibFakes>
 
 QT_BEGIN_NAMESPACE
-class QGridLayout;
+#include <QGridLayout>
 class KDTextDocument;
-class QTextDocument;
+#include <QTextDocument>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
index d0fbcd2e..366a6d77 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartMarkerAttributes.h
@@ -27,12 +27,12 @@
 #include "KDChartGlobal.h"
 
 QT_BEGIN_NAMESPACE
-class QColor;
-class QSizeF;
-class QPen;
-class QPainterPath;
-class QDebug;
-template <typename T, typename K> class QMap;
+#include <QColor>
+#include <QSizeF>
+#include <QPen>
+#include <QPainterPath>
+#include <QDebug>
+#include <QMap>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h b/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
index 6c457967..b3747272 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartMeasure.h
@@ -35,8 +35,8 @@
  */
 
 QT_BEGIN_NAMESPACE
-class QObject;
-class QPaintDevice;
+#include <QObject>
+#include <QPaintDevice>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h b/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
index 908a6b5b..64a022c0 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartModelDataCache_p.h
@@ -32,7 +32,7 @@
 #include "kdchart_export.h"
 
 QT_BEGIN_NAMESPACE
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 QT_END_NAMESPACE
 
 namespace KDChart
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h b/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
index 486268ab..318e1e93 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartPaintContext.h
@@ -27,7 +27,7 @@
 #include "KDChartGlobal.h"
 
 QT_BEGIN_NAMESPACE
-class QPainter;
+#include <QPainter>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h b/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
index f2c968ea..7de0f304 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartPosition.h
@@ -30,9 +30,9 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QStringList;
-class QByteArray;
-template <typename T> class QList;
+#include <QStringList>
+#include <QByteArray>
+#include <QList>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
index d72dc654..5cf9b64b 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartRulerAttributes.h
@@ -28,7 +28,7 @@
 #include "KDChartEnums.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
+#include <QPen>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h b/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
index cd65314a..5e3109e5 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartTextAttributes.h
@@ -29,9 +29,9 @@
 #include "KDChartMeasure.h"
 
 QT_BEGIN_NAMESPACE
-class QPen;
-class QFont;
-class QTextDocument;
+#include <QPen>
+#include <QFont>
+#include <QTextDocument>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h b/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
index e82ea80f..d2db9335 100644
--- a/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
+++ b/massif-visualizer/kdchart/src/KDChart/KDChartWidget.h
@@ -31,8 +31,8 @@
 #include "KDChartHeaderFooter.h"
 
 QT_BEGIN_NAMESPACE
-template <typename T> class QVector;
-template <typename T1, typename T2> struct QPair;
+#include <QVector>
+#include <QPair>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Polar/KDChartPolarDiagram.h b/massif-visualizer/kdchart/src/KDChart/Polar/KDChartPolarDiagram.h
index ef137ca1..547ea3b9 100644
--- a/massif-visualizer/kdchart/src/KDChart/Polar/KDChartPolarDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Polar/KDChartPolarDiagram.h
@@ -28,7 +28,7 @@
 #include "KDChartAbstractPolarDiagram.h"
 
 QT_BEGIN_NAMESPACE
-class QPolygonF;
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/Polar/KDChartRadarDiagram.h b/massif-visualizer/kdchart/src/KDChart/Polar/KDChartRadarDiagram.h
index e4f70e94..1f2b0756 100644
--- a/massif-visualizer/kdchart/src/KDChart/Polar/KDChartRadarDiagram.h
+++ b/massif-visualizer/kdchart/src/KDChart/Polar/KDChartRadarDiagram.h
@@ -29,7 +29,7 @@
 #include "KDChartRadarCoordinatePlane.h"
 
 QT_BEGIN_NAMESPACE
-class QPolygonF;
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h b/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
index 51b73665..679ee8e8 100644
--- a/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
+++ b/massif-visualizer/kdchart/src/KDChart/ReverseMapper.h
@@ -27,9 +27,9 @@
 #include <QHash>
 
 QT_BEGIN_NAMESPACE
-class QRectF;
-class QGraphicsScene;
-class QPolygonF;
+#include <QRectF>
+#include <QGraphicsScene>
+#include <QPolygonF>
 QT_END_NAMESPACE
 
 namespace KDChart {
diff --git a/massif-visualizer/massifdata/parser.h b/massif-visualizer/massifdata/parser.h
index 955fd452..7c6ae1d0 100644
--- a/massif-visualizer/massifdata/parser.h
+++ b/massif-visualizer/massifdata/parser.h
@@ -23,7 +23,7 @@
 #ifndef MASSIF_PARSER_H
 #define MASSIF_PARSER_H
 
-class QIODevice;
+#include <QIODevice>
 
 #include <QObject>
 #include <QString>
diff --git a/massif-visualizer/massifdata/parserprivate.h b/massif-visualizer/massifdata/parserprivate.h
index cbbaad58..12ca7523 100644
--- a/massif-visualizer/massifdata/parserprivate.h
+++ b/massif-visualizer/massifdata/parserprivate.h
@@ -28,7 +28,7 @@
 #include <QtCore/QSet>
 #include <QVector>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace Massif {
 
diff --git a/polkit-kde-kcmodules-1/common/PKLAEntry.h b/polkit-kde-kcmodules-1/common/PKLAEntry.h
index 3b74c4ba..979d7ef3 100644
--- a/polkit-kde-kcmodules-1/common/PKLAEntry.h
+++ b/polkit-kde-kcmodules-1/common/PKLAEntry.h
@@ -16,7 +16,7 @@
 
 #include <kdemacros.h>
 
-class QDBusArgument;
+#include <QDBusArgument>
 
 class KDE_EXPORT PKLAEntry {
     public:
diff --git a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h
index 1f4b96ac..56789a3e 100644
--- a/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h
+++ b/polkit-kde-kcmodules-1/polkitactions/ActionWidget.h
@@ -16,7 +16,7 @@
 #include <PolkitQt1/ActionDescription>
 
 class KComboBox;
-class QListWidgetItem;
+#include <QListWidgetItem>
 namespace Ui {
 class ActionWidget;
 }
diff --git a/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h b/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h
index e7dd5582..45ad3faf 100644
--- a/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h
+++ b/polkit-kde-kcmodules-1/polkitactions/PolkitActionsKCM.h
@@ -15,7 +15,7 @@
 #include <PolkitQt1/Authority>
 #include <QtCore/QPointer>
 
-class QModelIndex;
+#include <QModelIndex>
 namespace PolkitKde {
 class PoliciesModel;
 class AuthorizationsFilterModel;
diff --git a/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h b/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h
index c41b3c6d..20508b9c 100644
--- a/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h
+++ b/polkit-kde-kcmodules-1/polkitactions/explicitauthorizationdialog.h
@@ -17,7 +17,7 @@
 namespace Ui {
     class ExplicitAuthorizationWidget;
 }
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 namespace PolkitKde {
 
diff --git a/polkit-kde-kcmodules-1/polkitactions/pkitemdelegate.h b/polkit-kde-kcmodules-1/polkitactions/pkitemdelegate.h
index 4bf79ff4..d7b3ca2a 100644
--- a/polkit-kde-kcmodules-1/polkitactions/pkitemdelegate.h
+++ b/polkit-kde-kcmodules-1/polkitactions/pkitemdelegate.h
@@ -23,7 +23,7 @@
 
 #include <KIcon>
 
-class QStyleOptionViewItem;
+#include <QStyleOptionViewItem>
 
 namespace PolkitKde {
 
diff --git a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h
index a736ea0c..2e9a4168 100644
--- a/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h
+++ b/polkit-kde-kcmodules-1/polkitconfig/kcmpolkitconfig.h
@@ -13,7 +13,7 @@
 
 #include <kcmodule.h>
 
-class QVBoxLayout;
+#include <QVBoxLayout>
 namespace Ui {
     class PolkitConfig;
 }
diff --git a/redshift-plasmoid/src/applet/redshiftosdwidget.h b/redshift-plasmoid/src/applet/redshiftosdwidget.h
index c0ebadf5..448d0d00 100644
--- a/redshift-plasmoid/src/applet/redshiftosdwidget.h
+++ b/redshift-plasmoid/src/applet/redshiftosdwidget.h
@@ -27,8 +27,8 @@
 
 #include <Plasma/Dialog>
 
-class QPixmap;
-class QTimer;
+#include <QPixmap>
+#include <QTimer>
 
 namespace Plasma
 {