diff --git a/akregator/configuration/akregator_config_appearance.h b/akregator/configuration/akregator_config_appearance.h
index 98870c0c..2b541f2d 100644
--- a/akregator/configuration/akregator_config_appearance.h
+++ b/akregator/configuration/akregator_config_appearance.h
@@ -30,7 +30,7 @@
 
 #include <QVariant>
 
-class QWidget;
+#include <QWidget>
 
 
 class KCMAkregatorAppearanceConfig : public KCModule
diff --git a/akregator/configuration/akregator_config_archive.h b/akregator/configuration/akregator_config_archive.h
index 1aa8b3ff..0ad4a4df 100644
--- a/akregator/configuration/akregator_config_archive.h
+++ b/akregator/configuration/akregator_config_archive.h
@@ -30,7 +30,7 @@
 
 #include "akregatorconfig.h"
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 class KCMAkregatorArchiveConfig : public KCModule
 {
diff --git a/akregator/configuration/akregator_config_browser.h b/akregator/configuration/akregator_config_browser.h
index 05172cc3..d0ef4ad8 100644
--- a/akregator/configuration/akregator_config_browser.h
+++ b/akregator/configuration/akregator_config_browser.h
@@ -28,7 +28,7 @@
 
 #include <QVariant>
 
-class QWidget;
+#include <QWidget>
 
 class KCMAkregatorBrowserConfig : public KCModule
 {
diff --git a/akregator/configuration/akregator_config_general.h b/akregator/configuration/akregator_config_general.h
index 23d9cdc4..5df01854 100644
--- a/akregator/configuration/akregator_config_general.h
+++ b/akregator/configuration/akregator_config_general.h
@@ -28,7 +28,7 @@
 
 #include <QVariant>
 
-class QWidget;
+#include <QWidget>
 
 
 class KCMAkregatorGeneralConfig : public KCModule
diff --git a/akregator/configuration/settings_advanced.h b/akregator/configuration/settings_advanced.h
index 8ff0cd80..73f987d3 100644
--- a/akregator/configuration/settings_advanced.h
+++ b/akregator/configuration/settings_advanced.h
@@ -29,8 +29,8 @@
 
 #include <QHash>
 
-class QString;
-class QWidget;
+#include <QString>
+#include <QWidget>
 
 namespace Akregator {
 
diff --git a/akregator/interfaces/article.h b/akregator/interfaces/article.h
index 515804df..30d78771 100644
--- a/akregator/interfaces/article.h
+++ b/akregator/interfaces/article.h
@@ -33,10 +33,10 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QDateTime;
-class QString;
+#include <QDateTime>
+#include <QString>
 
-template <class T> class QList;
+#include <QList>
 
 typedef unsigned int uint;
 
diff --git a/akregator/interfaces/command.h b/akregator/interfaces/command.h
index 8a7828ba..9fa1ef0c 100644
--- a/akregator/interfaces/command.h
+++ b/akregator/interfaces/command.h
@@ -29,7 +29,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 
 namespace Akregator {
 
diff --git a/akregator/interfaces/feedlistmanagementinterface.h b/akregator/interfaces/feedlistmanagementinterface.h
index 5a0903ec..ca910d4f 100644
--- a/akregator/interfaces/feedlistmanagementinterface.h
+++ b/akregator/interfaces/feedlistmanagementinterface.h
@@ -27,8 +27,8 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akregator {
 
diff --git a/akregator/interfaces/feedstorage.h b/akregator/interfaces/feedstorage.h
index 4b4dd9ad..4a81be35 100644
--- a/akregator/interfaces/feedstorage.h
+++ b/akregator/interfaces/feedstorage.h
@@ -27,8 +27,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QList>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 
 namespace Akregator {
diff --git a/akregator/interfaces/storage.h b/akregator/interfaces/storage.h
index 6864205c..299ea780 100644
--- a/akregator/interfaces/storage.h
+++ b/akregator/interfaces/storage.h
@@ -28,8 +28,8 @@
 #include "akregator_export.h"
 #include <QtCore/QObject>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/interfaces/storagefactory.h b/akregator/interfaces/storagefactory.h
index 0e461220..0d4b1c64 100644
--- a/akregator/interfaces/storagefactory.h
+++ b/akregator/interfaces/storagefactory.h
@@ -27,8 +27,8 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 namespace Akregator {
 namespace Backend {
 
diff --git a/akregator/interfaces/storagefactoryregistry.h b/akregator/interfaces/storagefactoryregistry.h
index fe80120b..abf66320 100644
--- a/akregator/interfaces/storagefactoryregistry.h
+++ b/akregator/interfaces/storagefactoryregistry.h
@@ -27,8 +27,8 @@
 
 #include "akregator_export.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/plugins/mk4storage/storagefactorymk4impl.h b/akregator/plugins/mk4storage/storagefactorymk4impl.h
index c14d3b99..9dcfdb0c 100644
--- a/akregator/plugins/mk4storage/storagefactorymk4impl.h
+++ b/akregator/plugins/mk4storage/storagefactorymk4impl.h
@@ -27,8 +27,8 @@
 
 #include "storagefactory.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/plugins/onlinesync/akregator_config_onlinesync.h b/akregator/plugins/onlinesync/akregator_config_onlinesync.h
index bfbe1750..b0633f0e 100644
--- a/akregator/plugins/onlinesync/akregator_config_onlinesync.h
+++ b/akregator/plugins/onlinesync/akregator_config_onlinesync.h
@@ -27,7 +27,7 @@
 #include <KCModule>
 #include <QVariant>
 
-class QWidget;
+#include <QWidget>
 namespace feedsync {
     class ConfigurationWidget;
 }
diff --git a/akregator/plugins/onlinesync/sync/opml.h b/akregator/plugins/onlinesync/sync/opml.h
index 6566ae6a..d3b05018 100644
--- a/akregator/plugins/onlinesync/sync/opml.h
+++ b/akregator/plugins/onlinesync/sync/opml.h
@@ -30,7 +30,7 @@
 
 #include <QFile>
 
-class QDomDocument;
+#include <QDomDocument>
 
 namespace feedsync
 {
diff --git a/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.h b/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.h
index 2be34e8d..2e80ed79 100644
--- a/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.h
+++ b/akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.h
@@ -30,7 +30,7 @@
 #include <KCModule>
 #include <QVariant>
 
-class QWidget;
+#include <QWidget>
 
 
 class KCMAkregatorShareConfig : public KCModule
diff --git a/akregator/src/abstractselectioncontroller.h b/akregator/src/abstractselectioncontroller.h
index 461a4890..da89015d 100644
--- a/akregator/src/abstractselectioncontroller.h
+++ b/akregator/src/abstractselectioncontroller.h
@@ -29,10 +29,10 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
-class QAbstractItemView;
-class QItemSelectionModel;
-class QPoint;
-class QModelIndex;
+#include <QAbstractItemView>
+#include <QItemSelectionModel>
+#include <QPoint>
+#include <QModelIndex>
 
 namespace Akregator {
 
diff --git a/akregator/src/actionmanager.h b/akregator/src/actionmanager.h
index ec9296d6..f5a17b8d 100644
--- a/akregator/src/actionmanager.h
+++ b/akregator/src/actionmanager.h
@@ -29,9 +29,9 @@
 
 #include "akregator_export.h"
 
-class QAction;
+#include <QAction>
 
-class QWidget;
+#include <QWidget>
 
 namespace Akregator {
 
diff --git a/akregator/src/actionmanagerimpl.h b/akregator/src/actionmanagerimpl.h
index 53c11be7..a391d7d0 100644
--- a/akregator/src/actionmanagerimpl.h
+++ b/akregator/src/actionmanagerimpl.h
@@ -30,7 +30,7 @@
 class KAction;
 class KActionCollection;
 
-class QWidget;
+#include <QWidget>
 
 namespace Akregator {
 
diff --git a/akregator/src/actions.h b/akregator/src/actions.h
index 22575c90..003bcf94 100644
--- a/akregator/src/actions.h
+++ b/akregator/src/actions.h
@@ -27,8 +27,8 @@
 
 #include "akregator_export.h"
 
-class QAction;
-class QObject;
+#include <QAction>
+#include <QObject>
 
 class KUrl;
 
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 1e8e333e..02f68aaf 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -39,7 +39,7 @@ class KConfigGroup;
 class KUrl;
 class KCMultiDialog;
 
-class QTimer;
+#include <QTimer>
 
 namespace Akregator {
 
diff --git a/akregator/src/articleformatter.h b/akregator/src/articleformatter.h
index 043b09f3..ef39657d 100644
--- a/akregator/src/articleformatter.h
+++ b/akregator/src/articleformatter.h
@@ -27,8 +27,8 @@
 
 #include <kurl.h>
     
-class QPaintDevice;
-class QString;
+#include <QPaintDevice>
+#include <QString>
 
 namespace Akregator {
 
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index f21d3117..63b8d991 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -36,9 +36,9 @@
 
 class KUrl;
 
-class QContextMenuEvent;
-class QPaintEvent;
-template <class T> class QList;
+#include <QContextMenuEvent>
+#include <QPaintEvent>
+#include <QList>
 
 namespace Akregator {
 
diff --git a/akregator/src/dummystorage/storagefactorydummyimpl.h b/akregator/src/dummystorage/storagefactorydummyimpl.h
index 92bd90db..d3288b9c 100644
--- a/akregator/src/dummystorage/storagefactorydummyimpl.h
+++ b/akregator/src/dummystorage/storagefactorydummyimpl.h
@@ -28,8 +28,8 @@
 #include "akregator_export.h"
 #include "storagefactory.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Akregator {
 namespace Backend {
diff --git a/akregator/src/feed.h b/akregator/src/feed.h
index b86319f0..fa587078 100644
--- a/akregator/src/feed.h
+++ b/akregator/src/feed.h
@@ -35,8 +35,8 @@
 #include <QIcon>
 #include <QList>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Akregator {
 
diff --git a/akregator/src/feediconmanager.h b/akregator/src/feediconmanager.h
index 9d48a182..d05308a2 100644
--- a/akregator/src/feediconmanager.h
+++ b/akregator/src/feediconmanager.h
@@ -31,8 +31,8 @@
 
 class KUrl;
 
-class QIcon;
-class QString;
+#include <QIcon>
+#include <QString>
 
 namespace Akregator {
 
diff --git a/akregator/src/feedlist.h b/akregator/src/feedlist.h
index 6aa50553..5e183b27 100644
--- a/akregator/src/feedlist.h
+++ b/akregator/src/feedlist.h
@@ -33,11 +33,11 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QDomDocument;
-class QDomNode;
-template <class T> class QList;
-template <class K,class T> class QHash;
-class QString;
+#include <QDomDocument>
+#include <QDomNode>
+#include <QList>
+#include <QHash>
+#include <QString>
 
 class KJob;
 
diff --git a/akregator/src/folder.h b/akregator/src/folder.h
index 155d0500..9524acc1 100644
--- a/akregator/src/folder.h
+++ b/akregator/src/folder.h
@@ -29,9 +29,9 @@
 #include "akregator_export.h"
 #include "treenode.h"
 
-class QDomDocument;
-class QDomElement;
-template <class T> class QList;
+#include <QDomDocument>
+#include <QDomElement>
+#include <QList>
 
 namespace Akregator {
 
diff --git a/akregator/src/framemanager.h b/akregator/src/framemanager.h
index c48fe75b..c2330f39 100644
--- a/akregator/src/framemanager.h
+++ b/akregator/src/framemanager.h
@@ -31,8 +31,8 @@
 
 #include "akregator_export.h"
 
-class QIcon;
-class QString;
+#include <QIcon>
+#include <QString>
 class KConfigGroup;
 
 namespace Akregator {
diff --git a/akregator/src/importfeedlistcommand.h b/akregator/src/importfeedlistcommand.h
index 4e3e9a1c..79e1bd03 100644
--- a/akregator/src/importfeedlistcommand.h
+++ b/akregator/src/importfeedlistcommand.h
@@ -29,7 +29,7 @@
 
 #include <boost/weak_ptr.hpp>
 
-class QDomDocument;
+#include <QDomDocument>
 
 namespace Akregator {
 
diff --git a/akregator/src/loadfeedlistcommand.h b/akregator/src/loadfeedlistcommand.h
index e9ee6e7a..128cc618 100644
--- a/akregator/src/loadfeedlistcommand.h
+++ b/akregator/src/loadfeedlistcommand.h
@@ -29,7 +29,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QDomDocument;
+#include <QDomDocument>
 
 namespace Akregator {
 
diff --git a/akregator/src/mainwidget.h b/akregator/src/mainwidget.h
index 7c94d5b5..79699f96 100644
--- a/akregator/src/mainwidget.h
+++ b/akregator/src/mainwidget.h
@@ -42,8 +42,8 @@ class KConfig;
 class KFileItem;
 class KConfigGroup;
 
-class QDomDocument;
-class QSplitter;
+#include <QDomDocument>
+#include <QSplitter>
 
 namespace Akregator {
 
diff --git a/akregator/src/searchbar.h b/akregator/src/searchbar.h
index 7cae1c0d..1aaee82b 100644
--- a/akregator/src/searchbar.h
+++ b/akregator/src/searchbar.h
@@ -30,7 +30,7 @@
 #include <boost/shared_ptr.hpp>
 #include <vector>
 
-class QString;
+#include <QString>
 
 namespace Akregator
 {
diff --git a/akregator/src/selectioncontroller.h b/akregator/src/selectioncontroller.h
index 41a190ff..86320b56 100644
--- a/akregator/src/selectioncontroller.h
+++ b/akregator/src/selectioncontroller.h
@@ -28,8 +28,8 @@
 
 #include <QPointer>
 
-class QModelIndex;
-class QPoint;
+#include <QModelIndex>
+#include <QPoint>
 
 class KJob;
 
diff --git a/akregator/src/speechclient.h b/akregator/src/speechclient.h
index c83568f9..137e3e3d 100644
--- a/akregator/src/speechclient.h
+++ b/akregator/src/speechclient.h
@@ -28,8 +28,8 @@
 #include "kspeechinterface.h"
 #include <QObject>
 
-class QString;
-template <class T> class QList;
+#include <QString>
+#include <QList>
 
 namespace Akregator
 {
diff --git a/akregator/src/tabwidget.h b/akregator/src/tabwidget.h
index d3438f4f..182e5af2 100644
--- a/akregator/src/tabwidget.h
+++ b/akregator/src/tabwidget.h
@@ -27,7 +27,7 @@
 
 #include <ktabwidget.h>
 
-class QString;
+#include <QString>
 
 namespace Akregator
 {
diff --git a/akregator/src/treenode.h b/akregator/src/treenode.h
index c969ed4e..8197c618 100644
--- a/akregator/src/treenode.h
+++ b/akregator/src/treenode.h
@@ -31,13 +31,13 @@
 
 class KJob;
 
-class QDomDocument;
-class QDomElement;
-class QIcon;
-class QPoint;
-class QString;
-class QStringList;
-template <class T> class QList;
+#include <QDomDocument>
+#include <QDomElement>
+#include <QIcon>
+#include <QPoint>
+#include <QString>
+#include <QStringList>
+#include <QList>
 
 namespace Akregator
 {
diff --git a/ark/part/part.h b/ark/part/part.h
index 3d6ac1ea..c573494c 100644
--- a/ark/part/part.h
+++ b/ark/part/part.h
@@ -39,9 +39,9 @@ class KAboutData;
 class KAction;
 class KJob;
 
-class QAction;
-class QSplitter;
-class QTreeView;
+#include <QAction>
+#include <QSplitter>
+#include <QTreeView>
 
 namespace Ark
 {
diff --git a/bluedevil/src/daemon/kded/BlueDevilDaemon.h b/bluedevil/src/daemon/kded/BlueDevilDaemon.h
index 2485a577..86eb15de 100644
--- a/bluedevil/src/daemon/kded/BlueDevilDaemon.h
+++ b/bluedevil/src/daemon/kded/BlueDevilDaemon.h
@@ -30,7 +30,7 @@
 typedef QMap <QString, QString> DeviceInfo;
 typedef QMap<QString, DeviceInfo > QMapDeviceInfo;
 
-class QDBusPendingCallWatcher;
+#include <QDBusPendingCallWatcher>
 namespace BlueDevil {
     class Adapter;
     class Device;
diff --git a/bluedevil/src/daemon/kded/bluezagent.h b/bluedevil/src/daemon/kded/bluezagent.h
index 49155349..878e996b 100644
--- a/bluedevil/src/daemon/kded/bluezagent.h
+++ b/bluedevil/src/daemon/kded/bluezagent.h
@@ -27,7 +27,7 @@
 #include <QtDBus/qdbusextratypes.h>
 #include <QtDBus/QDBusAbstractAdaptor>
 
-class QProcess;
+#include <QProcess>
 namespace BlueDevil {
     class Adapter;
 };
diff --git a/bluedevil/src/daemon/kded/filereceiver/filereceiver.h b/bluedevil/src/daemon/kded/filereceiver/filereceiver.h
index c821d7a6..42fd4655 100644
--- a/bluedevil/src/daemon/kded/filereceiver/filereceiver.h
+++ b/bluedevil/src/daemon/kded/filereceiver/filereceiver.h
@@ -24,7 +24,7 @@
 
 #include "obex_agent_manager.h"
 
-class QDBusPendingCallWatcher;
+#include <QDBusPendingCallWatcher>
 class FileReceiver : public QObject
 {
     Q_OBJECT
diff --git a/bluedevil/src/daemon/kded/filereceiver/obexagent.h b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
index f60f5785..f38c8d72 100644
--- a/bluedevil/src/daemon/kded/filereceiver/obexagent.h
+++ b/bluedevil/src/daemon/kded/filereceiver/obexagent.h
@@ -25,7 +25,7 @@
 
 #include <KComponentData>
 
-class QDBusMessage;
+#include <QDBusMessage>
 class ObexAgent : public QDBusAbstractAdaptor
 {
     Q_OBJECT
diff --git a/bluedevil/src/fileitemactionplugin/sendfileitemaction.h b/bluedevil/src/fileitemactionplugin/sendfileitemaction.h
index 8c38b61b..e17c6a6e 100644
--- a/bluedevil/src/fileitemactionplugin/sendfileitemaction.h
+++ b/bluedevil/src/fileitemactionplugin/sendfileitemaction.h
@@ -26,9 +26,9 @@
 
 #include "kded_bluedevil.h"
 
-class QAction;
+#include <QAction>
 class KFileItemListProperties;
-class QWidget;
+#include <QWidget>
 
 class SendFileItemAction : public KAbstractFileItemActionPlugin
 {
diff --git a/bluedevil/src/kcmodule/bluedeviladapters.h b/bluedevil/src/kcmodule/bluedeviladapters.h
index b96b2ea6..0f041a8d 100644
--- a/bluedevil/src/kcmodule/bluedeviladapters.h
+++ b/bluedevil/src/kcmodule/bluedeviladapters.h
@@ -25,12 +25,12 @@
 
 #include <kcmodule.h>
 
-class QVBoxLayout;
-class QRadioButton;
-class QSlider;
-class QLabel;
-class QCheckBox;
-class QFormLayout;
+#include <QVBoxLayout>
+#include <QRadioButton>
+#include <QSlider>
+#include <QLabel>
+#include <QCheckBox>
+#include <QFormLayout>
 
 class KLineEdit;
 
diff --git a/bluedevil/src/kcmodule/bluedevildevices.h b/bluedevil/src/kcmodule/bluedevildevices.h
index db83c25d..08b20ca5 100644
--- a/bluedevil/src/kcmodule/bluedevildevices.h
+++ b/bluedevil/src/kcmodule/bluedevildevices.h
@@ -29,8 +29,8 @@ class SystemCheck;
 class DeviceDetails;
 class BluetoothDevicesModel;
 
-class QListView;
-class QCheckBox;
+#include <QListView>
+#include <QCheckBox>
 
 class KPushButton;
 
diff --git a/bluedevil/src/kcmodule/devicedetails.h b/bluedevil/src/kcmodule/devicedetails.h
index e30200f6..332c13b5 100644
--- a/bluedevil/src/kcmodule/devicedetails.h
+++ b/bluedevil/src/kcmodule/devicedetails.h
@@ -23,7 +23,7 @@
 
 #include <kdialog.h>
 
-class QCheckBox;
+#include <QCheckBox>
 class KLineEdit;
 
 namespace BlueDevil {
diff --git a/bluedevil/src/kcmodule/systemcheck.h b/bluedevil/src/kcmodule/systemcheck.h
index ee94f7e7..fa3c69e3 100644
--- a/bluedevil/src/kcmodule/systemcheck.h
+++ b/bluedevil/src/kcmodule/systemcheck.h
@@ -22,7 +22,7 @@
 #define BLUEDEVIL_SYSTEM_CHECK_H
 #include <QtCore/QObject>
 
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 class KDED;
 class KMessageWidget;
diff --git a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
index 5b651137..238e3e36 100644
--- a/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
+++ b/bluedevil/src/kio/obexftp/daemon/ObexFtpDaemon.h
@@ -26,8 +26,8 @@
 #include <kdemacros.h>
 
 class KJob;
-class QDBusMessage;
-class QDBusPendingCallWatcher;
+#include <QDBusMessage>
+#include <QDBusPendingCallWatcher>
 
 class KDE_EXPORT ObexFtpDaemon : public KDEDModule
 {
diff --git a/bluedevil/src/kio/obexftp/daemon/createsessionjob.h b/bluedevil/src/kio/obexftp/daemon/createsessionjob.h
index 667384bc..6368cef8 100644
--- a/bluedevil/src/kio/obexftp/daemon/createsessionjob.h
+++ b/bluedevil/src/kio/obexftp/daemon/createsessionjob.h
@@ -23,7 +23,7 @@
 
 #include <KJob>
 
-class QDBusPendingCallWatcher;
+#include <QDBusPendingCallWatcher>
 class OrgBluezObexClient1Interface;
 class CreateSessionJob : public KJob
 {
diff --git a/bluedevil/src/monolithic/monolithic.h b/bluedevil/src/monolithic/monolithic.h
index eb22253c..0f7352bc 100644
--- a/bluedevil/src/monolithic/monolithic.h
+++ b/bluedevil/src/monolithic/monolithic.h
@@ -29,7 +29,7 @@ namespace BlueDevil {
     class Device;
 }
 
-class QAction;
+#include <QAction>
 class KAction;
 
 using namespace BlueDevil;
diff --git a/bluedevil/src/sendfile/discoverwidget.h b/bluedevil/src/sendfile/discoverwidget.h
index d1cc03bb..5161678a 100644
--- a/bluedevil/src/sendfile/discoverwidget.h
+++ b/bluedevil/src/sendfile/discoverwidget.h
@@ -28,7 +28,7 @@
 
 #include <QWidget>
 
-class QTimer;
+#include <QTimer>
 class BlueWizard;
 
 namespace BlueDevil {
diff --git a/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h b/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
index 02d4615d..41c910bb 100644
--- a/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectdeviceandfilespage.h
@@ -28,7 +28,7 @@
 #include <QtGui/qwizard.h>
 
 class KUrl;
-class QWizard;
+#include <QWizard>
 class KFileDialog;
 namespace BlueDevil {
     class Device;
diff --git a/bluedevil/src/sendfile/pages/selectdevicepage.h b/bluedevil/src/sendfile/pages/selectdevicepage.h
index 6be8e93d..0e556c29 100644
--- a/bluedevil/src/sendfile/pages/selectdevicepage.h
+++ b/bluedevil/src/sendfile/pages/selectdevicepage.h
@@ -28,7 +28,7 @@
 #include <QtGui/qwizard.h>
 
 class KUrl;
-class QWizard;
+#include <QWizard>
 class KFileDialog;
 namespace BlueDevil {
     class Device;
diff --git a/bluedevil/src/sendfile/pages/selectfilespage.h b/bluedevil/src/sendfile/pages/selectfilespage.h
index 8690db30..3a0299ea 100644
--- a/bluedevil/src/sendfile/pages/selectfilespage.h
+++ b/bluedevil/src/sendfile/pages/selectfilespage.h
@@ -25,7 +25,7 @@
 
 #include <QtGui/qwizard.h>
 
-class QWizard;
+#include <QWizard>
 class KFileWidget;
 
 class SelectFilesPage : public QWizardPage
diff --git a/bluedevil/src/sendfile/sendfilesjob.h b/bluedevil/src/sendfile/sendfilesjob.h
index a9df0057..9085c024 100644
--- a/bluedevil/src/sendfile/sendfilesjob.h
+++ b/bluedevil/src/sendfile/sendfilesjob.h
@@ -35,7 +35,7 @@ namespace BlueDevil
     class Device;
 }
 
-class QDBusPendingCallWatcher;
+#include <QDBusPendingCallWatcher>
 class OrgBluezObexClient1Interface;
 class OrgBluezObexObjectPush1Interface;
 class OrgFreedesktopDBusPropertiesInterface;
diff --git a/bluedevil/src/sendfile/sendfilewizard.h b/bluedevil/src/sendfile/sendfilewizard.h
index 9b425e2d..990e694f 100644
--- a/bluedevil/src/sendfile/sendfilewizard.h
+++ b/bluedevil/src/sendfile/sendfilewizard.h
@@ -29,7 +29,7 @@
 #include "discoverwidget.h"
 
 class WizardAgent;
-class QStringList;
+#include <QStringList>
 class SendFilesJob;
 namespace BlueDevil {
     class Device;
diff --git a/filelight/src/part/fileTree.h b/filelight/src/part/fileTree.h
index 8b33cea4..6f624e7d 100644
--- a/filelight/src/part/fileTree.h
+++ b/filelight/src/part/fileTree.h
@@ -220,7 +220,7 @@ private:
 
 
 class Folder;
-class QString;
+#include <QString>
 
 class File
 {
diff --git a/filelight/src/part/scan.h b/filelight/src/part/scan.h
index 34ac07b4..ee7a01cc 100644
--- a/filelight/src/part/scan.h
+++ b/filelight/src/part/scan.h
@@ -26,7 +26,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
 
-class QThread;
+#include <QThread>
 class Folder;
 template<class T> class Chain;
 
diff --git a/gwenview/app/browsemainpage.h b/gwenview/app/browsemainpage.h
index 0bd206a1..cea22df0 100644
--- a/gwenview/app/browsemainpage.h
+++ b/gwenview/app/browsemainpage.h
@@ -29,9 +29,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QDropEvent;
-class QModelIndex;
-class QToolButton;
+#include <QDropEvent>
+#include <QModelIndex>
+#include <QToolButton>
 
 class KActionCollection;
 class KUrlNavigator;
diff --git a/gwenview/app/fileoperations.h b/gwenview/app/fileoperations.h
index 2fd418eb..9514d9e5 100644
--- a/gwenview/app/fileoperations.h
+++ b/gwenview/app/fileoperations.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 #include <KUrl>
 
-class QWidget;
+#include <QWidget>
 
 namespace Gwenview
 {
diff --git a/gwenview/app/fileopscontextmanageritem.h b/gwenview/app/fileopscontextmanageritem.h
index 4070950d..509e526e 100644
--- a/gwenview/app/fileopscontextmanageritem.h
+++ b/gwenview/app/fileopscontextmanageritem.h
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include "abstractcontextmanageritem.h"
 
-class QAction;
-class QListView;
+#include <QAction>
+#include <QListView>
 class KAction;
 class KActionCollection;
 class KXMLGUIClient;
diff --git a/gwenview/app/filtercontroller.h b/gwenview/app/filtercontroller.h
index 280ba361..04db9840 100644
--- a/gwenview/app/filtercontroller.h
+++ b/gwenview/app/filtercontroller.h
@@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QAction;
-class QFrame;
+#include <QAction>
+#include <QFrame>
 
 namespace Gwenview
 {
diff --git a/gwenview/app/folderviewcontextmanageritem.h b/gwenview/app/folderviewcontextmanageritem.h
index 057fb691..6d1f4ef4 100644
--- a/gwenview/app/folderviewcontextmanageritem.h
+++ b/gwenview/app/folderviewcontextmanageritem.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include "abstractcontextmanageritem.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 class KUrl;
 
diff --git a/gwenview/app/fullscreencontent.h b/gwenview/app/fullscreencontent.h
index f2f83f3c..3d8025d1 100644
--- a/gwenview/app/fullscreencontent.h
+++ b/gwenview/app/fullscreencontent.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QStringList;
+#include <QStringList>
 
 class KActionCollection;
 class KUrl;
diff --git a/gwenview/app/gvcore.h b/gwenview/app/gvcore.h
index fac1fecc..d7e8dbb2 100644
--- a/gwenview/app/gvcore.h
+++ b/gwenview/app/gvcore.h
@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 class KJob;
 class KUrl;
 
-class QAbstractItemModel;
-class QPalette;
+#include <QAbstractItemModel>
+#include <QPalette>
 
 namespace Gwenview
 {
diff --git a/gwenview/app/infocontextmanageritem.h b/gwenview/app/infocontextmanageritem.h
index 13918d03..f2234ffd 100644
--- a/gwenview/app/infocontextmanageritem.h
+++ b/gwenview/app/infocontextmanageritem.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Local
 #include "abstractcontextmanageritem.h"
 
-class QStringList;
+#include <QStringList>
 class KFileItem;
 class KFileItemList;
 
diff --git a/gwenview/app/kipiinterface.h b/gwenview/app/kipiinterface.h
index 45fb03ba..3ae4ee46 100644
--- a/gwenview/app/kipiinterface.h
+++ b/gwenview/app/kipiinterface.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <libkipi/imagecollectionshared.h>
 #include <libkipi/plugin.h>
 
-class QAction;
+#include <QAction>
 
 namespace Gwenview
 {
diff --git a/gwenview/app/mainwindow.h b/gwenview/app/mainwindow.h
index 8e058e37..aaf3cf93 100644
--- a/gwenview/app/mainwindow.h
+++ b/gwenview/app/mainwindow.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <KXmlGuiWindow>
 
-class QModelIndex;
+#include <QModelIndex>
 
 class KUrl;
 
diff --git a/gwenview/app/preloader.h b/gwenview/app/preloader.h
index 29efda75..a6c7e2b7 100644
--- a/gwenview/app/preloader.h
+++ b/gwenview/app/preloader.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QSize;
+#include <QSize>
 
 class KUrl;
 
diff --git a/gwenview/app/startmainpage.h b/gwenview/app/startmainpage.h
index 7485e8fa..118fc187 100644
--- a/gwenview/app/startmainpage.h
+++ b/gwenview/app/startmainpage.h
@@ -28,9 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QModelIndex;
-class QPalette;
-class QShowEvent;
+#include <QModelIndex>
+#include <QPalette>
+#include <QShowEvent>
 
 class KUrl;
 
diff --git a/gwenview/app/viewmainpage.h b/gwenview/app/viewmainpage.h
index 6b103d5e..1e92cbb7 100644
--- a/gwenview/app/viewmainpage.h
+++ b/gwenview/app/viewmainpage.h
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QToolButton>
 #include <QWidget>
 
-class QGraphicsWidget;
-class QPalette;
+#include <QGraphicsWidget>
+#include <QPalette>
 
 class KActionCollection;
 
diff --git a/gwenview/importer/filenameformater.h b/gwenview/importer/filenameformater.h
index 97205d74..291f7f3b 100644
--- a/gwenview/importer/filenameformater.h
+++ b/gwenview/importer/filenameformater.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QString;
+#include <QString>
 
 class KDateTime;
 class KUrl;
diff --git a/gwenview/importer/fileutils.h b/gwenview/importer/fileutils.h
index e81c1db8..b92217e2 100644
--- a/gwenview/importer/fileutils.h
+++ b/gwenview/importer/fileutils.h
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #ifndef FILEUTILS_H
 #define FILEUTILS_H
 
-class QString;
-class QWidget;
+#include <QString>
+#include <QWidget>
 class KUrl;
 
 namespace Gwenview
diff --git a/gwenview/lib/about.h b/gwenview/lib/about.h
index 099b049e..2754c5a9 100644
--- a/gwenview/lib/about.h
+++ b/gwenview/lib/about.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 
 class KAboutData;
-class QByteArray;
+#include <QByteArray>
 class KLocalizedString;
 
 namespace Gwenview
diff --git a/gwenview/lib/contextmanager.h b/gwenview/lib/contextmanager.h
index 59c7226b..fb8c0992 100644
--- a/gwenview/lib/contextmanager.h
+++ b/gwenview/lib/contextmanager.h
@@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <KUrl>
 #include <KFileItem>
 
-class QItemSelectionModel;
-class QModelIndex;
+#include <QItemSelectionModel>
+#include <QModelIndex>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/crop/cropimageoperation.h b/gwenview/lib/crop/cropimageoperation.h
index 8ea26c10..1bff6e2e 100644
--- a/gwenview/lib/crop/cropimageoperation.h
+++ b/gwenview/lib/crop/cropimageoperation.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include <lib/abstractimageoperation.h>
 
-class QRect;
+#include <QRect>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/crop/croptool.h b/gwenview/lib/crop/croptool.h
index 818f50d2..3b05e2f9 100644
--- a/gwenview/lib/crop/croptool.h
+++ b/gwenview/lib/crop/croptool.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include <lib/documentview/abstractrasterimageviewtool.h>
 
-class QRect;
+#include <QRect>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/datewidget.h b/gwenview/lib/datewidget.h
index 6bd99409..8daca9b6 100644
--- a/gwenview/lib/datewidget.h
+++ b/gwenview/lib/datewidget.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QDate;
+#include <QDate>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/disabledactionshortcutmonitor.h b/gwenview/lib/disabledactionshortcutmonitor.h
index 42818887..868853f6 100644
--- a/gwenview/lib/disabledactionshortcutmonitor.h
+++ b/gwenview/lib/disabledactionshortcutmonitor.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 #include <QObject>
 
-class QAction;
+#include <QAction>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/document/abstractdocumenteditor.h b/gwenview/lib/document/abstractdocumenteditor.h
index 0e3a482a..fd465e39 100644
--- a/gwenview/lib/document/abstractdocumenteditor.h
+++ b/gwenview/lib/document/abstractdocumenteditor.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Local
 #include <lib/orientation.h>
 
-class QImage;
+#include <QImage>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/document/abstractdocumentimpl.h b/gwenview/lib/document/abstractdocumentimpl.h
index 74923637..626bb930 100644
--- a/gwenview/lib/document/abstractdocumentimpl.h
+++ b/gwenview/lib/document/abstractdocumentimpl.h
@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/document/document.h>
 #include <lib/orientation.h>
 
-class QImage;
-class QRect;
+#include <QImage>
+#include <QRect>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/document/document.h b/gwenview/lib/document/document.h
index 9f53a1db..336c4597 100644
--- a/gwenview/lib/document/document.h
+++ b/gwenview/lib/document/document.h
@@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // Local
 #include <lib/mimetypeutils.h>
 
-class QImage;
-class QRect;
-class QSize;
-class QSvgRenderer;
-class QUndoStack;
+#include <QImage>
+#include <QRect>
+#include <QSize>
+#include <QSvgRenderer>
+#include <QUndoStack>
 
 class KJob;
 class KUrl;
diff --git a/gwenview/lib/document/documentfactory.h b/gwenview/lib/document/documentfactory.h
index 4d88f8e0..cc94a692 100644
--- a/gwenview/lib/document/documentfactory.h
+++ b/gwenview/lib/document/documentfactory.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <lib/document/document.h>
 
-class QUndoGroup;
+#include <QUndoGroup>
 
 class KUrl;
 
diff --git a/gwenview/lib/document/documentloadedimpl.h b/gwenview/lib/document/documentloadedimpl.h
index 3259b8a9..64e0d39f 100644
--- a/gwenview/lib/document/documentloadedimpl.h
+++ b/gwenview/lib/document/documentloadedimpl.h
@@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/document/abstractdocumenteditor.h>
 #include <lib/document/abstractdocumentimpl.h>
 
-class QByteArray;
-class QIODevice;
+#include <QByteArray>
+#include <QIODevice>
 
 class KUrl;
 
diff --git a/gwenview/lib/document/savejob.h b/gwenview/lib/document/savejob.h
index 5ed86cbb..b32baf9f 100644
--- a/gwenview/lib/document/savejob.h
+++ b/gwenview/lib/document/savejob.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Local
 #include <lib/document/documentjob.h>
 
-class QByteArray;
+#include <QByteArray>
 class KUrl;
 
 namespace Gwenview
diff --git a/gwenview/lib/documentview/abstractdocumentviewadapter.h b/gwenview/lib/documentview/abstractdocumentviewadapter.h
index f3e9b2b1..2f7539ed 100644
--- a/gwenview/lib/documentview/abstractdocumentviewadapter.h
+++ b/gwenview/lib/documentview/abstractdocumentviewadapter.h
@@ -32,9 +32,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Local
 #include <lib/document/document.h>
 
-class QCursor;
-class QGraphicsWidget;
-class QRectF;
+#include <QCursor>
+#include <QGraphicsWidget>
+#include <QRectF>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/abstractrasterimageviewtool.h b/gwenview/lib/documentview/abstractrasterimageviewtool.h
index 9128c98a..17f15aa3 100644
--- a/gwenview/lib/documentview/abstractrasterimageviewtool.h
+++ b/gwenview/lib/documentview/abstractrasterimageviewtool.h
@@ -30,11 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Local
 
-class QKeyEvent;
-class QGraphicsSceneHoverEvent;
-class QGraphicsSceneMouseEvent;
-class QGraphicsSceneWheelEvent;
-class QPainter;
+#include <QKeyEvent>
+#include <QGraphicsSceneHoverEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneWheelEvent>
+#include <QPainter>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/documentview.h b/gwenview/lib/documentview/documentview.h
index f0bb1dcd..36447c8f 100644
--- a/gwenview/lib/documentview/documentview.h
+++ b/gwenview/lib/documentview/documentview.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Local
 #include <lib/document/document.h>
 
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 class KUrl;
 
 namespace Gwenview
diff --git a/gwenview/lib/documentview/documentviewsynchronizer.h b/gwenview/lib/documentview/documentviewsynchronizer.h
index 0ade4ef2..88f2e32c 100644
--- a/gwenview/lib/documentview/documentviewsynchronizer.h
+++ b/gwenview/lib/documentview/documentviewsynchronizer.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QObject>
 
-class QPoint;
+#include <QPoint>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/rasterimageview.h b/gwenview/lib/documentview/rasterimageview.h
index 407a79fe..adc40bae 100644
--- a/gwenview/lib/documentview/rasterimageview.h
+++ b/gwenview/lib/documentview/rasterimageview.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // KDE
 
-class QGraphicsSceneHoverEvent;
+#include <QGraphicsSceneHoverEvent>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/documentview/svgviewadapter.h b/gwenview/lib/documentview/svgviewadapter.h
index 6fccdf3c..cb8ddcbf 100644
--- a/gwenview/lib/documentview/svgviewadapter.h
+++ b/gwenview/lib/documentview/svgviewadapter.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <lib/documentview/abstractimageview.h>
 #include <lib/documentview/abstractdocumentviewadapter.h>
 
-class QGraphicsSvgItem;
+#include <QGraphicsSvgItem>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/fullscreenbar.h b/gwenview/lib/fullscreenbar.h
index 3ecbf468..556d5936 100644
--- a/gwenview/lib/fullscreenbar.h
+++ b/gwenview/lib/fullscreenbar.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 // Local
 
-class QEvent;
+#include <QEvent>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/graphicswidgetfloater.h b/gwenview/lib/graphicswidgetfloater.h
index 705175e2..92fc55d1 100644
--- a/gwenview/lib/graphicswidgetfloater.h
+++ b/gwenview/lib/graphicswidgetfloater.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QGraphicsWidget;
+#include <QGraphicsWidget>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/hud/hudbutton.h b/gwenview/lib/hud/hudbutton.h
index 5bef2da8..662bf8c0 100644
--- a/gwenview/lib/hud/hudbutton.h
+++ b/gwenview/lib/hud/hudbutton.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QGraphicsWidget>
 
-class QIcon;
+#include <QIcon>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/hud/hudbuttonbox.h b/gwenview/lib/hud/hudbuttonbox.h
index 79fdc149..6d7032a0 100644
--- a/gwenview/lib/hud/hudbuttonbox.h
+++ b/gwenview/lib/hud/hudbuttonbox.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Qt
 
-class QAction;
-class QGraphicsWidget;
+#include <QAction>
+#include <QGraphicsWidget>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/imagescaler.h b/gwenview/lib/imagescaler.h
index 62be2b6d..ba7c3d1e 100644
--- a/gwenview/lib/imagescaler.h
+++ b/gwenview/lib/imagescaler.h
@@ -28,9 +28,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <lib/gwenviewlib_export.h>
 
-class QImage;
-class QRect;
-class QRegion;
+#include <QImage>
+#include <QRect>
+#include <QRegion>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/imageutils.h b/gwenview/lib/imageutils.h
index bdccdc82..f1655a8d 100644
--- a/gwenview/lib/imageutils.h
+++ b/gwenview/lib/imageutils.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #include <lib/gwenviewlib_export.h>
 #include <lib/orientation.h>
 
-class QMatrix;
+#include <QMatrix>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/invisiblebuttongroup.h b/gwenview/lib/invisiblebuttongroup.h
index 5d4b7f85..5349577b 100644
--- a/gwenview/lib/invisiblebuttongroup.h
+++ b/gwenview/lib/invisiblebuttongroup.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QAbstractButton;
+#include <QAbstractButton>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/mimetypeutils.h b/gwenview/lib/mimetypeutils.h
index fd513501..439e29d1 100644
--- a/gwenview/lib/mimetypeutils.h
+++ b/gwenview/lib/mimetypeutils.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <lib/gwenviewlib_export.h>
 
 // Local
-class QStringList;
+#include <QStringList>
 
 class KFileItem;
 class KUrl;
diff --git a/gwenview/lib/paintutils.h b/gwenview/lib/paintutils.h
index 97ec0d5e..6d573f6b 100644
--- a/gwenview/lib/paintutils.h
+++ b/gwenview/lib/paintutils.h
@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <lib/gwenviewlib_export.h>
 
-class QColor;
-class QPainterPath;
-class QPixmap;
-class QRect;
-class QRectF;
-class QSize;
+#include <QColor>
+#include <QPainterPath>
+#include <QPixmap>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/print/printhelper.h b/gwenview/lib/print/printhelper.h
index d6710af3..4ab71c35 100644
--- a/gwenview/lib/print/printhelper.h
+++ b/gwenview/lib/print/printhelper.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include <lib/document/document.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/redeyereduction/redeyereductionimageoperation.h b/gwenview/lib/redeyereduction/redeyereductionimageoperation.h
index 5c8ab42e..8e760387 100644
--- a/gwenview/lib/redeyereduction/redeyereductionimageoperation.h
+++ b/gwenview/lib/redeyereduction/redeyereductionimageoperation.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // Local
 #include <lib/abstractimageoperation.h>
 
-class QRectF;
+#include <QRectF>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/shadowfilter.h b/gwenview/lib/shadowfilter.h
index 950082e8..115d17f8 100644
--- a/gwenview/lib/shadowfilter.h
+++ b/gwenview/lib/shadowfilter.h
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Qt
 #include <QObject>
 
-class QColor;
-class QWidget;
+#include <QColor>
+#include <QWidget>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/slidecontainer.h b/gwenview/lib/slidecontainer.h
index 0a812d46..a586ae75 100644
--- a/gwenview/lib/slidecontainer.h
+++ b/gwenview/lib/slidecontainer.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <lib/gwenviewlib_export.h>
 
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/slideshow.h b/gwenview/lib/slideshow.h
index 33e66b41..f72a1d52 100644
--- a/gwenview/lib/slideshow.h
+++ b/gwenview/lib/slideshow.h
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 // KDE
 #include <KUrl>
 
-class QAction;
+#include <QAction>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/thumbnailprovider/thumbnailwriter.h b/gwenview/lib/thumbnailprovider/thumbnailwriter.h
index 942d9d01..53de8678 100644
--- a/gwenview/lib/thumbnailprovider/thumbnailwriter.h
+++ b/gwenview/lib/thumbnailprovider/thumbnailwriter.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QMutex>
 #include <QThread>
 
-class QImage;
+#include <QImage>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/thumbnailview/abstractdocumentinfoprovider.h b/gwenview/lib/thumbnailview/abstractdocumentinfoprovider.h
index 7e1d618f..90f8b41a 100644
--- a/gwenview/lib/thumbnailview/abstractdocumentinfoprovider.h
+++ b/gwenview/lib/thumbnailview/abstractdocumentinfoprovider.h
@@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 // Local
 #include <lib/thumbnailgroup.h>
 
-class QModelIndex;
-class QPixmap;
-class QSize;
+#include <QModelIndex>
+#include <QPixmap>
+#include <QSize>
 
 class KUrl;
 
diff --git a/gwenview/lib/thumbnailview/thumbnailview.h b/gwenview/lib/thumbnailview/thumbnailview.h
index d5894834..7313337b 100644
--- a/gwenview/lib/thumbnailview/thumbnailview.h
+++ b/gwenview/lib/thumbnailview/thumbnailview.h
@@ -29,10 +29,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <KUrl>
 
 class KFileItem;
-class QDragEnterEvent;
-class QDragMoveEvent;
-class QDropEvent;
-class QPixmap;
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QPixmap>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/zoomslider.h b/gwenview/lib/zoomslider.h
index b8958ea3..622a6205 100644
--- a/gwenview/lib/zoomslider.h
+++ b/gwenview/lib/zoomslider.h
@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QAction;
-class QSlider;
+#include <QAction>
+#include <QSlider>
 
 namespace Gwenview
 {
diff --git a/gwenview/lib/zoomwidget.h b/gwenview/lib/zoomwidget.h
index b181f5ac..6b896b5f 100644
--- a/gwenview/lib/zoomwidget.h
+++ b/gwenview/lib/zoomwidget.h
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 
 // Local
 
-class QAction;
+#include <QAction>
 
 namespace Gwenview
 {
diff --git a/jovie/filters/stringreplacer/selectlanguagedlg.h b/jovie/filters/stringreplacer/selectlanguagedlg.h
index 8af80254..fb0d01a4 100644
--- a/jovie/filters/stringreplacer/selectlanguagedlg.h
+++ b/jovie/filters/stringreplacer/selectlanguagedlg.h
@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kdemacros.h>
 
-class QTableWidget;
+#include <QTableWidget>
 
 class KDE_EXPORT SelectLanguageDlg : public KDialog
 {
diff --git a/jovie/filters/xhtml2ssml/xhtml2ssml.h b/jovie/filters/xhtml2ssml/xhtml2ssml.h
index 83f14d55..9bff9a55 100644
--- a/jovie/filters/xhtml2ssml/xhtml2ssml.h
+++ b/jovie/filters/xhtml2ssml/xhtml2ssml.h
@@ -30,7 +30,7 @@
 #include <QtCore/QMap>
 
 typedef QMap<QString, QString> QStringMap;
-class QString;
+#include <QString>
 
 class XHTMLToSSMLParser : public QXmlDefaultHandler {
 
diff --git a/jovie/filters/xhtml2ssml/xmlelement.h b/jovie/filters/xhtml2ssml/xmlelement.h
index 3d51e9b6..9e8486e0 100644
--- a/jovie/filters/xhtml2ssml/xmlelement.h
+++ b/jovie/filters/xhtml2ssml/xmlelement.h
@@ -28,7 +28,7 @@
 
 #include <QtCore/QMap>
 
-class QString;
+#include <QString>
 
 typedef QMap<QString, QString> AttributeToValueMap;
 
diff --git a/jovie/jovie/jovietrayicon.h b/jovie/jovie/jovietrayicon.h
index 73c24ce3..23cbc0b6 100644
--- a/jovie/jovie/jovietrayicon.h
+++ b/jovie/jovie/jovietrayicon.h
@@ -30,7 +30,7 @@
 #include <kmenu.h>
 #include <kstatusnotifieritem.h>
 #include "talkercode.h"
-class QEvent;
+#include <QEvent>
 class KAction;
 
 /**
diff --git a/jovie/jovie/ssmlconvert.h b/jovie/jovie/ssmlconvert.h
index d1f651f9..c6495755 100644
--- a/jovie/jovie/ssmlconvert.h
+++ b/jovie/jovie/ssmlconvert.h
@@ -27,8 +27,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-class QProcess;
-class QString;
+#include <QProcess>
+#include <QString>
 
 /**
   * @class SsmlConvert
diff --git a/jovie/kcmkttsmgr/kcmkttsmgr.h b/jovie/kcmkttsmgr/kcmkttsmgr.h
index a200f36d..c0455920 100644
--- a/jovie/kcmkttsmgr/kcmkttsmgr.h
+++ b/jovie/kcmkttsmgr/kcmkttsmgr.h
@@ -47,8 +47,8 @@
 #include "kspeechinterface.h"
 
 class KttsFilterConf;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class KAboutData;
 class KConfig;
 class KttsJobMgr;
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index 77330ce2..e0f890aa 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KCALC_H_
 
 class Constants;
-class QButtonGroup;
+#include <QButtonGroup>
 class KToggleAction;
 class KCalcConstMenu;
 
diff --git a/kcalc/kcalc_bitset.h b/kcalc/kcalc_bitset.h
index d83d6e66..96602198 100644
--- a/kcalc/kcalc_bitset.h
+++ b/kcalc/kcalc_bitset.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QFrame>
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 class KCalcBitset : public QFrame {
 	Q_OBJECT
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index 807cb009..946b8d9f 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class CalcEngine;
 class KAction;
-class QTimer;
-class QStyleOptionFrame;
+#include <QTimer>
+#include <QStyleOptionFrame>
 
 #define NUM_STATUS_TEXT 4
 
diff --git a/kcron/src/crontabPrinter.h b/kcron/src/crontabPrinter.h
index 72993ac8..df19712e 100644
--- a/kcron/src/crontabPrinter.h
+++ b/kcron/src/crontabPrinter.h
@@ -18,7 +18,7 @@
 
 #include "crontabPrinterWidget.h"
 
-class QString;
+#include <QString>
 
 class CrontabWidget;
 
diff --git a/kcron/src/crontabPrinterWidget.h b/kcron/src/crontabPrinterWidget.h
index 61bcf2f6..957f5ed8 100644
--- a/kcron/src/crontabPrinterWidget.h
+++ b/kcron/src/crontabPrinterWidget.h
@@ -15,7 +15,7 @@
 
 #include <QWidget>
 
-class QCheckBox;
+#include <QCheckBox>
 
 /**
  *Give the user the option to print the crontab file.
diff --git a/kcron/src/crontabWidget.h b/kcron/src/crontabWidget.h
index dd6f39d5..d8efb8ec 100644
--- a/kcron/src/crontabWidget.h
+++ b/kcron/src/crontabWidget.h
@@ -17,7 +17,7 @@
 #include "tasksWidget.h"
 #include "variablesWidget.h"
 
-class QHBoxLayout;
+#include <QHBoxLayout>
 
 class KActionCollection;
 
diff --git a/kcron/src/genericListWidget.h b/kcron/src/genericListWidget.h
index 08c03b9c..16ec7433 100644
--- a/kcron/src/genericListWidget.h
+++ b/kcron/src/genericListWidget.h
@@ -18,8 +18,8 @@
 #include "cthost.h"
 
 class GenericListWidgetPrivate;
-class QKeyEvent;
-class QAction;
+#include <QKeyEvent>
+#include <QAction>
 
 class CrontabWidget;
 
diff --git a/kcron/src/kcronHelper.h b/kcron/src/kcronHelper.h
index d4824bda..75be866a 100644
--- a/kcron/src/kcronHelper.h
+++ b/kcron/src/kcronHelper.h
@@ -15,8 +15,8 @@
 #include <QPixmap>
 #include <QString>
 
-class QComboBox;
-class QTextEdit;
+#include <QComboBox>
+#include <QTextEdit>
 
 class CrontabWidget;
 
diff --git a/kcron/src/taskEditorDialog.h b/kcron/src/taskEditorDialog.h
index 25f13640..1d990007 100644
--- a/kcron/src/taskEditorDialog.h
+++ b/kcron/src/taskEditorDialog.h
@@ -25,11 +25,11 @@
 #include <ktitlewidget.h>
 #include <kmimetype.h>
 
-class QLabel;
-class QLineEdit;
-class QCheckBox;
-class QGridLayout;
-class QHBoxLayout;
+#include <QLabel>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
 
 class KUrlRequester;
 
diff --git a/kdeplasma-addons/applets/bball/bball.h b/kdeplasma-addons/applets/bball/bball.h
index 8179ceed..12dfbb56 100644
--- a/kdeplasma-addons/applets/bball/bball.h
+++ b/kdeplasma-addons/applets/bball/bball.h
@@ -32,8 +32,8 @@
 
 #include "ui_bballConfig.h"
 
-class QGraphicsSceneMouseEvent;
-class QSizeF;
+#include <QGraphicsSceneMouseEvent>
+#include <QSizeF>
 
 class bballApplet : public Plasma::Applet
 {
diff --git a/kdeplasma-addons/applets/binary-clock/binaryclock.h b/kdeplasma-addons/applets/binary-clock/binaryclock.h
index 5ae83dff..3d207184 100644
--- a/kdeplasma-addons/applets/binary-clock/binaryclock.h
+++ b/kdeplasma-addons/applets/binary-clock/binaryclock.h
@@ -27,8 +27,8 @@
 
 #include "ui_clockConfig.h"
 
-class QTime;
-class QColor;
+#include <QTime>
+#include <QColor>
 
 namespace Plasma {
     class DataEngine;
diff --git a/kdeplasma-addons/applets/blackboard/blackboard.h b/kdeplasma-addons/applets/blackboard/blackboard.h
index 2ea066db..63337183 100644
--- a/kdeplasma-addons/applets/blackboard/blackboard.h
+++ b/kdeplasma-addons/applets/blackboard/blackboard.h
@@ -24,7 +24,7 @@
 
 #include "blackboardwidget.h"
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class BlackBoard : public Plasma::Applet
 {
diff --git a/kdeplasma-addons/applets/blackboard/blackboardwidget.h b/kdeplasma-addons/applets/blackboard/blackboardwidget.h
index aa9972ba..67889bbe 100644
--- a/kdeplasma-addons/applets/blackboard/blackboardwidget.h
+++ b/kdeplasma-addons/applets/blackboard/blackboardwidget.h
@@ -25,8 +25,8 @@
 #include <QPixmap>
 #include <QtCore/qpoint.h>
 
-class QGraphicsSceneMouseEvent;
-class QStyleOptionGraphicsItem;
+#include <QGraphicsSceneMouseEvent>
+#include <QStyleOptionGraphicsItem>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/bubblemon/src/bubble.h b/kdeplasma-addons/applets/bubblemon/src/bubble.h
index 55cf8d33..fb9e559d 100644
--- a/kdeplasma-addons/applets/bubblemon/src/bubble.h
+++ b/kdeplasma-addons/applets/bubblemon/src/bubble.h
@@ -25,11 +25,11 @@
 
 #include "ui_settings.h"
 
-class QTimeLine;
-class QGraphicsSceneResizeEvent;
-class QTimer;
-class QStandardItemModel;
-class QPropertyAnimation;
+#include <QTimeLine>
+#include <QGraphicsSceneResizeEvent>
+#include <QTimer>
+#include <QStandardItemModel>
+#include <QPropertyAnimation>
 
 namespace Plasma {
     class Svg;
diff --git a/kdeplasma-addons/applets/charselect/charselect.h b/kdeplasma-addons/applets/charselect/charselect.h
index 58eb666c..7eeea5c7 100644
--- a/kdeplasma-addons/applets/charselect/charselect.h
+++ b/kdeplasma-addons/applets/charselect/charselect.h
@@ -23,7 +23,7 @@
 #include <Plasma/PopupApplet>
 
 class KCharSelect;
-class QGraphicsGridLayout;
+#include <QGraphicsGridLayout>
 class KLineEdit;
 class KPushButton;
 
diff --git a/kdeplasma-addons/applets/community/contactcontainer.h b/kdeplasma-addons/applets/community/contactcontainer.h
index c6692391..dafe0924 100644
--- a/kdeplasma-addons/applets/community/contactcontainer.h
+++ b/kdeplasma-addons/applets/community/contactcontainer.h
@@ -31,7 +31,7 @@
 
 
 class ContactWidget;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/community/friendmanagementcontainer.h b/kdeplasma-addons/applets/community/friendmanagementcontainer.h
index efaccd83..0b01013f 100644
--- a/kdeplasma-addons/applets/community/friendmanagementcontainer.h
+++ b/kdeplasma-addons/applets/community/friendmanagementcontainer.h
@@ -30,7 +30,7 @@
 
 
 class FriendManagementWidget;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class FriendManagementContainer : public QGraphicsWidget
 {
diff --git a/kdeplasma-addons/applets/community/friendmanagementwidget.h b/kdeplasma-addons/applets/community/friendmanagementwidget.h
index 96809eb8..931bdbb4 100644
--- a/kdeplasma-addons/applets/community/friendmanagementwidget.h
+++ b/kdeplasma-addons/applets/community/friendmanagementwidget.h
@@ -28,8 +28,8 @@
 
 
 class ContactImage;
-class QGraphicsGridLayout;
-class QGraphicsLinearLayout;
+#include <QGraphicsGridLayout>
+#include <QGraphicsLinearLayout>
 
 namespace Plasma {
     class IconWidget;
diff --git a/kdeplasma-addons/applets/community/messagewidget.h b/kdeplasma-addons/applets/community/messagewidget.h
index abf5b40d..5084b006 100644
--- a/kdeplasma-addons/applets/community/messagewidget.h
+++ b/kdeplasma-addons/applets/community/messagewidget.h
@@ -27,7 +27,7 @@
 
 
 class ContactImage;
-class QGraphicsGridLayout;
+#include <QGraphicsGridLayout>
 
 namespace Plasma {
     class IconWidget;
diff --git a/kdeplasma-addons/applets/community/opendesktop.h b/kdeplasma-addons/applets/community/opendesktop.h
index bf53f9e3..7fcfa82f 100644
--- a/kdeplasma-addons/applets/community/opendesktop.h
+++ b/kdeplasma-addons/applets/community/opendesktop.h
@@ -43,7 +43,7 @@ class LoginWidget;
 class KConfigDialog;
 class MessageCounter;
 class MessageList;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 struct GeoLocation {
     QString country;
diff --git a/kdeplasma-addons/applets/community/userwidget.h b/kdeplasma-addons/applets/community/userwidget.h
index 134e43c5..a24545ca 100644
--- a/kdeplasma-addons/applets/community/userwidget.h
+++ b/kdeplasma-addons/applets/community/userwidget.h
@@ -41,7 +41,7 @@ namespace Plasma
     class WebView;
 }
 
-class QSignalMapper;
+#include <QSignalMapper>
 
 class ContactImage;
 class StyleSheet;
diff --git a/kdeplasma-addons/applets/dict/dict.h b/kdeplasma-addons/applets/dict/dict.h
index ad78ae3d..f66638b4 100644
--- a/kdeplasma-addons/applets/dict/dict.h
+++ b/kdeplasma-addons/applets/dict/dict.h
@@ -24,10 +24,10 @@
 #include <Plasma/PopupApplet>
 #include <Plasma/DataEngine>
 
-class QTimer;
+#include <QTimer>
 class CheckableStringListModel;
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/fileWatcher/fileWatcher.h b/kdeplasma-addons/applets/fileWatcher/fileWatcher.h
index c8ad34d3..ef9ebb28 100644
--- a/kdeplasma-addons/applets/fileWatcher/fileWatcher.h
+++ b/kdeplasma-addons/applets/fileWatcher/fileWatcher.h
@@ -26,8 +26,8 @@
 #include "ui_fileWatcherConfig.h"
 #include "ui_filtersConfig.h"
 
-class QFile;
-class QTextDocument;
+#include <QFile>
+#include <QTextDocument>
 class KDirWatch;
 class FileWatcherTextItem;
 
diff --git a/kdeplasma-addons/applets/frame/frame.h b/kdeplasma-addons/applets/frame/frame.h
index 688eedef..51ef806e 100644
--- a/kdeplasma-addons/applets/frame/frame.h
+++ b/kdeplasma-addons/applets/frame/frame.h
@@ -34,7 +34,7 @@
 #include <plasma/animator.h>
 
 class ConfigDialog;
-class QGraphicsSceneDragDropEvent;
+#include <QGraphicsSceneDragDropEvent>
 class SlideShow;
 
 namespace Plasma
diff --git a/kdeplasma-addons/applets/frame/imageloader.h b/kdeplasma-addons/applets/frame/imageloader.h
index 89f24cc1..1aa9d174 100644
--- a/kdeplasma-addons/applets/frame/imageloader.h
+++ b/kdeplasma-addons/applets/frame/imageloader.h
@@ -24,7 +24,7 @@
 #include <QRunnable>
 #include <QString>
 
-class QImage;
+#include <QImage>
 
 class ImageLoader : public QObject, public QRunnable
 {
diff --git a/kdeplasma-addons/applets/frame/slideshow.h b/kdeplasma-addons/applets/frame/slideshow.h
index 13f39f5e..49d4905b 100644
--- a/kdeplasma-addons/applets/frame/slideshow.h
+++ b/kdeplasma-addons/applets/frame/slideshow.h
@@ -30,7 +30,7 @@
 
 #include "picture.h"
 
-class QTimer;
+#include <QTimer>
 
 class SlideShow : public QObject
 {
diff --git a/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.h b/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.h
index 9bf5c4ef..c0035afe 100644
--- a/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.h
+++ b/kdeplasma-addons/applets/fuzzy-clock/fuzzyClock.h
@@ -26,8 +26,8 @@
 
 #include "ui_fuzzyClockConfig.h"
 
-class QTime;
-class QDate;
+#include <QTime>
+#include <QDate>
 
 class KLocalizedString;
 
diff --git a/kdeplasma-addons/applets/icontasks/abstracttaskitem.h b/kdeplasma-addons/applets/icontasks/abstracttaskitem.h
index 587ce5f3..3ee3b2db 100644
--- a/kdeplasma-addons/applets/icontasks/abstracttaskitem.h
+++ b/kdeplasma-addons/applets/icontasks/abstracttaskitem.h
@@ -37,10 +37,10 @@
 #include <QGraphicsWidget>
 #include <QPropertyAnimation>
 
-class QTextOption;
-class QTextLayout;
-class QString;
-class QAction;
+#include <QTextOption>
+#include <QTextLayout>
+#include <QString>
+#include <QAction>
 
 // Plasma
 #include <Plasma/Animator>
diff --git a/kdeplasma-addons/applets/icontasks/dockconfig.h b/kdeplasma-addons/applets/icontasks/dockconfig.h
index 710f7846..44d06c08 100644
--- a/kdeplasma-addons/applets/icontasks/dockconfig.h
+++ b/kdeplasma-addons/applets/icontasks/dockconfig.h
@@ -32,8 +32,8 @@
 
 class KConfigDialog;
 class KPushButton;
-class QCheckBox;
-class QListWidgetItem;
+#include <QCheckBox>
+#include <QListWidgetItem>
 
 class DockConfigItemDelegate : public KWidgetItemDelegate
 {
diff --git a/kdeplasma-addons/applets/icontasks/dockitem.h b/kdeplasma-addons/applets/icontasks/dockitem.h
index a8221025..c1073a45 100644
--- a/kdeplasma-addons/applets/icontasks/dockitem.h
+++ b/kdeplasma-addons/applets/icontasks/dockitem.h
@@ -32,9 +32,9 @@
 #include <KUrl>
 
 class AbstractTaskItem;
-class QAction;
-class QTimer;
-class QMenu;
+#include <QAction>
+#include <QTimer>
+#include <QMenu>
 
 class DockItem : public QObject, protected QDBusContext
 {
diff --git a/kdeplasma-addons/applets/icontasks/dockmanager.h b/kdeplasma-addons/applets/icontasks/dockmanager.h
index a062e131..58287c1c 100644
--- a/kdeplasma-addons/applets/icontasks/dockmanager.h
+++ b/kdeplasma-addons/applets/icontasks/dockmanager.h
@@ -35,8 +35,8 @@ class DockConfig;
 class AbstractTaskItem;
 class KConfigDialog;
 class KConfigGroup;
-class QTimer;
-class QDBusServiceWatcher;
+#include <QTimer>
+#include <QDBusServiceWatcher>
 
 class DockManager : public QObject
 {
diff --git a/kdeplasma-addons/applets/icontasks/mediabuttons.h b/kdeplasma-addons/applets/icontasks/mediabuttons.h
index 57ad781b..8c2ca094 100644
--- a/kdeplasma-addons/applets/icontasks/mediabuttons.h
+++ b/kdeplasma-addons/applets/icontasks/mediabuttons.h
@@ -28,7 +28,7 @@
 #include <QtCore/QMap>
 #include <QSet>
 
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 class OrgMprisMediaPlayer2PlayerInterface;
 class OrgFreedesktopMediaPlayerInterface;
 
diff --git a/kdeplasma-addons/applets/icontasks/taskgroupitem.h b/kdeplasma-addons/applets/icontasks/taskgroupitem.h
index d455ec96..9e61c3c5 100644
--- a/kdeplasma-addons/applets/icontasks/taskgroupitem.h
+++ b/kdeplasma-addons/applets/icontasks/taskgroupitem.h
@@ -37,7 +37,7 @@ using TaskManager::AbstractGroupableItem;
 
 class TaskItemLayout;
 class DropIndicator;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/icontasks/tasks.h b/kdeplasma-addons/applets/icontasks/tasks.h
index f5390eb3..4b4c23d5 100644
--- a/kdeplasma-addons/applets/icontasks/tasks.h
+++ b/kdeplasma-addons/applets/icontasks/tasks.h
@@ -40,7 +40,7 @@
 // Plasma
 #include <Plasma/Applet>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 
 namespace Plasma
diff --git a/kdeplasma-addons/applets/icontasks/tooltips/tooltipcontent.h b/kdeplasma-addons/applets/icontasks/tooltips/tooltipcontent.h
index b14b7fc9..249dd204 100644
--- a/kdeplasma-addons/applets/icontasks/tooltips/tooltipcontent.h
+++ b/kdeplasma-addons/applets/icontasks/tooltips/tooltipcontent.h
@@ -33,8 +33,8 @@
 #define PLASMA_EXPORT
 #endif
 
-class QTextDocument;
-class QGraphicsWidget;
+#include <QTextDocument>
+#include <QGraphicsWidget>
 
 /**
  * This provides the content for a tooltip.
diff --git a/kdeplasma-addons/applets/icontasks/unity.h b/kdeplasma-addons/applets/icontasks/unity.h
index 1f592588..60f87d91 100644
--- a/kdeplasma-addons/applets/icontasks/unity.h
+++ b/kdeplasma-addons/applets/icontasks/unity.h
@@ -31,7 +31,7 @@
 
 class AbstractTaskItem;
 class UnityItem;
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 
 class Unity : public QObject, protected QDBusContext
 {
diff --git a/kdeplasma-addons/applets/icontasks/unityitem.h b/kdeplasma-addons/applets/icontasks/unityitem.h
index c6f9cda8..6922ef3b 100644
--- a/kdeplasma-addons/applets/icontasks/unityitem.h
+++ b/kdeplasma-addons/applets/icontasks/unityitem.h
@@ -34,8 +34,8 @@
 #include <KConfigGroup>
 
 class AbstractTaskItem;
-class QTimer;
-class QAction;
+#include <QTimer>
+#include <QAction>
 class DBusMenuImporter;
 
 class UnityItem : public QObject
diff --git a/kdeplasma-addons/applets/incomingmsg/incomingmsg.h b/kdeplasma-addons/applets/incomingmsg/incomingmsg.h
index 472bbefd..f4f4c27a 100644
--- a/kdeplasma-addons/applets/incomingmsg/incomingmsg.h
+++ b/kdeplasma-addons/applets/incomingmsg/incomingmsg.h
@@ -30,8 +30,8 @@
 
 #include "ui_widget.h"
 
-class QGraphicsLinearLayout;
-class QDBusObjectPath;
+#include <QGraphicsLinearLayout>
+#include <QDBusObjectPath>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/kdeobservatory/src/iviewprovider.h b/kdeplasma-addons/applets/kdeobservatory/src/iviewprovider.h
index db4dbc88..13e989de 100644
--- a/kdeplasma-addons/applets/kdeobservatory/src/iviewprovider.h
+++ b/kdeplasma-addons/applets/kdeobservatory/src/iviewprovider.h
@@ -25,7 +25,7 @@
 
 #include <Plasma/DataEngine>
 
-class QGraphicsWidget;
+#include <QGraphicsWidget>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/kdeobservatory/src/kdeobservatory.h b/kdeplasma-addons/applets/kdeobservatory/src/kdeobservatory.h
index fc8d3ea4..1608d2d0 100644
--- a/kdeplasma-addons/applets/kdeobservatory/src/kdeobservatory.h
+++ b/kdeplasma-addons/applets/kdeobservatory/src/kdeobservatory.h
@@ -26,11 +26,11 @@
 #include <Plasma/PopupApplet>
 #include <Plasma/DataEngine>
 
-class QTimer;
-class QTimeLine;
-class QNetworkReply;
-class QGraphicsLinearLayout;
-class QGraphicsItemAnimation;
+#include <QTimer>
+#include <QTimeLine>
+#include <QNetworkReply>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsItemAnimation>
 
 class IViewProvider;
 class KdeObservatoryConfigViews;
diff --git a/kdeplasma-addons/applets/kimpanel/src/kimpanel.h b/kdeplasma-addons/applets/kimpanel/src/kimpanel.h
index dea70956..e07a3119 100644
--- a/kdeplasma-addons/applets/kimpanel/src/kimpanel.h
+++ b/kdeplasma-addons/applets/kimpanel/src/kimpanel.h
@@ -32,7 +32,7 @@ namespace Plasma
 class IconWidget;
 }
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 class KimpanelInputPanel;
 class KimpanelStatusBarGraphics;
 class Kimpanel : public Plasma::Applet
diff --git a/kdeplasma-addons/applets/kimpanel/src/kimpanelinputpanelgraphics.h b/kdeplasma-addons/applets/kimpanel/src/kimpanelinputpanelgraphics.h
index b511ee80..133aea63 100644
--- a/kdeplasma-addons/applets/kimpanel/src/kimpanelinputpanelgraphics.h
+++ b/kdeplasma-addons/applets/kimpanel/src/kimpanelinputpanelgraphics.h
@@ -33,7 +33,7 @@ namespace Plasma
 class IconWidget;
 }
 
-class QBitmap;
+#include <QBitmap>
 class KimpanelInputPanelGraphics : public QGraphicsWidget
 {
     Q_OBJECT
diff --git a/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.h b/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.h
index 81caeaeb..99a08124 100644
--- a/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.h
+++ b/kdeplasma-addons/applets/kimpanel/src/kimpanelstatusbargraphics.h
@@ -30,7 +30,7 @@
 #include <Plasma/IconWidget>
 #include "icongridlayout.h"
 
-class QSignalMapper;
+#include <QSignalMapper>
 class IconGridLayout;
 
 class DelayedSignalContainer : public QObject
diff --git a/kdeplasma-addons/applets/knowledgebase/knowledgebase.h b/kdeplasma-addons/applets/knowledgebase/knowledgebase.h
index 7ae26058..79388052 100644
--- a/kdeplasma-addons/applets/knowledgebase/knowledgebase.h
+++ b/kdeplasma-addons/applets/knowledgebase/knowledgebase.h
@@ -26,8 +26,8 @@
 
 #include "ui_knowledgeBaseConfig.h"
 
-class QGraphicsLinearLayout;
-class QTimer;
+#include <QGraphicsLinearLayout>
+#include <QTimer>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/kolourpicker/kolourpicker.h b/kdeplasma-addons/applets/kolourpicker/kolourpicker.h
index bde3ff78..98a38948 100644
--- a/kdeplasma-addons/applets/kolourpicker/kolourpicker.h
+++ b/kdeplasma-addons/applets/kolourpicker/kolourpicker.h
@@ -17,8 +17,8 @@
 #include <QString>
 #include <QColor>
 
-class QMenu;
-class QWidget;
+#include <QMenu>
+#include <QWidget>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/leavenote/leavenote.h b/kdeplasma-addons/applets/leavenote/leavenote.h
index 310a06c7..ba947569 100644
--- a/kdeplasma-addons/applets/leavenote/leavenote.h
+++ b/kdeplasma-addons/applets/leavenote/leavenote.h
@@ -28,7 +28,7 @@
 
 #include "ui_widget.h"
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/magnifique/magnifique.h b/kdeplasma-addons/applets/magnifique/magnifique.h
index 3329ee70..d772be86 100644
--- a/kdeplasma-addons/applets/magnifique/magnifique.h
+++ b/kdeplasma-addons/applets/magnifique/magnifique.h
@@ -25,9 +25,9 @@
 #include <Plasma/Applet>
 
 
-class QGraphicsView;
-class QSlider;
-class QWidget;
+#include <QGraphicsView>
+#include <QSlider>
+#include <QWidget>
 
 class Magnifique : public Plasma::Applet
 {
diff --git a/kdeplasma-addons/applets/microblog/microblog.h b/kdeplasma-addons/applets/microblog/microblog.h
index 26aface3..c49c29c7 100644
--- a/kdeplasma-addons/applets/microblog/microblog.h
+++ b/kdeplasma-addons/applets/microblog/microblog.h
@@ -30,8 +30,8 @@
 
 #include "ui_configuration.h"
 
-class QGraphicsLinearLayout;
-class QGraphicsAnchorLayout;
+#include <QGraphicsLinearLayout>
+#include <QGraphicsAnchorLayout>
 class KColorScheme;
 class PostWidget;
 
diff --git a/kdeplasma-addons/applets/news/news.h b/kdeplasma-addons/applets/news/news.h
index 6cea03e4..3ab56da2 100644
--- a/kdeplasma-addons/applets/news/news.h
+++ b/kdeplasma-addons/applets/news/news.h
@@ -26,7 +26,7 @@
 namespace Plasma {
   class WebView;
 }
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class News : public Plasma::PopupApplet
 {
diff --git a/kdeplasma-addons/applets/notes/notes.h b/kdeplasma-addons/applets/notes/notes.h
index fde13cc4..e627f8f4 100644
--- a/kdeplasma-addons/applets/notes/notes.h
+++ b/kdeplasma-addons/applets/notes/notes.h
@@ -31,10 +31,10 @@
 
 #include "ui_config.h"
 
-class QGraphicsLinearLayout;
-class QSizeF;
-class QContextMenuEvent;
-class QParallelAnimationGroup;
+#include <QGraphicsLinearLayout>
+#include <QSizeF>
+#include <QContextMenuEvent>
+#include <QParallelAnimationGroup>
 
 class TopWidget;
 class NotesTextEdit;
diff --git a/kdeplasma-addons/applets/notes/textedit.h b/kdeplasma-addons/applets/notes/textedit.h
index 538ecfc7..5acf0e2a 100644
--- a/kdeplasma-addons/applets/notes/textedit.h
+++ b/kdeplasma-addons/applets/notes/textedit.h
@@ -26,7 +26,7 @@
 
 #include "ui_config.h"
 
-class QContextMenuEvent;
+#include <QContextMenuEvent>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/paste/addmacro.h b/kdeplasma-addons/applets/paste/addmacro.h
index 921cd3cd..c6f3f09a 100644
--- a/kdeplasma-addons/applets/paste/addmacro.h
+++ b/kdeplasma-addons/applets/paste/addmacro.h
@@ -22,7 +22,7 @@
 #include <KDialog>
 
 class KComboBox;
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 class AddMacro : public KDialog
 {
diff --git a/kdeplasma-addons/applets/paste/list.h b/kdeplasma-addons/applets/paste/list.h
index 1805adbc..4ba7ed1c 100644
--- a/kdeplasma-addons/applets/paste/list.h
+++ b/kdeplasma-addons/applets/paste/list.h
@@ -21,9 +21,9 @@
 #include <Plasma/Dialog>
 #include "ui_list.h"
 
-class QStandardItemModel;
+#include <QStandardItemModel>
 class ConfigData;
-class QWidget;
+#include <QWidget>
 
 class ListForm : public QWidget, public Ui::ListForm
 {
diff --git a/kdeplasma-addons/applets/paste/sendkeys.h b/kdeplasma-addons/applets/paste/sendkeys.h
index 7373be59..b2f5c19f 100644
--- a/kdeplasma-addons/applets/paste/sendkeys.h
+++ b/kdeplasma-addons/applets/paste/sendkeys.h
@@ -20,8 +20,8 @@
 
 #include <QtGlobal>
 
-class QString;
-class QKeySequence;
+#include <QString>
+#include <QKeySequence>
 
 class SendKeys
 {
diff --git a/kdeplasma-addons/applets/paste/snippetconfig.h b/kdeplasma-addons/applets/paste/snippetconfig.h
index eabfd6fe..8e008358 100644
--- a/kdeplasma-addons/applets/paste/snippetconfig.h
+++ b/kdeplasma-addons/applets/paste/snippetconfig.h
@@ -22,7 +22,7 @@
 #include <KLocale>
 #include "ui_snippetconfig.h"
 
-class QListWidgetItem;
+#include <QListWidgetItem>
 class ConfigData;
 
 class SnippetConfig : public QWidget, public Ui::SnippetConfig
diff --git a/kdeplasma-addons/applets/pastebin/pastebin.h b/kdeplasma-addons/applets/pastebin/pastebin.h
index 225fd774..1fdcd143 100644
--- a/kdeplasma-addons/applets/pastebin/pastebin.h
+++ b/kdeplasma-addons/applets/pastebin/pastebin.h
@@ -37,9 +37,9 @@
 #include <QPen>
 #include <QtCore/qsharedpointer.h>
 
-class QSignalMapper;
+#include <QSignalMapper>
 class KAction;
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/plasmaboard/Helpers.h b/kdeplasma-addons/applets/plasmaboard/Helpers.h
index 97a0926c..6e68b2d2 100644
--- a/kdeplasma-addons/applets/plasmaboard/Helpers.h
+++ b/kdeplasma-addons/applets/plasmaboard/Helpers.h
@@ -23,8 +23,8 @@
 
 #include <X11/XKBlib.h>
 
-class QChar;
-class QString;
+#include <QChar>
+#include <QString>
 
 namespace Helpers
 {
diff --git a/kdeplasma-addons/applets/plasmaboard/tooltip.h b/kdeplasma-addons/applets/plasmaboard/tooltip.h
index 784c9b89..f4b276e3 100644
--- a/kdeplasma-addons/applets/plasmaboard/tooltip.h
+++ b/kdeplasma-addons/applets/plasmaboard/tooltip.h
@@ -24,9 +24,9 @@
 #include <Plasma/FrameSvg>
 #include <Plasma/WindowEffects>
 
-class QWidget;
-class QLabel;
-class QHBoxLayout;
+#include <QWidget>
+#include <QLabel>
+#include <QHBoxLayout>
 
 class Tooltip : public QWidget
 {
diff --git a/kdeplasma-addons/applets/plasmaboard/widget.h b/kdeplasma-addons/applets/plasmaboard/widget.h
index a27ab8ea..70963662 100644
--- a/kdeplasma-addons/applets/plasmaboard/widget.h
+++ b/kdeplasma-addons/applets/plasmaboard/widget.h
@@ -36,8 +36,8 @@ class AlphaNumKey;
 class BoardKey;
 class DualKey;
 class FuncKey;
-class QSignalMapper;
-class QTimer;
+#include <QSignalMapper>
+#include <QTimer>
 class StickyKey;
 class SwitchKey;
 
diff --git a/kdeplasma-addons/applets/previewer/plasma-previewer.h b/kdeplasma-addons/applets/previewer/plasma-previewer.h
index ad9059f2..6d1dd379 100644
--- a/kdeplasma-addons/applets/previewer/plasma-previewer.h
+++ b/kdeplasma-addons/applets/previewer/plasma-previewer.h
@@ -37,8 +37,8 @@ namespace KParts{
 }
 
 class KMenu;
-class QGraphicsSceneDragDropEvent;
-class QGraphicsWidget;
+#include <QGraphicsSceneDragDropEvent>
+#include <QGraphicsWidget>
 class KUrl;
 class PreviewDialog;
 class PreviewWidget;
diff --git a/kdeplasma-addons/applets/previewer/previewdialog.h b/kdeplasma-addons/applets/previewer/previewdialog.h
index 5ac2da4a..8fad25da 100644
--- a/kdeplasma-addons/applets/previewer/previewdialog.h
+++ b/kdeplasma-addons/applets/previewer/previewdialog.h
@@ -23,8 +23,8 @@
 // Plasma
 #include <plasma/dialog.h>
 
-class QLabel;
-class QPixmap;
+#include <QLabel>
+#include <QPixmap>
 
 class PreviewDialog : public Plasma::Dialog
 {
diff --git a/kdeplasma-addons/applets/previewer/previewwidget.h b/kdeplasma-addons/applets/previewer/previewwidget.h
index 2ad4f852..f5de0b8f 100644
--- a/kdeplasma-addons/applets/previewer/previewwidget.h
+++ b/kdeplasma-addons/applets/previewer/previewwidget.h
@@ -32,15 +32,15 @@ class Svg;
 }
 
 #ifndef QT_KATIE
-class QStyleOptionViewItemV4;
+#include <QStyleOptionViewItemV4>
 #else
-class QStyleOptionViewItem;
+#include <QStyleOptionViewItem>
 #endif
 class KUrl;
-class QGraphicsSceneWheelEvent;
-class QGraphicsSceneResizeEvent;
+#include <QGraphicsSceneWheelEvent>
+#include <QGraphicsSceneResizeEvent>
 class KFileItem;
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 
 class PreviewWidget : public QGraphicsWidget
 {
diff --git a/kdeplasma-addons/applets/qalculate/qalculate_applet.h b/kdeplasma-addons/applets/qalculate/qalculate_applet.h
index 408a6871..778b74e1 100644
--- a/kdeplasma-addons/applets/qalculate/qalculate_applet.h
+++ b/kdeplasma-addons/applets/qalculate/qalculate_applet.h
@@ -47,7 +47,7 @@ class PushButton;
 class OutputLabel;
 
 class QalculateGraphicsWidget;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 class QalculateSettings;
 class QalculateEngine;
 class QalculateHistory;
diff --git a/kdeplasma-addons/applets/qalculate/qalculate_settings.h b/kdeplasma-addons/applets/qalculate/qalculate_settings.h
index 7f5f0c1c..75706b0f 100644
--- a/kdeplasma-addons/applets/qalculate/qalculate_settings.h
+++ b/kdeplasma-addons/applets/qalculate/qalculate_settings.h
@@ -24,9 +24,9 @@
 
 #include "qalculate_applet.h"
 
-class QCheckBox;
+#include <QCheckBox>
 class KComboBox;
-class QSpinBox;
+#include <QSpinBox>
 
 class QalculateSettings : public QObject
 {
diff --git a/kdeplasma-addons/applets/rssnow/news.h b/kdeplasma-addons/applets/rssnow/news.h
index 0f5fe331..b4de6f6d 100644
--- a/kdeplasma-addons/applets/rssnow/news.h
+++ b/kdeplasma-addons/applets/rssnow/news.h
@@ -33,7 +33,7 @@
 
 
 class Scroller;
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class News : public Plasma::Applet
 {
diff --git a/kdeplasma-addons/applets/rssnow/scroller.h b/kdeplasma-addons/applets/rssnow/scroller.h
index 2f8515bd..62f935d6 100644
--- a/kdeplasma-addons/applets/rssnow/scroller.h
+++ b/kdeplasma-addons/applets/rssnow/scroller.h
@@ -33,7 +33,7 @@
 class KIcon;
 class SingleFeedItem;
 class FeedData;
-class QPropertyAnimation;
+#include <QPropertyAnimation>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/rssnow/single-feed.h b/kdeplasma-addons/applets/rssnow/single-feed.h
index c0064f7b..65f5dbaf 100644
--- a/kdeplasma-addons/applets/rssnow/single-feed.h
+++ b/kdeplasma-addons/applets/rssnow/single-feed.h
@@ -25,7 +25,7 @@
 #include <QGraphicsWidget>
 #include <QTextDocument>
 
-class QRect;
+#include <QRect>
 
 namespace Plasma {
     class Svg;
diff --git a/kdeplasma-addons/applets/social-news/activitywidget.h b/kdeplasma-addons/applets/social-news/activitywidget.h
index 264a2eb8..5d6cf033 100644
--- a/kdeplasma-addons/applets/social-news/activitywidget.h
+++ b/kdeplasma-addons/applets/social-news/activitywidget.h
@@ -24,7 +24,7 @@
 #include <Plasma/Frame>
 #include <Plasma/DataEngine>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class ContactImage;
 
diff --git a/kdeplasma-addons/applets/systemloadviewer/systemloadviewer.h b/kdeplasma-addons/applets/systemloadviewer/systemloadviewer.h
index 9bbcf230..b5e0a0fb 100644
--- a/kdeplasma-addons/applets/systemloadviewer/systemloadviewer.h
+++ b/kdeplasma-addons/applets/systemloadviewer/systemloadviewer.h
@@ -30,11 +30,11 @@
 #include "ui_coloursconfig.h"
 #include "ui_generalconfig.h"
 
-class QString;
-class QSizeF;
-class QPainter;
-class QStyleOptionGraphicsItem;
-class QPoint;
+#include <QString>
+#include <QSizeF>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <QPoint>
 
 class SystemLoadViewer : public Plasma::Applet
 {
diff --git a/kdeplasma-addons/applets/timer/customtimeeditor.h b/kdeplasma-addons/applets/timer/customtimeeditor.h
index 4ddeffea..c014d772 100644
--- a/kdeplasma-addons/applets/timer/customtimeeditor.h
+++ b/kdeplasma-addons/applets/timer/customtimeeditor.h
@@ -23,7 +23,7 @@
 #include <keditlistwidget.h>
 #include <QtCore/qdatetime.h>
 
-class QTimeEdit;
+#include <QTimeEdit>
 class KLineEdit;
 /**
 	@author
diff --git a/kdeplasma-addons/applets/timer/timer.h b/kdeplasma-addons/applets/timer/timer.h
index 12dfa96b..4d27a274 100644
--- a/kdeplasma-addons/applets/timer/timer.h
+++ b/kdeplasma-addons/applets/timer/timer.h
@@ -29,9 +29,9 @@
 #include "ui_timerConfig.h"
 #include "timerdigit.h"
 
-class QGraphicsSceneMouseEvent;
-class QActionGroup;
-class QAbstractAnimation;
+#include <QGraphicsSceneMouseEvent>
+#include <QActionGroup>
+#include <QAbstractAnimation>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/timer/timerdigit.h b/kdeplasma-addons/applets/timer/timerdigit.h
index d5bb9edb..fd7938ec 100644
--- a/kdeplasma-addons/applets/timer/timerdigit.h
+++ b/kdeplasma-addons/applets/timer/timerdigit.h
@@ -22,8 +22,8 @@
 
 #include <Plasma/SvgWidget>
 
-class QGraphicsItem;
-class QGraphicsSceneWheelEvent;
+#include <QGraphicsItem>
+#include <QGraphicsSceneWheelEvent>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/applets/webslice/kgraphicswebslice.h b/kdeplasma-addons/applets/webslice/kgraphicswebslice.h
index dfb60e5b..d071f1de 100644
--- a/kdeplasma-addons/applets/webslice/kgraphicswebslice.h
+++ b/kdeplasma-addons/applets/webslice/kgraphicswebslice.h
@@ -23,8 +23,8 @@
 
 #include <qgraphicswebview.h>
 
-class QGraphicsSceneResizeEvent;
-class QUrl;
+#include <QGraphicsSceneResizeEvent>
+#include <QUrl>
 class QWebFrame;
 
 /**
diff --git a/kdeplasma-addons/applets/webslice/kwebslice.h b/kdeplasma-addons/applets/webslice/kwebslice.h
index 3c0e099f..d1253011 100644
--- a/kdeplasma-addons/applets/webslice/kwebslice.h
+++ b/kdeplasma-addons/applets/webslice/kwebslice.h
@@ -23,7 +23,7 @@
 
 #include <qgraphicsview.h>
 
-class QUrl;
+#include <QUrl>
 
 /**
  * @class KWebSlice
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
index 62c557d9..dd3dd31d 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/explorerwindow.h
@@ -24,8 +24,8 @@
 
 #include <Plasma/Plasma>
 
-class QBoxLayout;
-class QGraphicsWidget;
+#include <QBoxLayout>
+#include <QGraphicsWidget>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.h b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.h
index 65a4d4a6..0f8431c5 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupexplorer/groupiconlist.h
@@ -27,7 +27,7 @@
 
 #include <Plasma/Plasma>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupfactory_p.h b/kdeplasma-addons/containments/groupingdesktop/lib/groupfactory_p.h
index 11cc1a03..b57bb575 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groupfactory_p.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupfactory_p.h
@@ -29,7 +29,7 @@
 
 #include "groupinfo.h"
 
-class QGraphicsItem;
+#include <QGraphicsItem>
 class AbstractGroup;
 
 typedef AbstractGroup *(*CreatorFunction)(QGraphicsItem *);
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groupingcontainment_p.h b/kdeplasma-addons/containments/groupingdesktop/lib/groupingcontainment_p.h
index b4a7a54e..d71c1b08 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groupingcontainment_p.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groupingcontainment_p.h
@@ -22,9 +22,9 @@
 
 #include "groupingcontainment.h"
 
-class QGraphicsWidget;
-class QGraphicsLinearLayout;
-class QAction;
+#include <QGraphicsWidget>
+#include <QGraphicsLinearLayout>
+#include <QAction>
 
 class KMenu;
 
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groups/flowgroup.h b/kdeplasma-addons/containments/groupingdesktop/lib/groups/flowgroup.h
index ce4f60f6..185aeaef 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groups/flowgroup.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groups/flowgroup.h
@@ -22,8 +22,8 @@
 
 #include "abstractgroup.h"
 
-class QGraphicsLinearLayout;
-class QGraphicsSceneResizeEvent;
+#include <QGraphicsLinearLayout>
+#include <QGraphicsSceneResizeEvent>
 
 namespace Plasma {
     class ScrollWidget;
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridgroup.h b/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridgroup.h
index 4936a631..c4c01d75 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridgroup.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridgroup.h
@@ -22,7 +22,7 @@
 
 #include "abstractgroup.h"
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 class Spacer;
 class GridManager;
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridmanager.h b/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridmanager.h
index fcfb4667..169317a1 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridmanager.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groups/gridmanager.h
@@ -24,7 +24,7 @@
 
 #include <Plasma/Plasma>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma {
     class ToolButton;
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h b/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
index 65dfc1fb..fa15fcb4 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/groups/tabbinggroup.h
@@ -25,8 +25,8 @@
 
 #include "ui_tabbinggroup_config.h"
 
-class QGraphicsLinearLayout;
-class QGraphicsProxyWidget;
+#include <QGraphicsLinearLayout>
+#include <QGraphicsProxyWidget>
 
 class KConfigDialog;
 
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/handle.h b/kdeplasma-addons/containments/groupingdesktop/lib/handle.h
index 135eae7b..00f74609 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/handle.h
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/handle.h
@@ -27,7 +27,7 @@
 #include <Plasma/Animator>
 #include <Plasma/Svg>
 
-class QGraphicsView;
+#include <QGraphicsView>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/containments/groupingdesktop/panel/groupingpanel.h b/kdeplasma-addons/containments/groupingdesktop/panel/groupingpanel.h
index cba24292..e2afd682 100644
--- a/kdeplasma-addons/containments/groupingdesktop/panel/groupingpanel.h
+++ b/kdeplasma-addons/containments/groupingdesktop/panel/groupingpanel.h
@@ -23,8 +23,8 @@
 
 #include "../lib/groupingcontainment.h"
 
-class QAction;
-class QGraphicsLinearLayout;
+#include <QAction>
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kdeplasma-addons/dataengines/kdecommits/src/kdecommitsengine.h b/kdeplasma-addons/dataengines/kdecommits/src/kdecommitsengine.h
index e5668355..0c5a44fa 100644
--- a/kdeplasma-addons/dataengines/kdecommits/src/kdecommitsengine.h
+++ b/kdeplasma-addons/dataengines/kdecommits/src/kdecommitsengine.h
@@ -23,7 +23,7 @@
 
 #include <Plasma/DataEngine>
 
-class QNetworkReply;
+#include <QNetworkReply>
 class CommitCollector;
 
 class KdeCommitsEngine : public Plasma::DataEngine
diff --git a/kdeplasma-addons/dataengines/kimpanel/kimpanelagent.h b/kdeplasma-addons/dataengines/kimpanel/kimpanelagent.h
index 0fe6e574..83d6b442 100644
--- a/kdeplasma-addons/dataengines/kimpanel/kimpanelagent.h
+++ b/kdeplasma-addons/dataengines/kimpanel/kimpanelagent.h
@@ -27,7 +27,7 @@
 #include <QStringList>
 #include <QDBusContext>
 
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 class Impanel2Adaptor;
 class ImpanelAdaptor;
 
diff --git a/kdeplasma-addons/dataengines/microblog/timelinesource.h b/kdeplasma-addons/dataengines/microblog/timelinesource.h
index 83a1b16e..af1a5db7 100644
--- a/kdeplasma-addons/dataengines/microblog/timelinesource.h
+++ b/kdeplasma-addons/dataengines/microblog/timelinesource.h
@@ -31,7 +31,7 @@
 #include <Plasma/ServiceJob>
 
 // forward declarations
-//class QXmlStreamReader;
+//#include <QXmlStreamReader>
 
 class KJob;
 
diff --git a/kdeplasma-addons/dataengines/microblog/tweetjob.h b/kdeplasma-addons/dataengines/microblog/tweetjob.h
index 2d6f239e..6f088207 100644
--- a/kdeplasma-addons/dataengines/microblog/tweetjob.h
+++ b/kdeplasma-addons/dataengines/microblog/tweetjob.h
@@ -30,7 +30,7 @@
 #include <Plasma/ServiceJob>
 
 // forward declarations
-//class QXmlStreamReader;
+//#include <QXmlStreamReader>
 
 class KJob;
 
diff --git a/kdeplasma-addons/dataengines/potd/potd.h b/kdeplasma-addons/dataengines/potd/potd.h
index 3ff774c7..7c9218d7 100644
--- a/kdeplasma-addons/dataengines/potd/potd.h
+++ b/kdeplasma-addons/dataengines/potd/potd.h
@@ -24,7 +24,7 @@
 
 class PotdProvider;
 
-class QTimer;
+#include <QTimer>
 
 /**
  * This class provides the Pictures of The Day from various online websites.
diff --git a/kdeplasma-addons/dataengines/potd/potdprovider.h b/kdeplasma-addons/dataengines/potd/potdprovider.h
index 56a258d1..4ae947c3 100644
--- a/kdeplasma-addons/dataengines/potd/potdprovider.h
+++ b/kdeplasma-addons/dataengines/potd/potdprovider.h
@@ -27,7 +27,7 @@
 
 #include "plasma_potd_export.h"
 
-class QImage;
+#include <QImage>
 
 #define POTDPROVIDER_EXPORT_PLUGIN( classname, componentName, catalogName ) \
     K_PLUGIN_FACTORY( classname ## Factory, registerPlugin< classname >(); ) \
diff --git a/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h b/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
index 387cd8a2..fef76e73 100644
--- a/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
+++ b/kdeplasma-addons/libs/lancelot/widgets/kineticscroll_p.h
@@ -19,10 +19,10 @@
 #ifndef PLASMA_KINETICSCROLLING_H
 #define PLASMA_KINETICSCROLLING_H
 
-class QGraphicsSceneMouseEvent;
-class QGraphicsWidget;
-class QGraphicsSceneWheelEvent;
-class QKeyEvent;
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsWidget>
+#include <QGraphicsSceneWheelEvent>
+#include <QKeyEvent>
 #include <QObject>
 #include <QtCore/qpoint.h>
 #include <QtCore/QAbstractAnimation>
diff --git a/kdeplasma-addons/libs/rtm/request.h b/kdeplasma-addons/libs/rtm/request.h
index 6824ae76..77b7bcd0 100644
--- a/kdeplasma-addons/libs/rtm/request.h
+++ b/kdeplasma-addons/libs/rtm/request.h
@@ -24,7 +24,7 @@
 
 #include "rtm.h"
 
-class QNetworkReply;
+#include <QNetworkReply>
 
 namespace RTM {
 
diff --git a/kdeplasma-addons/runners/audioplayercontrol/audioplayercontrolrunner.h b/kdeplasma-addons/runners/audioplayercontrol/audioplayercontrolrunner.h
index a9ecc667..77acf535 100644
--- a/kdeplasma-addons/runners/audioplayercontrol/audioplayercontrolrunner.h
+++ b/kdeplasma-addons/runners/audioplayercontrol/audioplayercontrolrunner.h
@@ -25,7 +25,7 @@
 #include <KIcon>
 #include <KUrl>
 
-class QDBusPendingCallWatcher;
+#include <QDBusPendingCallWatcher>
 
 class AudioPlayerControlRunner : public Plasma::AbstractRunner
 {
diff --git a/kdeplasma-addons/runners/dictionary/dictionaryrunner_config.h b/kdeplasma-addons/runners/dictionary/dictionaryrunner_config.h
index 23f186ae..680934e7 100644
--- a/kdeplasma-addons/runners/dictionary/dictionaryrunner_config.h
+++ b/kdeplasma-addons/runners/dictionary/dictionaryrunner_config.h
@@ -7,7 +7,7 @@
 
 
 #include <KCModule>
-class QLineEdit;
+#include <QLineEdit>
 
 static const char CONFIG_TRIGGERWORD[] = "triggerWord";
 
diff --git a/kdeplasma-addons/runners/mediawiki/mediawiki.h b/kdeplasma-addons/runners/mediawiki/mediawiki.h
index e74568dd..eb13b3e2 100644
--- a/kdeplasma-addons/runners/mediawiki/mediawiki.h
+++ b/kdeplasma-addons/runners/mediawiki/mediawiki.h
@@ -25,7 +25,7 @@
 #include <QList>
 #include <QUrl>
 
-class QNetworkReply;
+#include <QNetworkReply>
 
 /**
  * Searches MediaWiki based wikis like wikipedia and techbase.
diff --git a/kdeplasma-addons/runners/mediawiki/mediawikirunner.h b/kdeplasma-addons/runners/mediawiki/mediawikirunner.h
index 7a10bd8d..966f4c7a 100644
--- a/kdeplasma-addons/runners/mediawiki/mediawikirunner.h
+++ b/kdeplasma-addons/runners/mediawiki/mediawikirunner.h
@@ -27,7 +27,7 @@ class KIcon;
 #include <KIcon>
 #include <QWaitCondition>
 
-class QWaitCondition;
+#include <QWaitCondition>
 
 #include "mediawiki.h"
 
diff --git a/kdeplasma-addons/runners/translator/translatorjob.h b/kdeplasma-addons/runners/translator/translatorjob.h
index 73fdf6a9..6f0e978a 100644
--- a/kdeplasma-addons/runners/translator/translatorjob.h
+++ b/kdeplasma-addons/runners/translator/translatorjob.h
@@ -21,8 +21,8 @@
 
 #include <QtNetwork/QNetworkReply>
 
-class QNetworkReply;
-class QNetworkAccessManager;
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
 
 class TranslatorJob :  public QObject
 {
diff --git a/kdeplasma-addons/runners/youtube/tubejob.h b/kdeplasma-addons/runners/youtube/tubejob.h
index 4d75f878..d0055cb2 100644
--- a/kdeplasma-addons/runners/youtube/tubejob.h
+++ b/kdeplasma-addons/runners/youtube/tubejob.h
@@ -24,8 +24,8 @@
 
 #include <KUrl>
 
-class QNetworkReply;
-class QNetworkAccessManager;
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
 
 class TubeJob : public QObject
 {
diff --git a/kdeplasma-addons/runners/youtube/youtube.h b/kdeplasma-addons/runners/youtube/youtube.h
index f9d9c8a9..ffe1a226 100644
--- a/kdeplasma-addons/runners/youtube/youtube.h
+++ b/kdeplasma-addons/runners/youtube/youtube.h
@@ -27,8 +27,8 @@
 
 #include <KUrl>
 
-class QNetworkAccessManager;
-class QNetworkReply;
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 
 class YouTube : public Plasma::AbstractRunner {
     Q_OBJECT
diff --git a/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.h b/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.h
index 02e9e95f..12ba1109 100644
--- a/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.h
+++ b/kdeplasma-addons/wallpapers/pattern/backgroundlistmodel.h
@@ -21,7 +21,7 @@
 
 #include <Plasma/Wallpaper>
 
-class QEventLoop;
+#include <QEventLoop>
 class KProgressDialog;
 
 namespace Plasma
diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h
index 3f568be5..b7a4d71c 100644
--- a/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h
+++ b/kdeplasma-addons/wallpapers/qmlwallpapers/wallpapersqml.h
@@ -23,8 +23,8 @@
 #include <plasma/wallpaper.h>
 #include <QtDeclarative/QDeclarativeComponent>
 
-class QModelIndex;
-class QDeclarativeItem;
+#include <QModelIndex>
+#include <QDeclarativeItem>
 
 class WallpaperQml : public Plasma::Wallpaper
 {
diff --git a/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.h b/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.h
index 895efa06..26e55121 100644
--- a/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.h
+++ b/kdeplasma-addons/wallpapers/virus/backgroundlistmodel.h
@@ -20,7 +20,7 @@
 
 #include <Plasma/Wallpaper>
 
-class QEventLoop;
+#include <QEventLoop>
 class KProgressDialog;
 
 namespace Plasma
diff --git a/kdeplasma-addons/wallpapers/weather/weatherwallpaper.h b/kdeplasma-addons/wallpapers/weather/weatherwallpaper.h
index f85d7bc8..19b51424 100644
--- a/kdeplasma-addons/wallpapers/weather/weatherwallpaper.h
+++ b/kdeplasma-addons/wallpapers/weather/weatherwallpaper.h
@@ -30,8 +30,8 @@
 
 #include "ui_weatherAdvanced.h"
 
-class QPropertyAnimation;
-class QStandardItemModel;
+#include <QPropertyAnimation>
+#include <QStandardItemModel>
 
 class KFileDialog;
 
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 25e6223d..23cc3afe 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -29,14 +29,14 @@
 
 #include <kconfig.h>
 
-class QCheckBox;
-class QLineEdit;
-class QLabel;
-class QRadioButton;
-class QComboBox;
-class QGroupBox;
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QLabel>
+#include <QRadioButton>
+#include <QComboBox>
+#include <QGroupBox>
 
-class QProgressBar;
+#include <QProgressBar>
 class KPushButton;
 class KHelpMenu;
 class KFAction;
diff --git a/kget/conf/preferencesdialog.h b/kget/conf/preferencesdialog.h
index aaa3054c..48c34bcf 100644
--- a/kget/conf/preferencesdialog.h
+++ b/kget/conf/preferencesdialog.h
@@ -14,7 +14,7 @@
 
 #include <kconfigdialog.h>
 
-class QWidget;
+#include <QWidget>
 class KConfigSkeleton;
 class KTabWidget;
 
diff --git a/kget/core/basedialog.h b/kget/core/basedialog.h
index b7ae962c..8157ccc4 100644
--- a/kget/core/basedialog.h
+++ b/kget/core/basedialog.h
@@ -23,7 +23,7 @@
 #include "../kget_export.h"
 #include <KDialog>
 
-class QCheckBox;
+#include <QCheckBox>
 
 /**
  * Subclass to make sure that the size of the dialog is
diff --git a/kget/core/datasourcefactory.h b/kget/core/datasourcefactory.h
index 3268440e..cb934d6b 100644
--- a/kget/core/datasourcefactory.h
+++ b/kget/core/datasourcefactory.h
@@ -23,7 +23,7 @@
 class BitSet;
 class KioDownload;
 class TransferDataSource;
-class QTimer;
+#include <QTimer>
 class Signature;
 class Verifier;
 
diff --git a/kget/core/filedeleter.h b/kget/core/filedeleter.h
index 4bf24e82..b5af2fcf 100644
--- a/kget/core/filedeleter.h
+++ b/kget/core/filedeleter.h
@@ -24,7 +24,7 @@
 
 class KJob;
 class KUrl;
-class QObject;
+#include <QObject>
 
 /**
  * The FileDeleter is a wrapper around KIO ensuring that always
diff --git a/kget/core/job.h b/kget/core/job.h
index 2c67b14a..f45766e4 100644
--- a/kget/core/job.h
+++ b/kget/core/job.h
@@ -27,7 +27,7 @@
 
 #include <QPixmap>
 
-class QDomNode;
+#include <QDomNode>
 
 class Scheduler;
 class JobQueue;
diff --git a/kget/core/kget.h b/kget/core/kget.h
index 21833c4a..64224541 100644
--- a/kget/core/kget.h
+++ b/kget/core/kget.h
@@ -33,8 +33,8 @@
 #include "transfer.h"
 #include "transfergrouphandler.h"
 
-class QDomElement;
-class QAbstractItemView;
+#include <QDomElement>
+#include <QAbstractItemView>
 
 class KComboBox;
 
diff --git a/kget/core/signature.h b/kget/core/signature.h
index 0f093548..1a45565e 100644
--- a/kget/core/signature.h
+++ b/kget/core/signature.h
@@ -24,7 +24,7 @@
 
 #include <KUrl>
 
-class QDomElement;
+#include <QDomElement>
 
 #ifdef HAVE_QGPGME
 #include <gpgme++/verificationresult.h>
diff --git a/kget/core/transfer.h b/kget/core/transfer.h
index 27a9e83f..c2471584 100644
--- a/kget/core/transfer.h
+++ b/kget/core/transfer.h
@@ -21,7 +21,7 @@
 #include <kurl.h>
 #include <kio/global.h>
 
-class QDomElement;
+#include <QDomElement>
 
 class Signature;
 class TransferHandler;
diff --git a/kget/core/transfergroup.h b/kget/core/transfergroup.h
index 3b6fa2ec..e22232cd 100644
--- a/kget/core/transfergroup.h
+++ b/kget/core/transfergroup.h
@@ -23,7 +23,7 @@
 #include "transfer.h"
 
 
-class QDomElement;
+#include <QDomElement>
 
 class TransferGroupHandler;
 class TransferTreeModel;
diff --git a/kget/core/transfergrouphandler.h b/kget/core/transfergrouphandler.h
index aa61cb1b..57f07121 100644
--- a/kget/core/transfergrouphandler.h
+++ b/kget/core/transfergrouphandler.h
@@ -19,7 +19,7 @@
 #include "../kget_export.h"
 #include "kget.h"
 
-class QAction;
+#include <QAction>
 
 class QObjectInterface;
 class TransferGroupObserver;
diff --git a/kget/core/transferhandler.h b/kget/core/transferhandler.h
index 573b959a..83e044b0 100644
--- a/kget/core/transferhandler.h
+++ b/kget/core/transferhandler.h
@@ -19,7 +19,7 @@
 #include "transfergroup.h"
 #include "../kget_export.h"
 
-class QAction;
+#include <QAction>
 class KPassivePopup;
 
 class KGetKJobAdapter;
diff --git a/kget/core/urlchecker_p.h b/kget/core/urlchecker_p.h
index 9da95cc1..72bde7e5 100644
--- a/kget/core/urlchecker_p.h
+++ b/kget/core/urlchecker_p.h
@@ -22,7 +22,7 @@
 
 #include <KDialog>
 
-class QCheckBox;
+#include <QCheckBox>
 
 /**
  * Asks if existing transfers should be overwritten
diff --git a/kget/core/verifier.h b/kget/core/verifier.h
index cec69e20..153bd95a 100644
--- a/kget/core/verifier.h
+++ b/kget/core/verifier.h
@@ -29,8 +29,8 @@
 
 #include "../kget_export.h"
 
-class QDomElement;
-class QFile;
+#include <QDomElement>
+#include <QFile>
 class TransferHandler;
 class VerificationModel;
 class VerifierPrivate;
diff --git a/kget/extensions/webinterface/httpserver.h b/kget/extensions/webinterface/httpserver.h
index 28b306e2..dd294e0b 100644
--- a/kget/extensions/webinterface/httpserver.h
+++ b/kget/extensions/webinterface/httpserver.h
@@ -13,7 +13,7 @@
 
 #include <QWidget>
 
-class QTcpServer;
+#include <QTcpServer>
 
 namespace KWallet {
     class Wallet;
diff --git a/kget/plasma/applet/barapplet/kgetbarapplet.h b/kget/plasma/applet/barapplet/kgetbarapplet.h
index 90538d1f..8a84694e 100644
--- a/kget/plasma/applet/barapplet/kgetbarapplet.h
+++ b/kget/plasma/applet/barapplet/kgetbarapplet.h
@@ -27,8 +27,8 @@ namespace Plasma {
     class Svg;
 }
 
-class QGraphicsProxyWidget;
-class QGraphicsLinearLayout;
+#include <QGraphicsProxyWidget>
+#include <QGraphicsLinearLayout>
 
 class KGetBarApplet : public KGetApplet
 {
diff --git a/kget/plasma/applet/barapplet/kgetbarapplet_p.h b/kget/plasma/applet/barapplet/kgetbarapplet_p.h
index 351f7eb8..93e873f9 100644
--- a/kget/plasma/applet/barapplet/kgetbarapplet_p.h
+++ b/kget/plasma/applet/barapplet/kgetbarapplet_p.h
@@ -29,8 +29,8 @@ namespace Plasma
     class ScrollWidget;
 }
 
-class QGraphicsProxyWidget;
-class QProgressBar;
+#include <QGraphicsProxyWidget>
+#include <QProgressBar>
 
 class KGetBarApplet::Private : public QGraphicsWidget
 {
diff --git a/kget/plasma/applet/common/kgetapplet.h b/kget/plasma/applet/common/kgetapplet.h
index 999af5d2..692a2519 100644
--- a/kget/plasma/applet/common/kgetapplet.h
+++ b/kget/plasma/applet/common/kgetapplet.h
@@ -26,9 +26,9 @@
 
 #include <KIO/Job>
 
-class QEvent;
-class QDropEvent;
-class QGraphicsLinearLayout;
+#include <QEvent>
+#include <QDropEvent>
+#include <QGraphicsLinearLayout>
 class ErrorWidget;
 
 namespace Plasma
diff --git a/kget/plasma/applet/common/kgetappletutils.h b/kget/plasma/applet/common/kgetappletutils.h
index d19f9623..2bdec70d 100644
--- a/kget/plasma/applet/common/kgetappletutils.h
+++ b/kget/plasma/applet/common/kgetappletutils.h
@@ -24,11 +24,11 @@
 
 #include <QGraphicsProxyWidget>
 
-class QDBusConnectionInterface;
-class QGraphicsLinearLayout;
-class QGraphicsWidget;
-class QPainter;
-class QRect;
+#include <QDBusConnectionInterface>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsWidget>
+#include <QPainter>
+#include <QRect>
 
 namespace Plasma {
     class Svg;
diff --git a/kget/plasma/applet/panelbar/kgetpanelbar.h b/kget/plasma/applet/panelbar/kgetpanelbar.h
index 6736cea5..bcf52d15 100644
--- a/kget/plasma/applet/panelbar/kgetpanelbar.h
+++ b/kget/plasma/applet/panelbar/kgetpanelbar.h
@@ -23,9 +23,9 @@
 #include "common/kgetapplet.h"
 #include <plasma/dataengine.h>
 
-class QGraphicsProxyWidget;
-class QGraphicsLinearLayout;
-class QProgressBar;
+#include <QGraphicsProxyWidget>
+#include <QGraphicsLinearLayout>
+#include <QProgressBar>
 
 namespace Plasma {
     class Dialog;
diff --git a/kget/plasma/applet/panelbar/kgetpanelbar_p.h b/kget/plasma/applet/panelbar/kgetpanelbar_p.h
index c04463ea..442acc1c 100644
--- a/kget/plasma/applet/panelbar/kgetpanelbar_p.h
+++ b/kget/plasma/applet/panelbar/kgetpanelbar_p.h
@@ -25,8 +25,8 @@
 #include <QMap>
 #include "transfer_interface.h"
 
-class QProgressBar;
-class QGridLayout;
+#include <QProgressBar>
+#include <QGridLayout>
 
 class KGetPanelBar::Private : public Plasma::Dialog
 {
diff --git a/kget/plasma/applet/piechart/kgetpiechart.h b/kget/plasma/applet/piechart/kgetpiechart.h
index 222181db..096a00e7 100644
--- a/kget/plasma/applet/piechart/kgetpiechart.h
+++ b/kget/plasma/applet/piechart/kgetpiechart.h
@@ -23,8 +23,8 @@
 #include "common/kgetapplet.h"
 #include <plasma/dataengine.h>
 
-class QGraphicsLinearLayout;
-class QGraphicsWidget;
+#include <QGraphicsLinearLayout>
+#include <QGraphicsWidget>
 
 namespace Plasma {
     class Svg;
diff --git a/kget/plasma/applet/piechart/kgetpiechart_p.h b/kget/plasma/applet/piechart/kgetpiechart_p.h
index 48b29b50..ba847786 100644
--- a/kget/plasma/applet/piechart/kgetpiechart_p.h
+++ b/kget/plasma/applet/piechart/kgetpiechart_p.h
@@ -28,7 +28,7 @@
 #include <KColorCollection>
 #include <KIO/Job>
 
-class QGraphicsLinearLayout;
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/kget/plasma/runner/kgetrunner.h b/kget/plasma/runner/kgetrunner.h
index b407a4aa..da5103b6 100644
--- a/kget/plasma/runner/kgetrunner.h
+++ b/kget/plasma/runner/kgetrunner.h
@@ -19,8 +19,8 @@
 #include <Plasma/AbstractRunner>
 #include <KIcon>
 
-class QDBusConnectionInterface;
-class QDBusPendingCallWatcher;
+#include <QDBusConnectionInterface>
+#include <QDBusPendingCallWatcher>
 
 
 class KGetRunner
diff --git a/kget/transfer-plugins/bittorrent/advanceddetails/fileview.h b/kget/transfer-plugins/bittorrent/advanceddetails/fileview.h
index 0953193f..c553634d 100644
--- a/kget/transfer-plugins/bittorrent/advanceddetails/fileview.h
+++ b/kget/transfer-plugins/bittorrent/advanceddetails/fileview.h
@@ -25,7 +25,7 @@
 #include <ksharedconfig.h>
 
 class KMenu;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 namespace bt
 {
diff --git a/kget/transfer-plugins/bittorrent/advanceddetails/torrentfilemodel.h b/kget/transfer-plugins/bittorrent/advanceddetails/torrentfilemodel.h
index 0d92e2fa..00921b35 100644
--- a/kget/transfer-plugins/bittorrent/advanceddetails/torrentfilemodel.h
+++ b/kget/transfer-plugins/bittorrent/advanceddetails/torrentfilemodel.h
@@ -25,8 +25,8 @@
 #include <QAbstractItemModel>
 #include <util/constants.h>
 
-class QTreeView;
-class QSortFilterProxyModel;
+#include <QTreeView>
+#include <QSortFilterProxyModel>
 
 namespace bt
 {
diff --git a/kget/transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.h b/kget/transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.h
index f7121939..9d49bc7f 100644
--- a/kget/transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.h
+++ b/kget/transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.h
@@ -24,7 +24,7 @@
 #include "torrentfilemodel.h"
 #include <util/bitset.h>
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 namespace bt
 {
diff --git a/kget/transfer-plugins/bittorrent/btcache.h b/kget/transfer-plugins/bittorrent/btcache.h
index 296ce853..dd28e565 100644
--- a/kget/transfer-plugins/bittorrent/btcache.h
+++ b/kget/transfer-plugins/bittorrent/btcache.h
@@ -17,7 +17,7 @@
 #include <QString>
 #include <QByteArray>
 
-class QStringList;
+#include <QStringList>
 class KJob;
 
 namespace bt
diff --git a/kget/transfer-plugins/bittorrent/btdetailswidget.h b/kget/transfer-plugins/bittorrent/btdetailswidget.h
index 916ac1c2..f44bfabd 100644
--- a/kget/transfer-plugins/bittorrent/btdetailswidget.h
+++ b/kget/transfer-plugins/bittorrent/btdetailswidget.h
@@ -19,8 +19,8 @@
 
 class BTTransferHandler;
 
-class QShowEvent;
-class QHideEvent;
+#include <QShowEvent>
+#include <QHideEvent>
 
 class BTDetailsWidget : public QWidget, public Ui::BTDetailsWidgetFrm
 {
diff --git a/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h b/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h
index 438ee5d2..be3608a4 100644
--- a/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h
+++ b/kget/transfer-plugins/checksumsearch/dlgchecksumsearch.h
@@ -30,9 +30,9 @@
 #include <KCModule>
 #include <KDialog>
 
-class QSortFilterProxyModel;
-class QStandardItemModel;
-class QStringListModel;
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+#include <QStringListModel>
 
 class ChecksumSearchAddDlg : public KDialog
 {
diff --git a/kget/ui/contextmenu.h b/kget/ui/contextmenu.h
index 791057d5..c8e8045b 100644
--- a/kget/ui/contextmenu.h
+++ b/kget/ui/contextmenu.h
@@ -17,7 +17,7 @@
 class TransferHandler;
 class TransferGroupHandler;
 class KMenu;
-class QWidget;
+#include <QWidget>
 
 namespace ContextMenu
 {
diff --git a/kget/ui/droptarget.h b/kget/ui/droptarget.h
index 0a97baea..e1d35c80 100644
--- a/kget/ui/droptarget.h
+++ b/kget/ui/droptarget.h
@@ -20,8 +20,8 @@
 
 #include "core/transfer.h"
 
-class QAction;
-class QTimer;
+#include <QAction>
+#include <QTimer>
 class KMenu;
 
 class MainWindow;
diff --git a/kget/ui/history/rangetreewidget.h b/kget/ui/history/rangetreewidget.h
index 4647c2e9..bcc82488 100644
--- a/kget/ui/history/rangetreewidget.h
+++ b/kget/ui/history/rangetreewidget.h
@@ -16,10 +16,10 @@
 #include <QSortFilterProxyModel>
 #include <QTreeView>
 
-class QStandardItem;
-class QStandardItemModel;
-class QSortFilterProxyModel;
-class QVariant;
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#include <QVariant>
 class RangeDelegate;
 
 /**
diff --git a/kget/ui/history/transferhistory.h b/kget/ui/history/transferhistory.h
index c1fade9d..e278828f 100644
--- a/kget/ui/history/transferhistory.h
+++ b/kget/ui/history/transferhistory.h
@@ -16,9 +16,9 @@
 
 #include "ui_transferhistory.h"
 
-class QFileSystemWatcher;
-class QModelIndex;
-class QProgressBar;
+#include <QFileSystemWatcher>
+#include <QModelIndex>
+#include <QProgressBar>
 class KLineEdit;
 class KPushButton;
 class TransferHistoryStore;
diff --git a/kget/ui/history/transferhistorycategorizeddelegate.h b/kget/ui/history/transferhistorycategorizeddelegate.h
index 436b41cc..2d52d908 100644
--- a/kget/ui/history/transferhistorycategorizeddelegate.h
+++ b/kget/ui/history/transferhistorycategorizeddelegate.h
@@ -13,7 +13,7 @@
 
 #include <QObject>
 
-class QStandardItem;
+#include <QStandardItem>
 
 class TransferHistoryCategorizedDelegate : public QObject
 {
diff --git a/kget/ui/history/transferhistorycategorizedview.h b/kget/ui/history/transferhistorycategorizedview.h
index 8d3aba1d..7370065b 100644
--- a/kget/ui/history/transferhistorycategorizedview.h
+++ b/kget/ui/history/transferhistorycategorizedview.h
@@ -16,8 +16,8 @@
 #include <QWidget>
 #include <QtCore/qabstractitemmodel.h>
 
-class QDate;
-class QStandardItemModel;
+#include <QDate>
+#include <QStandardItemModel>
 class KCategorizedView;
 class KCategoryDrawer;
 class KCategorizedSortFilterProxyModel;
diff --git a/kget/ui/history/transferhistoryitemdelegate.h b/kget/ui/history/transferhistoryitemdelegate.h
index a3ca0acf..74ffd2af 100644
--- a/kget/ui/history/transferhistoryitemdelegate.h
+++ b/kget/ui/history/transferhistoryitemdelegate.h
@@ -17,8 +17,8 @@
 #define ICON_SIZE 40
 #define PADDING 5
 
-class QAction;
-class QModelIndex;
+#include <QAction>
+#include <QModelIndex>
 
 class TransferHistoryItemDelegate : public QStyledItemDelegate
 {
diff --git a/kget/ui/linkview/kget_linkview.h b/kget/ui/linkview/kget_linkview.h
index e8767bd7..cf63a9dc 100644
--- a/kget/ui/linkview/kget_linkview.h
+++ b/kget/ui/linkview/kget_linkview.h
@@ -16,8 +16,8 @@
 
 #include "ui_importlinkdialog.h"
 
-class QAction;
-class QModelIndex;
+#include <QAction>
+#include <QModelIndex>
 class LinkImporter;
 class KGetSortFilterProxyModel;
 
diff --git a/kget/ui/metalinkcreator/dragdlg.h b/kget/ui/metalinkcreator/dragdlg.h
index 2f01dfe6..4461fe08 100644
--- a/kget/ui/metalinkcreator/dragdlg.h
+++ b/kget/ui/metalinkcreator/dragdlg.h
@@ -24,8 +24,8 @@
 #include "ui_dragdlg.h"
 #include "ui_commondata.h"
 
-class QCheckBox;
-class QSortFilterProxyModel;
+#include <QCheckBox>
+#include <QSortFilterProxyModel>
 class UrlWidget;
 
 namespace KGetMetalink
diff --git a/kget/ui/metalinkcreator/filedlg.h b/kget/ui/metalinkcreator/filedlg.h
index 9fa6a818..ef521315 100644
--- a/kget/ui/metalinkcreator/filedlg.h
+++ b/kget/ui/metalinkcreator/filedlg.h
@@ -30,7 +30,7 @@ namespace KGetMetalink
     class File;
 }
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class VerificationModel;
 class UrlWidget;
 
diff --git a/kget/ui/metalinkcreator/metalinkcreator.h b/kget/ui/metalinkcreator/metalinkcreator.h
index bcbc6e44..dc948ad8 100644
--- a/kget/ui/metalinkcreator/metalinkcreator.h
+++ b/kget/ui/metalinkcreator/metalinkcreator.h
@@ -36,10 +36,10 @@ namespace KGetMetalink
 class CountryModel;
 class GeneralWidget;
 class LanguageModel;
-class QDragEnterEvent;
-class QShowEvent;
-class QSortFilterProxyModel;
-class QStandardItemModel;
+#include <QDragEnterEvent>
+#include <QShowEvent>
+#include <QSortFilterProxyModel>
+#include <QStandardItemModel>
 
 class FileWidget : public QWidget
 {
diff --git a/kget/ui/metalinkcreator/urlwidget.h b/kget/ui/metalinkcreator/urlwidget.h
index 7fdb6601..1006edfe 100644
--- a/kget/ui/metalinkcreator/urlwidget.h
+++ b/kget/ui/metalinkcreator/urlwidget.h
@@ -31,7 +31,7 @@ namespace KGetMetalink
 
 class MirrorModel;
 class MirrorProxyModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 class UrlWidget : public QObject
 {
diff --git a/kget/ui/mirror/mirrormodel.h b/kget/ui/mirror/mirrormodel.h
index 5f2e9300..74d47716 100644
--- a/kget/ui/mirror/mirrormodel.h
+++ b/kget/ui/mirror/mirrormodel.h
@@ -26,7 +26,7 @@
 #include <KIcon>
 #include <KUrl>
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 class MirrorDelegate : public QStyledItemDelegate
 {
diff --git a/kget/ui/mirror/mirrorsettings.h b/kget/ui/mirror/mirrorsettings.h
index 6f9ff81e..141fd47b 100644
--- a/kget/ui/mirror/mirrorsettings.h
+++ b/kget/ui/mirror/mirrorsettings.h
@@ -26,7 +26,7 @@
 #include "ui_mirrorsettings.h"
 #include "ui_mirroradddlg.h"
 
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class TransferHandler;
 
 class MirrorAddDlg : public KDialog
diff --git a/kget/ui/transferdetails.h b/kget/ui/transferdetails.h
index 48483a0d..f6942f8e 100644
--- a/kget/ui/transferdetails.h
+++ b/kget/ui/transferdetails.h
@@ -17,9 +17,9 @@
 #include "core/plugin/transferfactory.h"
 #include "ui_transferdetailsfrm.h"
 
-class QLabel;
-class QProgressBar;
-class QVBoxLayout;
+#include <QLabel>
+#include <QProgressBar>
+#include <QVBoxLayout>
 
 class TransferDetails : public QWidget
 {
diff --git a/kget/ui/transfersettingsdialog.h b/kget/ui/transfersettingsdialog.h
index 95661461..838fa77c 100644
--- a/kget/ui/transfersettingsdialog.h
+++ b/kget/ui/transfersettingsdialog.h
@@ -16,7 +16,7 @@
 #include "../core/basedialog.h"
 
 class FileModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class RenameFile;
 class TransferHandler;
 
diff --git a/kget/ui/transfersviewdelegate.h b/kget/ui/transfersviewdelegate.h
index 22383c4e..66bb0653 100644
--- a/kget/ui/transfersviewdelegate.h
+++ b/kget/ui/transfersviewdelegate.h
@@ -18,8 +18,8 @@
 #include <QToolButton>
 #include <QtCore/qabstractitemmodel.h>
 
-class QHBoxLayout;
-class QButtonGroup;
+#include <QHBoxLayout>
+#include <QButtonGroup>
 
 class TransferHandler;
 class TransferObserver;
diff --git a/kget/ui/verificationdialog.h b/kget/ui/verificationdialog.h
index 984d3fd0..483c3ba0 100644
--- a/kget/ui/verificationdialog.h
+++ b/kget/ui/verificationdialog.h
@@ -26,7 +26,7 @@
 #include "../core/basedialog.h"
 
 class FileModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 class TransferHandler;
 class Verifier;
 class VerificationModel;
diff --git a/kgpg/caff.h b/kgpg/caff.h
index 6ff1a5fa..1964b378 100644
--- a/kgpg/caff.h
+++ b/kgpg/caff.h
@@ -18,7 +18,7 @@
 
 #include <QObject>
 
-class QStringList;
+#include <QStringList>
 
 class KGpgCaffPrivate;
 
diff --git a/kgpg/core/KGpgGroupNode.h b/kgpg/core/KGpgGroupNode.h
index 5aca837e..5ebf101c 100644
--- a/kgpg/core/KGpgGroupNode.h
+++ b/kgpg/core/KGpgGroupNode.h
@@ -22,8 +22,8 @@
 #include "KGpgExpandableNode.h"
 #include "KGpgKeyNode.h"
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 class KGpgGroupNodePrivate;
 
diff --git a/kgpg/core/KGpgRootNode.h b/kgpg/core/KGpgRootNode.h
index 97c597cb..c9580b92 100644
--- a/kgpg/core/KGpgRootNode.h
+++ b/kgpg/core/KGpgRootNode.h
@@ -23,8 +23,8 @@
 #include "KGpgKeyNode.h"
 
 class KGpgGroupNode;
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 /**
  * @brief The parent of all key data objects
diff --git a/kgpg/core/KGpgUatNode.h b/kgpg/core/KGpgUatNode.h
index b4c67756..b4c4c213 100644
--- a/kgpg/core/KGpgUatNode.h
+++ b/kgpg/core/KGpgUatNode.h
@@ -26,7 +26,7 @@
 
 class KGpgExpandableNode;
 class KGpgKeyNode;
-class QPixmap;
+#include <QPixmap>
 
 class KGpgUatNodePrivate;
 
diff --git a/kgpg/core/convert.h b/kgpg/core/convert.h
index b8f0a859..90557b08 100644
--- a/kgpg/core/convert.h
+++ b/kgpg/core/convert.h
@@ -26,8 +26,8 @@
 
 #include <gpgme.h>
 
-class QString;
-class QPixmap;
+#include <QString>
+#include <QPixmap>
 
 namespace KgpgCore
 {
diff --git a/kgpg/core/kgpgkey.h b/kgpg/core/kgpgkey.h
index 73f6a9f1..7156a52c 100644
--- a/kgpg/core/kgpgkey.h
+++ b/kgpg/core/kgpgkey.h
@@ -23,7 +23,7 @@
 #include <QList>
 #include <QDateTime>
 
-class QStringList;
+#include <QStringList>
 
 namespace KgpgCore
 {
diff --git a/kgpg/editor/kgpgmd5widget.h b/kgpg/editor/kgpgmd5widget.h
index 70cb5e09..cbe9dd39 100644
--- a/kgpg/editor/kgpgmd5widget.h
+++ b/kgpg/editor/kgpgmd5widget.h
@@ -15,7 +15,7 @@
 #include <KDialog>
 #include <KUrl>
 
-class QLabel;
+#include <QLabel>
 
 class KLed;
 
diff --git a/kgpg/editor/kgpgtextedit.h b/kgpg/editor/kgpgtextedit.h
index afafa3b1..bfdde768 100644
--- a/kgpg/editor/kgpgtextedit.h
+++ b/kgpg/editor/kgpgtextedit.h
@@ -20,8 +20,8 @@
 #include <KTextEdit>
 #include <KUrl>
 
-class QDragEnterEvent;
-class QDropEvent;
+#include <QDragEnterEvent>
+#include <QDropEvent>
 
 class KGpgItemModel;
 class KeysManager;
diff --git a/kgpg/foldercompressjob.h b/kgpg/foldercompressjob.h
index 18106e71..cfc11887 100644
--- a/kgpg/foldercompressjob.h
+++ b/kgpg/foldercompressjob.h
@@ -18,8 +18,8 @@
 #include <KUrl>
 
 class KTemporaryFile;
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 #include "transactions/kgpgencrypt.h"
 
diff --git a/kgpg/groupedit.h b/kgpg/groupedit.h
index a3592842..deebc349 100644
--- a/kgpg/groupedit.h
+++ b/kgpg/groupedit.h
@@ -21,7 +21,7 @@
 class GroupEditProxyModel;
 class KGpgNode;
 class KGpgItemModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 /**
  * @brief shows a widget that let's you change the keys that are part of a key group
diff --git a/kgpg/keyinfodialog.h b/kgpg/keyinfodialog.h
index 010f0952..97fd5d77 100644
--- a/kgpg/keyinfodialog.h
+++ b/kgpg/keyinfodialog.h
@@ -25,8 +25,8 @@
 
 #include "ui_kgpgKeyInfo.h"
 
-class QCheckBox;
-class QGroupBox;
+#include <QCheckBox>
+#include <QGroupBox>
 
 class KPushButton;
 class KUrlLabel;
diff --git a/kgpg/keysmanager.h b/kgpg/keysmanager.h
index cbaa3f83..906480c4 100644
--- a/kgpg/keysmanager.h
+++ b/kgpg/keysmanager.h
@@ -30,7 +30,7 @@
 #include <solid/networking.h>
 
 class KJob;
-class QEvent;
+#include <QEvent>
 
 class KSelectAction;
 class KStatusBar;
diff --git a/kgpg/keytreeview.h b/kgpg/keytreeview.h
index d1609c83..4314c937 100644
--- a/kgpg/keytreeview.h
+++ b/kgpg/keytreeview.h
@@ -25,8 +25,8 @@
 
 #include "core/kgpgkey.h"
 
-class QDragMoveEvent;
-class QDropEvent;
+#include <QDragMoveEvent>
+#include <QDropEvent>
 
 class KGpgNode;
 class KeyListProxyModel;
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h
index 5c9d68ed..5f21874a 100644
--- a/kgpg/kgpg.h
+++ b/kgpg/kgpg.h
@@ -26,7 +26,7 @@
 class KCmdLineArgs;
 class KeysManager;
 class KGpgExternalActions;
-class QString;
+#include <QString>
 
 static const char * const EMailTemplateText=I18N_NOOP(
     "Hi,\n\nplease find attached the user id '%UIDNAME%' of your key %KEYID% signed by me. "
diff --git a/kgpg/kgpgchangekey.h b/kgpg/kgpgchangekey.h
index f2dad902..34eb8bc9 100644
--- a/kgpg/kgpgchangekey.h
+++ b/kgpg/kgpgchangekey.h
@@ -22,7 +22,7 @@
 
 class KGpgKeyNode;
 class KGpgTransaction;
-class QWidget;
+#include <QWidget>
 
 /**
  * @short A class for changing several properties of a key at once
diff --git a/kgpg/kgpgexternalactions.h b/kgpg/kgpgexternalactions.h
index 5236941a..fef980a8 100644
--- a/kgpg/kgpgexternalactions.h
+++ b/kgpg/kgpgexternalactions.h
@@ -29,8 +29,8 @@ class KGpgTextInterface;
 class KJob;
 class KShortcut;
 class KTemporaryFile;
-class QFont;
-class QString;
+#include <QFont>
+#include <QString>
 
 /**
  * @brief handle actions called from outside the application
diff --git a/kgpg/kgpgfirstassistant.h b/kgpg/kgpgfirstassistant.h
index 51b44081..185cf821 100644
--- a/kgpg/kgpgfirstassistant.h
+++ b/kgpg/kgpgfirstassistant.h
@@ -21,8 +21,8 @@
 
 #include <KAssistantDialog>
 
-class QCheckBox;
-class QLabel;
+#include <QCheckBox>
+#include <QLabel>
 class KPageWidgetItem;
 class KUrlRequester;
 class KComboBox;
diff --git a/kgpg/kgpginterface.h b/kgpg/kgpginterface.h
index af469226..aca813e8 100644
--- a/kgpg/kgpginterface.h
+++ b/kgpg/kgpginterface.h
@@ -19,7 +19,7 @@
 #include <QStringList>
 
 class KGpgKeyNode;
-class QString;
+#include <QString>
 
 /**
  * GnuPG interface functions
diff --git a/kgpg/kgpgtextinterface.h b/kgpg/kgpgtextinterface.h
index 195ec506..6a6a8e9f 100644
--- a/kgpg/kgpgtextinterface.h
+++ b/kgpg/kgpgtextinterface.h
@@ -18,8 +18,8 @@
 #include <KUrl>
 
 class KGpgTextInterfacePrivate;
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 class KGpgTextInterface : public QObject
 {
diff --git a/kgpg/klinebufferedprocess.h b/kgpg/klinebufferedprocess.h
index 5eac1f23..09f475d6 100644
--- a/kgpg/klinebufferedprocess.h
+++ b/kgpg/klinebufferedprocess.h
@@ -16,7 +16,7 @@
 
 #include <KProcess>
 
-class QByteArray;
+#include <QByteArray>
 class KLineBufferedProcessPrivate;
 
 /**
diff --git a/kgpg/model/kgpgitemmodel.h b/kgpg/model/kgpgitemmodel.h
index f53dfebf..55dd8466 100644
--- a/kgpg/model/kgpgitemmodel.h
+++ b/kgpg/model/kgpgitemmodel.h
@@ -39,7 +39,7 @@ class KGpgExpandableNode;
 class KGpgGroupNode;
 class KGpgGroupMemberNode;
 class KGpgRootNode;
-class QColor;
+#include <QColor>
 
 class KGpgItemModel : public QAbstractItemModel
 {
diff --git a/kgpg/model/kgpgsearchresultmodel.h b/kgpg/model/kgpgsearchresultmodel.h
index e02a43ec..bbdb7aff 100644
--- a/kgpg/model/kgpgsearchresultmodel.h
+++ b/kgpg/model/kgpgsearchresultmodel.h
@@ -21,8 +21,8 @@
 
 #include <QAbstractItemModel>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 class KGpgSearchResultModelPrivate;
 
diff --git a/kgpg/selectexpirydate.h b/kgpg/selectexpirydate.h
index 97a6c02b..56a1f008 100644
--- a/kgpg/selectexpirydate.h
+++ b/kgpg/selectexpirydate.h
@@ -21,7 +21,7 @@
 #include <KDialog>
 
 class KDatePicker;
-class QCheckBox;
+#include <QCheckBox>
 
 /**
  * @brief shows a dialog to choose expiry date
diff --git a/kgpg/selectpublickeydialog.h b/kgpg/selectpublickeydialog.h
index 66080115..145ac48a 100644
--- a/kgpg/selectpublickeydialog.h
+++ b/kgpg/selectpublickeydialog.h
@@ -24,8 +24,8 @@
 #include <KVBox>
 #include <QKeySequence>
 
-class QCheckBox;
-class QTableView;
+#include <QCheckBox>
+#include <QTableView>
 
 class KLineEdit;
 class KHBox;
diff --git a/kgpg/selectsecretkey.h b/kgpg/selectsecretkey.h
index 9c4b6108..2a75715a 100644
--- a/kgpg/selectsecretkey.h
+++ b/kgpg/selectsecretkey.h
@@ -12,8 +12,8 @@
 
 #include <KDialog>
 
-class QCheckBox;
-class QTableView;
+#include <QCheckBox>
+#include <QTableView>
 
 class KComboBox;
 
diff --git a/kgpg/transactions/kgpgaddphoto.h b/kgpg/transactions/kgpgaddphoto.h
index 141ec651..d8d6512e 100644
--- a/kgpg/transactions/kgpgaddphoto.h
+++ b/kgpg/transactions/kgpgaddphoto.h
@@ -18,7 +18,7 @@
 
 #include "kgpgeditkeytransaction.h"
 
-class QString;
+#include <QString>
 
 class KGpgAddPhoto: public KGpgEditKeyTransaction {
 	Q_OBJECT
diff --git a/kgpg/transactions/kgpgadduid.h b/kgpg/transactions/kgpgadduid.h
index f56098ad..8e7c9245 100644
--- a/kgpg/transactions/kgpgadduid.h
+++ b/kgpg/transactions/kgpgadduid.h
@@ -18,7 +18,7 @@
 
 #include "kgpgeditkeytransaction.h"
 
-class QString;
+#include <QString>
 
 /**
  * @brief add a new user id to a key pair
diff --git a/kgpg/transactions/kgpgdecrypt.h b/kgpg/transactions/kgpgdecrypt.h
index cbc02581..a546b0a4 100644
--- a/kgpg/transactions/kgpgdecrypt.h
+++ b/kgpg/transactions/kgpgdecrypt.h
@@ -20,8 +20,8 @@
 
 #include "kgpgtextorfiletransaction.h"
 
-class QProcess;
-class QStringList;
+#include <QProcess>
+#include <QStringList>
 
 /**
  * @brief decrypt the given text or files
diff --git a/kgpg/transactions/kgpgencrypt.h b/kgpg/transactions/kgpgencrypt.h
index ef0aa972..47e8ba2c 100644
--- a/kgpg/transactions/kgpgencrypt.h
+++ b/kgpg/transactions/kgpgencrypt.h
@@ -22,7 +22,7 @@
 
 #include "kgpgtextorfiletransaction.h"
 
-class QProcess;
+#include <QProcess>
 
 /**
  * @brief encrypt the given text or files
diff --git a/kgpg/transactions/kgpgexport.h b/kgpg/transactions/kgpgexport.h
index f393bf45..85603e76 100644
--- a/kgpg/transactions/kgpgexport.h
+++ b/kgpg/transactions/kgpgexport.h
@@ -21,7 +21,7 @@
 
 #include "kgpgtransaction.h"
 
-class QProcess;
+#include <QProcess>
 
 /**
  * @brief export one or more keys from keyring
diff --git a/kgpg/transactions/kgpggeneratekey.h b/kgpg/transactions/kgpggeneratekey.h
index 2deb3ccd..0ef3f469 100644
--- a/kgpg/transactions/kgpggeneratekey.h
+++ b/kgpg/transactions/kgpggeneratekey.h
@@ -20,7 +20,7 @@
 
 #include <QObject>
 
-class QString;
+#include <QString>
 
 /**
  * @brief generate a new key pair
diff --git a/kgpg/transactions/kgpggeneraterevoke.h b/kgpg/transactions/kgpggeneraterevoke.h
index af9c63ee..0aa397ec 100644
--- a/kgpg/transactions/kgpggeneraterevoke.h
+++ b/kgpg/transactions/kgpggeneraterevoke.h
@@ -21,7 +21,7 @@
 #include <KUrl>
 #include <QObject>
 
-class QString;
+#include <QString>
 
 /**
  * @brief generate a revokation certificate
diff --git a/kgpg/transactions/kgpgsigntext.h b/kgpg/transactions/kgpgsigntext.h
index 1b66097a..27439b76 100644
--- a/kgpg/transactions/kgpgsigntext.h
+++ b/kgpg/transactions/kgpgsigntext.h
@@ -21,7 +21,7 @@
 #include <QString>
 #include <QStringList>
 
-class QProcess;
+#include <QProcess>
 
 /**
  * @brief sign the given text or files
diff --git a/kgpg/transactions/kgpgsigntransactionhelper.h b/kgpg/transactions/kgpgsigntransactionhelper.h
index e215b20c..66d303fa 100644
--- a/kgpg/transactions/kgpgsigntransactionhelper.h
+++ b/kgpg/transactions/kgpgsigntransactionhelper.h
@@ -17,7 +17,7 @@
 #include "kgpgtransaction.h"
 
 class KGpgKeyNode;
-class QString;
+#include <QString>
 
 /**
  * @brief helper class for key signing transactions
diff --git a/kgpg/transactions/kgpgsignuid.h b/kgpg/transactions/kgpgsignuid.h
index 635d3823..81875020 100644
--- a/kgpg/transactions/kgpgsignuid.h
+++ b/kgpg/transactions/kgpgsignuid.h
@@ -20,7 +20,7 @@
 #include "kgpgsigntransactionhelper.h"
 
 class KGpgSignableNode;
-class QString;
+#include <QString>
 
 /**
  * @brief transaction class to sign a single user id of a key
diff --git a/kgpg/transactions/kgpgtransaction.h b/kgpg/transactions/kgpgtransaction.h
index 35f1ca39..a9e0c936 100644
--- a/kgpg/transactions/kgpgtransaction.h
+++ b/kgpg/transactions/kgpgtransaction.h
@@ -21,8 +21,8 @@ class GPGProc;
 class KGpgSignTransactionHelper;
 class KGpgTransactionPrivate;
 class KUrl;
-class QByteArray;
-class QProcess;
+#include <QByteArray>
+#include <QProcess>
 
 /**
  * @brief Process one GnuPG operation
diff --git a/kgpg/transactions/kgpgverify.h b/kgpg/transactions/kgpgverify.h
index a4caac37..9fc8265d 100644
--- a/kgpg/transactions/kgpgverify.h
+++ b/kgpg/transactions/kgpgverify.h
@@ -23,7 +23,7 @@
 #include <KUrl>
 
 class KGpgItemModel;
-class QProcess;
+#include <QProcess>
 
 /**
  * @brief verify the signature of the given text or files
diff --git a/kmix/apps/kmix.h b/kmix/apps/kmix.h
index 4e016206..7e5593aa 100644
--- a/kmix/apps/kmix.h
+++ b/kmix/apps/kmix.h
@@ -27,10 +27,10 @@
 // Qt
 #include <QString>
 
-class QLabel;
+#include <QLabel>
 #include <qlist.h>
 #include <QVBoxLayout>
-class QPushButton;
+#include <QPushButton>
 #include <QTimer>
 class KTabWidget;
 
diff --git a/kmix/backends/mixer_alsa.h b/kmix/backends/mixer_alsa.h
index 9a75eaec..6d2703f0 100644
--- a/kmix/backends/mixer_alsa.h
+++ b/kmix/backends/mixer_alsa.h
@@ -26,8 +26,8 @@
 #include <QHash>
 
 // Forward QT includes
-class QString;
-class QSocketNotifier;
+#include <QString>
+#include <QSocketNotifier>
 
 #include "mixer_backend.h"
 
diff --git a/kmix/gui/dialogaddview.h b/kmix/gui/dialogaddview.h
index 570e316e..3e244bc0 100644
--- a/kmix/gui/dialogaddview.h
+++ b/kmix/gui/dialogaddview.h
@@ -21,13 +21,13 @@
 #ifndef DIALOGADDVIEW_H
 #define DIALOGADDVIEW_H
 
-class QButtonGroup;
+#include <QButtonGroup>
 #include <QStringList>
 class KComboBox;
 #include <qradiobutton.h>
-class QScrollArea;
+#include <QScrollArea>
 #include <kvbox.h>
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 #include <kdialog.h>
 
diff --git a/kmix/gui/dialogchoosebackends.h b/kmix/gui/dialogchoosebackends.h
index d7222fd9..2aa4c638 100644
--- a/kmix/gui/dialogchoosebackends.h
+++ b/kmix/gui/dialogchoosebackends.h
@@ -21,12 +21,12 @@
 #ifndef DIALOGCHOOSEBACKENDS_H
 #define DIALOGCHOOSEBACKENDS_H
 
-class QButtonGroup;
+#include <QButtonGroup>
 
 #include <qcheckbox.h>
 #include <QList>
-class QScrollArea;
-class QVBoxLayout;
+#include <QScrollArea>
+#include <QVBoxLayout>
 
 class KComboBox;
 #include <kdialog.h>
diff --git a/kmix/gui/dialogselectmaster.h b/kmix/gui/dialogselectmaster.h
index 50f36de3..a3ae9aab 100644
--- a/kmix/gui/dialogselectmaster.h
+++ b/kmix/gui/dialogselectmaster.h
@@ -21,12 +21,12 @@
 #ifndef DIALOGSELECTMASTER_H
 #define DIALOGSELECTMASTER_H
 
-class QButtonGroup;
+#include <QButtonGroup>
 class KComboBox;
 #include <qradiobutton.h>
-class QScrollArea;
+#include <QScrollArea>
 #include <kvbox.h>
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 #include <kdialog.h>
 
diff --git a/kmix/gui/dialogviewconfiguration.h b/kmix/gui/dialogviewconfiguration.h
index cdb178f8..ef742ad3 100644
--- a/kmix/gui/dialogviewconfiguration.h
+++ b/kmix/gui/dialogviewconfiguration.h
@@ -23,13 +23,13 @@
 
 // QT
 #include <QCheckBox>
-class QLabel;
+#include <QLabel>
 #include <QGridLayout>
-class QHBoxLayout;
+#include <QHBoxLayout>
 #include <qlist.h>
 #include <QListWidget>
-class QScrollArea;
-class QVBoxLayout;
+#include <QScrollArea>
+#include <QVBoxLayout>
 
 // QT DND
 #include <QtGui/qevent.h>
@@ -45,7 +45,7 @@ class QVBoxLayout;
 
 class DialogViewConfigurationItem : public QListWidgetItem
 {
- friend class QDataStream;
+ friend #include <QDataStream>
 
 
  public:
diff --git a/kmix/gui/kmixdockwidget.h b/kmix/gui/kmixdockwidget.h
index 6eea270a..35dfb525 100644
--- a/kmix/gui/kmixdockwidget.h
+++ b/kmix/gui/kmixdockwidget.h
@@ -23,8 +23,8 @@
 #ifndef KMIXDOCKWIDGET_H
 #define KMIXDOCKWIDGET_H
 
-class QString;
-class QWidgetAction;
+#include <QString>
+#include <QWidgetAction>
 
 class KToggleAction;
 #include <kstatusnotifieritem.h>
diff --git a/kmix/gui/kmixerwidget.h b/kmix/gui/kmixerwidget.h
index be84a791..96a60a44 100644
--- a/kmix/gui/kmixerwidget.h
+++ b/kmix/gui/kmixerwidget.h
@@ -25,7 +25,7 @@
 #include <vector>
 
 #include <QWidget>
-class QString;
+#include <QString>
 
 
 #include "core/ControlManager.h"
diff --git a/kmix/gui/kmixprefdlg.h b/kmix/gui/kmixprefdlg.h
index 72237afe..d9e633b0 100644
--- a/kmix/gui/kmixprefdlg.h
+++ b/kmix/gui/kmixprefdlg.h
@@ -27,14 +27,14 @@
 
 class KMixPrefWidget;
 
-class QBoxLayout;
-class QCheckBox;
-class QFrame;
+#include <QBoxLayout>
+#include <QCheckBox>
+#include <QFrame>
 #include <QGridLayout>
-class QLabel;
-class QRadioButton;
-class QShowEvent;
-class QWidget;
+#include <QLabel>
+#include <QRadioButton>
+#include <QShowEvent>
+#include <QWidget>
 
 #include "core/GlobalConfig.h"
 #include "gui/dialogchoosebackends.h"
diff --git a/kmix/gui/mdwenum.h b/kmix/gui/mdwenum.h
index c5f59cd4..b4132322 100644
--- a/kmix/gui/mdwenum.h
+++ b/kmix/gui/mdwenum.h
@@ -35,8 +35,8 @@ class KAction;
 class KComboBox;
 
 // Qt
-class QBoxLayout;
-class QLabel;
+#include <QBoxLayout>
+#include <QLabel>
 
 #include "gui/mixdevicewidget.h"
 
diff --git a/kmix/gui/mdwslider.h b/kmix/gui/mdwslider.h
index d2aa78f7..83156bde 100644
--- a/kmix/gui/mdwslider.h
+++ b/kmix/gui/mdwslider.h
@@ -31,9 +31,9 @@
 #include <qlist.h>
 #include <qpixmap.h>
 
-class QBoxLayout;
-class QToolButton;
-class QLabel;
+#include <QBoxLayout>
+#include <QToolButton>
+#include <QLabel>
 
 class KAction;
 class KMenu;
diff --git a/kmix/gui/mdwswitch.h b/kmix/gui/mdwswitch.h
index 6d43c2e7..170f0404 100644
--- a/kmix/gui/mdwswitch.h
+++ b/kmix/gui/mdwswitch.h
@@ -27,10 +27,10 @@
 //#include "core/volume.h"
 //#include <qpixmap.h>
 //
-//class QBoxLayout;
-//class QLabel;
+//#include <QBoxLayout>
+//#include <QLabel>
 //
-//class QCheckBox;
+//#include <QCheckBox>
 //class KAction;
 //
 //class MixDevice;
diff --git a/kmix/gui/osdwidget.h b/kmix/gui/osdwidget.h
index 3e80cd62..9966fbe4 100644
--- a/kmix/gui/osdwidget.h
+++ b/kmix/gui/osdwidget.h
@@ -26,8 +26,8 @@
 
 #include <QPixmap>
 
-class QTimer;
-class QGraphicsWidget;
+#include <QTimer>
+#include <QGraphicsWidget>
 
 namespace Plasma
 {
diff --git a/kmix/gui/viewdockareapopup.h b/kmix/gui/viewdockareapopup.h
index e56a1ba2..2b583b4f 100644
--- a/kmix/gui/viewdockareapopup.h
+++ b/kmix/gui/viewdockareapopup.h
@@ -23,11 +23,11 @@
 
 #include "viewbase.h"
 
-class QBoxLayout;
-class QFrame;
-class QGridLayout;
+#include <QBoxLayout>
+#include <QFrame>
+#include <QGridLayout>
 #include <QPushButton>
-class QWidget;
+#include <QWidget>
 
 class KIcon;
 
diff --git a/kmix/gui/viewsliders.h b/kmix/gui/viewsliders.h
index 70728117..8856f761 100644
--- a/kmix/gui/viewsliders.h
+++ b/kmix/gui/viewsliders.h
@@ -21,12 +21,12 @@
 #ifndef ViewSliders_h
 #define ViewSliders_h
 
-class QBoxLayout;
+#include <QBoxLayout>
 #include <QFrame>
 #include <QHash>
-class QLabel;
+#include <QLabel>
 #include <QPushButton>
-class QWidget;
+#include <QWidget>
 
 class Mixer;
 #include "viewbase.h"
diff --git a/kolourpaint/commands/imagelib/transforms/kpTransformResizeScaleCommand.h b/kolourpaint/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
index ea29e0fe..fd1b0c2d 100644
--- a/kolourpaint/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
+++ b/kolourpaint/commands/imagelib/transforms/kpTransformResizeScaleCommand.h
@@ -39,7 +39,7 @@
 #include <kpImage.h>
 
 
-class QSize;
+#include <QSize>
 
 class kpAbstractSelection;
 
diff --git a/kolourpaint/commands/kpCommand.h b/kolourpaint/commands/kpCommand.h
index 7824811f..d2d35552 100644
--- a/kolourpaint/commands/kpCommand.h
+++ b/kolourpaint/commands/kpCommand.h
@@ -34,7 +34,7 @@
 #undef environ  // macro on win32
 
 
-class QString;
+#include <QString>
 
 class kpAbstractImageSelection;
 class kpAbstractSelection;
diff --git a/kolourpaint/commands/kpCommandHistoryBase.h b/kolourpaint/commands/kpCommandHistoryBase.h
index 87481367..0bbcf08f 100644
--- a/kolourpaint/commands/kpCommandHistoryBase.h
+++ b/kolourpaint/commands/kpCommandHistoryBase.h
@@ -36,7 +36,7 @@
 
 #include <kpCommandSize.h>
 
-class QAction;
+#include <QAction>
 
 class KActionCollection;
 class KToolBarPopupAction;
diff --git a/kolourpaint/commands/kpCommandSize.h b/kolourpaint/commands/kpCommandSize.h
index 126713f9..92b9fafa 100644
--- a/kolourpaint/commands/kpCommandSize.h
+++ b/kolourpaint/commands/kpCommandSize.h
@@ -33,9 +33,9 @@
 #include <kpImage.h>
 
 
-class QImage;
-class QPolygon;
-class QString;
+#include <QImage>
+#include <QPolygon>
+#include <QString>
 
 class kpAbstractSelection;
 
diff --git a/kolourpaint/commands/tools/flow/kpToolFlowCommand.h b/kolourpaint/commands/tools/flow/kpToolFlowCommand.h
index fe6a48c9..4e960b8d 100644
--- a/kolourpaint/commands/tools/flow/kpToolFlowCommand.h
+++ b/kolourpaint/commands/tools/flow/kpToolFlowCommand.h
@@ -33,8 +33,8 @@
 #include <kpNamedCommand.h>
 
 
-class QPoint;
-class QRect;
+#include <QPoint>
+#include <QRect>
 
 
 class kpToolFlowCommand : public kpNamedCommand
diff --git a/kolourpaint/commands/tools/polygonal/kpToolPolygonalCommand.h b/kolourpaint/commands/tools/polygonal/kpToolPolygonalCommand.h
index 7d0aac14..03d59daa 100644
--- a/kolourpaint/commands/tools/polygonal/kpToolPolygonalCommand.h
+++ b/kolourpaint/commands/tools/polygonal/kpToolPolygonalCommand.h
@@ -34,8 +34,8 @@
 #include <kpToolPolygonalBase.h>
 
 
-class QPolygon;
-class QRect;
+#include <QPolygon>
+#include <QRect>
 
 class kpColor;
 
diff --git a/kolourpaint/commands/tools/selection/kpToolSelectionResizeScaleCommand.h b/kolourpaint/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
index 16057757..6e3b41ca 100644
--- a/kolourpaint/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
+++ b/kolourpaint/commands/tools/selection/kpToolSelectionResizeScaleCommand.h
@@ -36,7 +36,7 @@
 #include <kpNamedCommand.h>
 
 
-class QTimer;
+#include <QTimer>
 
 class kpAbstractSelection;
 
diff --git a/kolourpaint/cursors/kpCursorLightCross.h b/kolourpaint/cursors/kpCursorLightCross.h
index 941e825c..a5c9e4ce 100644
--- a/kolourpaint/cursors/kpCursorLightCross.h
+++ b/kolourpaint/cursors/kpCursorLightCross.h
@@ -30,7 +30,7 @@
 #define KP_CURSOR_LIGHT_CROSS_H
 
 
-class QCursor;
+#include <QCursor>
 
 
 const QCursor *kpCursorLightCrossCreate ();
diff --git a/kolourpaint/cursors/kpCursorProvider.h b/kolourpaint/cursors/kpCursorProvider.h
index 9714261d..95e2e9e7 100644
--- a/kolourpaint/cursors/kpCursorProvider.h
+++ b/kolourpaint/cursors/kpCursorProvider.h
@@ -30,7 +30,7 @@
 #define KP_CURSOR_PROVIDER_H
 
 
-class QCursor;
+#include <QCursor>
 
 
 class kpCursorProvider
diff --git a/kolourpaint/dialogs/imagelib/effects/kpEffectsDialog.h b/kolourpaint/dialogs/imagelib/effects/kpEffectsDialog.h
index 1a21c7e0..80f2ffca 100644
--- a/kolourpaint/dialogs/imagelib/effects/kpEffectsDialog.h
+++ b/kolourpaint/dialogs/imagelib/effects/kpEffectsDialog.h
@@ -33,10 +33,10 @@
 #include <kpTransformPreviewDialog.h>
 
 
-class QGroupBox;
-class QImage;
-class QTimer;
-class QVBoxLayout;
+#include <QGroupBox>
+#include <QImage>
+#include <QTimer>
+#include <QVBoxLayout>
 
 class KComboBox;
 
diff --git a/kolourpaint/dialogs/imagelib/kpDocumentMetaInfoDialog.h b/kolourpaint/dialogs/imagelib/kpDocumentMetaInfoDialog.h
index 24e7f04a..7c357bd3 100644
--- a/kolourpaint/dialogs/imagelib/kpDocumentMetaInfoDialog.h
+++ b/kolourpaint/dialogs/imagelib/kpDocumentMetaInfoDialog.h
@@ -33,7 +33,7 @@
 #include <kdialog.h>
 
 
-class QTableWidgetItem;
+#include <QTableWidgetItem>
 
 class kpDocumentMetaInfo;
 
diff --git a/kolourpaint/dialogs/imagelib/transforms/kpTransformPreviewDialog.h b/kolourpaint/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
index cc6e3fe7..a3f5b57e 100644
--- a/kolourpaint/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
+++ b/kolourpaint/dialogs/imagelib/transforms/kpTransformPreviewDialog.h
@@ -35,9 +35,9 @@
 #include <kdialog.h>
 
 
-class QLabel;
-class QGridLayout;
-class QGroupBox;
+#include <QLabel>
+#include <QGridLayout>
+#include <QGroupBox>
 
 class kpColor;
 class kpDocument;
diff --git a/kolourpaint/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h b/kolourpaint/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
index baeb448d..8b1ab32a 100644
--- a/kolourpaint/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
+++ b/kolourpaint/dialogs/imagelib/transforms/kpTransformResizeScaleDialog.h
@@ -35,9 +35,9 @@
 #include <kpTransformResizeScaleCommand.h>
 
 
-class QCheckBox;
-class QGroupBox;
-class QToolButton;
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QToolButton>
 
 class KComboBox;
 class KDoubleNumInput;
diff --git a/kolourpaint/dialogs/imagelib/transforms/kpTransformRotateDialog.h b/kolourpaint/dialogs/imagelib/transforms/kpTransformRotateDialog.h
index 50282cc4..ea1bd0f4 100644
--- a/kolourpaint/dialogs/imagelib/transforms/kpTransformRotateDialog.h
+++ b/kolourpaint/dialogs/imagelib/transforms/kpTransformRotateDialog.h
@@ -37,8 +37,8 @@
 #include <kpTransformPreviewDialog.h>
 
 
-class QButtonGroup;
-class QRadioButton;
+#include <QButtonGroup>
+#include <QRadioButton>
 
 class KIntNumInput;
 
diff --git a/kolourpaint/dialogs/imagelib/transforms/kpTransformSkewDialog.h b/kolourpaint/dialogs/imagelib/transforms/kpTransformSkewDialog.h
index 7c788978..2b3bea50 100644
--- a/kolourpaint/dialogs/imagelib/transforms/kpTransformSkewDialog.h
+++ b/kolourpaint/dialogs/imagelib/transforms/kpTransformSkewDialog.h
@@ -36,7 +36,7 @@
 #include <kpTransformPreviewDialog.h>
 
 
-class QPixmap;
+#include <QPixmap>
 
 class KIntNumInput;
 
diff --git a/kolourpaint/dialogs/kpColorSimilarityDialog.h b/kolourpaint/dialogs/kpColorSimilarityDialog.h
index 528a078a..c2bc6fe9 100644
--- a/kolourpaint/dialogs/kpColorSimilarityDialog.h
+++ b/kolourpaint/dialogs/kpColorSimilarityDialog.h
@@ -33,7 +33,7 @@
 #include <kdialog.h>
 
 
-class QLabel;
+#include <QLabel>
 
 class KIntNumInput;
 
diff --git a/kolourpaint/dialogs/kpDocumentSaveOptionsPreviewDialog.h b/kolourpaint/dialogs/kpDocumentSaveOptionsPreviewDialog.h
index 1c45f7c7..47dfbbd5 100644
--- a/kolourpaint/dialogs/kpDocumentSaveOptionsPreviewDialog.h
+++ b/kolourpaint/dialogs/kpDocumentSaveOptionsPreviewDialog.h
@@ -35,11 +35,11 @@
 #include <kpSubWindow.h>
 
 
-class QCloseEvent;
-class QImage;
-class QLabel;
-class QMoveEvent;
-class QResizeEvent;
+#include <QCloseEvent>
+#include <QImage>
+#include <QLabel>
+#include <QMoveEvent>
+#include <QResizeEvent>
 
 class kpResizeSignallingLabel;
 
diff --git a/kolourpaint/document/kpDocument.h b/kolourpaint/document/kpDocument.h
index 03726242..e3c0f5db 100644
--- a/kolourpaint/document/kpDocument.h
+++ b/kolourpaint/document/kpDocument.h
@@ -40,12 +40,12 @@
 #include <kpPixmapFX.h>
 #undef environ
 
-class QImage;
-class QIODevice;
-class QPixmap;
-class QPoint;
-class QRect;
-class QSize;
+#include <QImage>
+#include <QIODevice>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 
 class kpColor;
 class kpDocumentEnvironment;
diff --git a/kolourpaint/document/kpDocumentSaveOptions.h b/kolourpaint/document/kpDocumentSaveOptions.h
index ef3d7999..d4d026bd 100644
--- a/kolourpaint/document/kpDocumentSaveOptions.h
+++ b/kolourpaint/document/kpDocumentSaveOptions.h
@@ -30,8 +30,8 @@
 #define KP_DOCUMENT_SAVE_OPTIONS_H
 
 
-class QImage;
-class QString;
+#include <QImage>
+#include <QString>
 
 class KConfigGroup;
 
diff --git a/kolourpaint/environments/document/kpDocumentEnvironment.h b/kolourpaint/environments/document/kpDocumentEnvironment.h
index 264d3355..3eb4b36d 100644
--- a/kolourpaint/environments/document/kpDocumentEnvironment.h
+++ b/kolourpaint/environments/document/kpDocumentEnvironment.h
@@ -33,8 +33,8 @@
 #include <kpEnvironmentBase.h>
 
 
-class QRect;
-class QWidget;
+#include <QRect>
+#include <QWidget>
 
 class kpAbstractSelection;
 
diff --git a/kolourpaint/environments/tools/kpToolEnvironment.h b/kolourpaint/environments/tools/kpToolEnvironment.h
index 16c43b0a..edc9594c 100644
--- a/kolourpaint/environments/tools/kpToolEnvironment.h
+++ b/kolourpaint/environments/tools/kpToolEnvironment.h
@@ -33,10 +33,10 @@
 #include <kpEnvironmentBase.h>
 
 
-class QActionGroup;
-class QPoint;
-class QRect;
-class QString;
+#include <QActionGroup>
+#include <QPoint>
+#include <QRect>
+#include <QString>
 
 class KActionCollection;
 
diff --git a/kolourpaint/environments/tools/selection/kpToolSelectionEnvironment.h b/kolourpaint/environments/tools/selection/kpToolSelectionEnvironment.h
index 6df7dc19..94941d6b 100644
--- a/kolourpaint/environments/tools/selection/kpToolSelectionEnvironment.h
+++ b/kolourpaint/environments/tools/selection/kpToolSelectionEnvironment.h
@@ -33,7 +33,7 @@
 #include <kpToolEnvironment.h>
 
 
-class QMenu;
+#include <QMenu>
 
 class kpImageSelectionTransparency;
 class kpTextStyle;
diff --git a/kolourpaint/generic/kpSetOverrideCursorSaver.h b/kolourpaint/generic/kpSetOverrideCursorSaver.h
index cdc0d018..1d9f83ad 100644
--- a/kolourpaint/generic/kpSetOverrideCursorSaver.h
+++ b/kolourpaint/generic/kpSetOverrideCursorSaver.h
@@ -30,7 +30,7 @@
 #define kpSetOverrideCursorSaver_H
 
 
-class QCursor;
+#include <QCursor>
 
 
 //
diff --git a/kolourpaint/generic/kpWidgetMapper.h b/kolourpaint/generic/kpWidgetMapper.h
index 727f90d5..71610095 100644
--- a/kolourpaint/generic/kpWidgetMapper.h
+++ b/kolourpaint/generic/kpWidgetMapper.h
@@ -30,9 +30,9 @@
 #define KP_WIDGET_MAPPER_H
 
 
-class QWidget;
-class QPoint;
-class QRect;
+#include <QWidget>
+#include <QPoint>
+#include <QRect>
 
 
 namespace kpWidgetMapper
diff --git a/kolourpaint/generic/widgets/kpResizeSignallingLabel.h b/kolourpaint/generic/widgets/kpResizeSignallingLabel.h
index 2434fe05..ec53a342 100644
--- a/kolourpaint/generic/widgets/kpResizeSignallingLabel.h
+++ b/kolourpaint/generic/widgets/kpResizeSignallingLabel.h
@@ -33,7 +33,7 @@
 #include <qlabel.h>
 
 
-class QResizeEvent;
+#include <QResizeEvent>
 
 
 class kpResizeSignallingLabel : public QLabel
diff --git a/kolourpaint/imagelib/effects/kpEffectFlatten.h b/kolourpaint/imagelib/effects/kpEffectFlatten.h
index 2fb0aaab..1f49d503 100644
--- a/kolourpaint/imagelib/effects/kpEffectFlatten.h
+++ b/kolourpaint/imagelib/effects/kpEffectFlatten.h
@@ -30,8 +30,8 @@
 #define kpEffectFlatten_H
 
 
-class QColor;
-class QImage;
+#include <QColor>
+#include <QImage>
 
 
 class kpEffectFlatten
diff --git a/kolourpaint/imagelib/effects/kpEffectInvert.h b/kolourpaint/imagelib/effects/kpEffectInvert.h
index 60888435..b7f9f96f 100644
--- a/kolourpaint/imagelib/effects/kpEffectInvert.h
+++ b/kolourpaint/imagelib/effects/kpEffectInvert.h
@@ -30,7 +30,7 @@
 #define kpEffectInvert_H
 
 
-class QImage;
+#include <QImage>
 
 
 class kpEffectInvert
diff --git a/kolourpaint/imagelib/kpColor.h b/kolourpaint/imagelib/kpColor.h
index 34ea5e3c..c9942786 100644
--- a/kolourpaint/imagelib/kpColor.h
+++ b/kolourpaint/imagelib/kpColor.h
@@ -33,7 +33,7 @@
 #include <qcolor.h>
 
 
-class QDataStream;
+#include <QDataStream>
 
 
 //
diff --git a/kolourpaint/imagelib/kpDocumentMetaInfo.h b/kolourpaint/imagelib/kpDocumentMetaInfo.h
index 671f5cc7..23538305 100644
--- a/kolourpaint/imagelib/kpDocumentMetaInfo.h
+++ b/kolourpaint/imagelib/kpDocumentMetaInfo.h
@@ -38,8 +38,8 @@
 #include <kpCommandSize.h>
 
 
-class QPoint;
-class QStringList;
+#include <QPoint>
+#include <QStringList>
 
 
 class kpDocumentMetaInfo
diff --git a/kolourpaint/imagelib/kpPainter.h b/kolourpaint/imagelib/kpPainter.h
index fe9ea2fc..dd8c217a 100644
--- a/kolourpaint/imagelib/kpPainter.h
+++ b/kolourpaint/imagelib/kpPainter.h
@@ -34,7 +34,7 @@
 #include <kpImage.h>
 
 
-class QPolygon;
+#include <QPolygon>
 
 
 //
diff --git a/kolourpaint/imagelib/transforms/kpTransformAutoCrop.h b/kolourpaint/imagelib/transforms/kpTransformAutoCrop.h
index df2a93fe..f60ccf11 100644
--- a/kolourpaint/imagelib/transforms/kpTransformAutoCrop.h
+++ b/kolourpaint/imagelib/transforms/kpTransformAutoCrop.h
@@ -33,7 +33,7 @@
 #include <kpNamedCommand.h>
 
 
-class QRect;
+#include <QRect>
 
 //class kpImage;
 class kpMainWindow;
diff --git a/kolourpaint/imagelib/transforms/kpTransformCropPrivate.h b/kolourpaint/imagelib/transforms/kpTransformCropPrivate.h
index 08f69612..2a75c250 100644
--- a/kolourpaint/imagelib/transforms/kpTransformCropPrivate.h
+++ b/kolourpaint/imagelib/transforms/kpTransformCropPrivate.h
@@ -30,7 +30,7 @@
 #define kpTransformCropPrivate_H
 
 
-class QString;
+#include <QString>
 
 class kpCommand;
 class kpMainWindow;
diff --git a/kolourpaint/kpThumbnail.h b/kolourpaint/kpThumbnail.h
index 2f0299ee..f8cad02e 100644
--- a/kolourpaint/kpThumbnail.h
+++ b/kolourpaint/kpThumbnail.h
@@ -33,8 +33,8 @@
 #include <kpSubWindow.h>
 
 
-class QMoveEvent;
-class QResizeEvent;
+#include <QMoveEvent>
+#include <QResizeEvent>
 
 class kpMainWindow;
 class kpThumbnailView;
diff --git a/kolourpaint/kpViewScrollableContainer.h b/kolourpaint/kpViewScrollableContainer.h
index abd4a7e7..d3595483 100644
--- a/kolourpaint/kpViewScrollableContainer.h
+++ b/kolourpaint/kpViewScrollableContainer.h
@@ -36,15 +36,15 @@
 #include <qsize.h>
 
 
-class QCursor;
-class QDragMoveEvent;
-class QEvent;
-class QKeyEvent;
-class QMouseEvent;
-class QPaintEvent;
-class QRect;
-class QResizeEvent;
-class QTimer;
+#include <QCursor>
+#include <QDragMoveEvent>
+#include <QEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QRect>
+#include <QResizeEvent>
+#include <QTimer>
 
 class kpView;
 class kpOverlay;
diff --git a/kolourpaint/layers/selections/kpAbstractSelection.h b/kolourpaint/layers/selections/kpAbstractSelection.h
index 260dc600..ba2948e1 100644
--- a/kolourpaint/layers/selections/kpAbstractSelection.h
+++ b/kolourpaint/layers/selections/kpAbstractSelection.h
@@ -38,11 +38,11 @@
 #include <kpPixmapFX.h>
 
 
-class QImage;
-class QPolygon;
-class QPoint;
-class QRect;
-class QSize;
+#include <QImage>
+#include <QPolygon>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
 
 
 //
diff --git a/kolourpaint/layers/selections/kpSelectionFactory.h b/kolourpaint/layers/selections/kpSelectionFactory.h
index 79c00232..5bbd271c 100644
--- a/kolourpaint/layers/selections/kpSelectionFactory.h
+++ b/kolourpaint/layers/selections/kpSelectionFactory.h
@@ -33,7 +33,7 @@
 #include <kpPixmapFX.h>
 
 
-class QDataStream;
+#include <QDataStream>
 
 class kpAbstractImageSelection;
 
diff --git a/kolourpaint/layers/selections/text/kpTextStyle.h b/kolourpaint/layers/selections/text/kpTextStyle.h
index f64e3d0d..4b5d98c8 100644
--- a/kolourpaint/layers/selections/text/kpTextStyle.h
+++ b/kolourpaint/layers/selections/text/kpTextStyle.h
@@ -35,9 +35,9 @@
 #include <kpColor.h>
 
 
-class QDataStream;
-class QFont;
-class QFontMetrics;
+#include <QDataStream>
+#include <QFont>
+#include <QFontMetrics>
 
 
 class kpTextStyle
diff --git a/kolourpaint/lgpl/generic/kpUrlFormatter.h b/kolourpaint/lgpl/generic/kpUrlFormatter.h
index f006c4b3..93a5f9a5 100644
--- a/kolourpaint/lgpl/generic/kpUrlFormatter.h
+++ b/kolourpaint/lgpl/generic/kpUrlFormatter.h
@@ -38,7 +38,7 @@
 #include <kolourpaint_lgpl_export.h>
 
 
-class QString;
+#include <QString>
 
 class KUrl;
 
diff --git a/kolourpaint/mainWindow/kpMainWindow.h b/kolourpaint/mainWindow/kpMainWindow.h
index d8a2b47a..40e622aa 100644
--- a/kolourpaint/mainWindow/kpMainWindow.h
+++ b/kolourpaint/mainWindow/kpMainWindow.h
@@ -38,16 +38,16 @@
 #include <kpImage.h>
 
 
-class QAction;
-class QActionGroup;
-class QDragEnterEvent;
-class QDropEvent;
-class QMenu;
-class QMoveEvent;
-class QPoint;
-class QRect;
-class QSize;
-class QStringList;
+#include <QAction>
+#include <QActionGroup>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QMenu>
+#include <QMoveEvent>
+#include <QPoint>
+#include <QRect>
+#include <QSize>
+#include <QStringList>
 
 class KConfigGroup;
 class KFontAction;
@@ -55,7 +55,7 @@ class KFontSizeAction;
 class KSelectAction;
 class KToggleAction;
 class KToolBar;
-class QPrinter;
+#include <QPrinter>
 class KRecentFilesAction;
 class KScanDialog;
 class KToggleFullScreenAction;
diff --git a/kolourpaint/mainWindow/kpMainWindowPrivate.h b/kolourpaint/mainWindow/kpMainWindowPrivate.h
index 17112c00..84a15255 100644
--- a/kolourpaint/mainWindow/kpMainWindowPrivate.h
+++ b/kolourpaint/mainWindow/kpMainWindowPrivate.h
@@ -36,8 +36,8 @@
 #include <kpDocumentSaveOptions.h>
 
 
-class QAction;
-class QActionGroup;
+#include <QAction>
+#include <QActionGroup>
 
 class KSelectAction;
 class KToggleAction;
diff --git a/kolourpaint/pixmapfx/kpPixmapFX.h b/kolourpaint/pixmapfx/kpPixmapFX.h
index bbb1c0c9..90304ddb 100644
--- a/kolourpaint/pixmapfx/kpPixmapFX.h
+++ b/kolourpaint/pixmapfx/kpPixmapFX.h
@@ -41,14 +41,14 @@
 #include <kpColor.h>
 
 
-class QColor;
-class QImage;
-class QMatrix;
-class QPen;
-class QImage;
-class QPoint;
-class QPolygon;
-class QRect;
+#include <QColor>
+#include <QImage>
+#include <QMatrix>
+#include <QPen>
+#include <QImage>
+#include <QPoint>
+#include <QPolygon>
+#include <QRect>
 
 
 class kpAbstractSelection;
diff --git a/kolourpaint/tools/flow/kpToolFlowBase.h b/kolourpaint/tools/flow/kpToolFlowBase.h
index 79d63502..5827ced4 100644
--- a/kolourpaint/tools/flow/kpToolFlowBase.h
+++ b/kolourpaint/tools/flow/kpToolFlowBase.h
@@ -36,8 +36,8 @@
 #include <kpTool.h>
 
 
-class QPoint;
-class QString;
+#include <QPoint>
+#include <QString>
 
 class kpColor;
 class kpToolFlowCommand;
diff --git a/kolourpaint/tools/flow/kpToolSpraycan.h b/kolourpaint/tools/flow/kpToolSpraycan.h
index 142b9745..02a1521a 100644
--- a/kolourpaint/tools/flow/kpToolSpraycan.h
+++ b/kolourpaint/tools/flow/kpToolSpraycan.h
@@ -33,10 +33,10 @@
 #include <kpToolFlowBase.h>
 
 
-class QPoint;
-class QRect;
-class QString;
-class QTimer;
+#include <QPoint>
+#include <QRect>
+#include <QString>
+#include <QTimer>
 
 class kpToolWidgetSpraycanSize;
 
diff --git a/kolourpaint/tools/kpTool.h b/kolourpaint/tools/kpTool.h
index fd836e69..29bc26a4 100644
--- a/kolourpaint/tools/kpTool.h
+++ b/kolourpaint/tools/kpTool.h
@@ -43,13 +43,13 @@
 #endif
 
 
-class QFocusEvent;
-class QIcon;
+#include <QFocusEvent>
+#include <QIcon>
 class QInputMethodEvent;
-class QKeyEvent;
-class QMouseEvent;
-class QImage;
-class QWheelEvent;
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QImage>
+#include <QWheelEvent>
 
 class KShortcut;
 
diff --git a/kolourpaint/tools/kpToolColorPicker.h b/kolourpaint/tools/kpToolColorPicker.h
index 8075d228..89996ba2 100644
--- a/kolourpaint/tools/kpToolColorPicker.h
+++ b/kolourpaint/tools/kpToolColorPicker.h
@@ -34,8 +34,8 @@
 #include <kpTool.h>
 
 
-class QPoint;
-class QRect;
+#include <QPoint>
+#include <QRect>
 
 
 class kpToolColorPicker : public kpTool
diff --git a/kolourpaint/tools/polygonal/kpToolPolygonalBase.h b/kolourpaint/tools/polygonal/kpToolPolygonalBase.h
index 4d64b1e4..3427551d 100644
--- a/kolourpaint/tools/polygonal/kpToolPolygonalBase.h
+++ b/kolourpaint/tools/polygonal/kpToolPolygonalBase.h
@@ -44,10 +44,10 @@
 #include <kpToolWidgetFillStyle.h>
 
 
-class QPoint;
-class QPolygon;
-class QRect;
-class QString;
+#include <QPoint>
+#include <QPolygon>
+#include <QRect>
+#include <QString>
 
 class kpView;
 
diff --git a/kolourpaint/tools/rectangular/kpToolRectangularBase.h b/kolourpaint/tools/rectangular/kpToolRectangularBase.h
index e748a464..a9f1415c 100644
--- a/kolourpaint/tools/rectangular/kpToolRectangularBase.h
+++ b/kolourpaint/tools/rectangular/kpToolRectangularBase.h
@@ -34,9 +34,9 @@
 #include <kpTool.h>
 
 
-class QPoint;
-class QRect;
-class QString;
+#include <QPoint>
+#include <QRect>
+#include <QString>
 
 class kpColor;
 
diff --git a/kolourpaint/tools/selection/kpAbstractSelectionTool.h b/kolourpaint/tools/selection/kpAbstractSelectionTool.h
index 1f670163..d2877631 100644
--- a/kolourpaint/tools/selection/kpAbstractSelectionTool.h
+++ b/kolourpaint/tools/selection/kpAbstractSelectionTool.h
@@ -35,9 +35,9 @@
 #include <QVariant>
 
 
-class QKeyEvent;
-class QPoint;
-class QRect;
+#include <QKeyEvent>
+#include <QPoint>
+#include <QRect>
 
 class kpAbstractSelection;
 class kpAbstractSelectionContentCommand;
diff --git a/kolourpaint/tools/selection/kpAbstractSelectionToolPrivate.h b/kolourpaint/tools/selection/kpAbstractSelectionToolPrivate.h
index 1eb52cf8..ea4a6ac5 100644
--- a/kolourpaint/tools/selection/kpAbstractSelectionToolPrivate.h
+++ b/kolourpaint/tools/selection/kpAbstractSelectionToolPrivate.h
@@ -35,7 +35,7 @@
 #include <kpAbstractSelectionTool.h>
 
 
-class QTimer;
+#include <QTimer>
 
 class kpAbstractSelectionContentCommand;
 class kpToolSelectionMoveCommand;
diff --git a/kolourpaint/tools/selection/text/kpToolText.h b/kolourpaint/tools/selection/text/kpToolText.h
index 6b4fa5f8..9c1ffe00 100644
--- a/kolourpaint/tools/selection/text/kpToolText.h
+++ b/kolourpaint/tools/selection/text/kpToolText.h
@@ -33,7 +33,7 @@
 #include <kpAbstractSelectionTool.h>
 
 
-class QKeyEvent;
+#include <QKeyEvent>
 
 class kpColor;
 class kpTextStyle;
diff --git a/kolourpaint/views/kpView.h b/kolourpaint/views/kpView.h
index 1e54bb50..d1779b07 100644
--- a/kolourpaint/views/kpView.h
+++ b/kolourpaint/views/kpView.h
@@ -35,15 +35,15 @@
 #include <kpDefs.h>
 
 
-class QDragEnterEvent;
-class QDragLeaveEvent;
-class QEvent;
-class QFocusEvent;
-class QKeyEvent;
-class QMouseEvent;
-class QPaintEvent;
-class QPixmap;
-class QResizeEvent;
+#include <QDragEnterEvent>
+#include <QDragLeaveEvent>
+#include <QEvent>
+#include <QFocusEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPixmap>
+#include <QResizeEvent>
 
 class kpAbstractSelection;
 class kpDocument;
diff --git a/kolourpaint/views/manager/kpViewManager.h b/kolourpaint/views/manager/kpViewManager.h
index 56d20781..35187b9b 100644
--- a/kolourpaint/views/manager/kpViewManager.h
+++ b/kolourpaint/views/manager/kpViewManager.h
@@ -33,10 +33,10 @@
 #include <QObject>
 
 
-class QCursor;
-class QRegion;
-class QRect;
-class QTimer;
+#include <QCursor>
+#include <QRegion>
+#include <QRect>
+#include <QTimer>
 
 class kpDocument;
 class kpView;
diff --git a/kolourpaint/views/manager/kpViewManagerPrivate.h b/kolourpaint/views/manager/kpViewManagerPrivate.h
index 19565ced..97e84a65 100644
--- a/kolourpaint/views/manager/kpViewManagerPrivate.h
+++ b/kolourpaint/views/manager/kpViewManagerPrivate.h
@@ -36,7 +36,7 @@
 
 class kpMainWindow;
 class kpTempPixmap;
-class QTimer;
+#include <QTimer>
 class kpView;
 
 
diff --git a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.h b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.h
index 8b458534..639ce48f 100644
--- a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.h
+++ b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityCubeRenderer.h
@@ -30,7 +30,7 @@
 #define kpColorSimilarityCubeRenderer_H
 
 
-class QPaintDevice;
+#include <QPaintDevice>
 
 
 class kpColorSimilarityCubeRenderer
diff --git a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityHolder.h b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityHolder.h
index f49304db..29c1446e 100644
--- a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityHolder.h
+++ b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityHolder.h
@@ -30,7 +30,7 @@
 #define kpColorSimilarityHolder_H
 
 
-class QString;
+#include <QString>
 
 
 class kpColorSimilarityHolder
diff --git a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
index bf94f9e7..018bcc0b 100644
--- a/kolourpaint/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
+++ b/kolourpaint/widgets/colorSimilarity/kpColorSimilarityToolBarItem.h
@@ -35,9 +35,9 @@
 #include <QToolButton>
 
 
-class QKeyEvent;
-class QMouseEvent;
-class QTimer;
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QTimer>
 
 
 class kpColorSimilarityToolBarItem : public QToolButton,
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectBalanceWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectBalanceWidget.h
index 209d87e6..0236e8e6 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectBalanceWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectBalanceWidget.h
@@ -34,7 +34,7 @@
 #include <kpImage.h>
 
 
-class QLabel;
+#include <QLabel>
 
 class KComboBox;
 class KIntNumInput;
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
index 4533e242..896f66f0 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectBlurSharpenWidget.h
@@ -36,7 +36,7 @@
 #include <kpEffectBlurSharpen.h>
 
 
-class QLabel;
+#include <QLabel>
 
 class KIntNumInput;
 
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectEmbossWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectEmbossWidget.h
index 08314b8e..f7442e6b 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectEmbossWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectEmbossWidget.h
@@ -34,7 +34,7 @@
 #include <kpEffectWidgetBase.h>
 
 
-class QCheckBox;
+#include <QCheckBox>
 
 class KIntNumInput;
 
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectFlattenWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectFlattenWidget.h
index 4fa29c52..dc3e7659 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectFlattenWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectFlattenWidget.h
@@ -35,7 +35,7 @@
 #include <kpEffectWidgetBase.h>
 
 
-class QCheckBox;
+#include <QCheckBox>
 
 class KColorButton;
 
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectInvertWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectInvertWidget.h
index df18a128..9413947d 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectInvertWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectInvertWidget.h
@@ -33,7 +33,7 @@
 #include <kpEffectWidgetBase.h>
 
 
-class QCheckBox;
+#include <QCheckBox>
 
 
 class kpEffectInvertWidget : public kpEffectWidgetBase
diff --git a/kolourpaint/widgets/imagelib/effects/kpEffectReduceColorsWidget.h b/kolourpaint/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
index 02597dd8..0fd0066f 100644
--- a/kolourpaint/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
+++ b/kolourpaint/widgets/imagelib/effects/kpEffectReduceColorsWidget.h
@@ -33,7 +33,7 @@
 #include <kpEffectWidgetBase.h>
 
 
-class QRadioButton;
+#include <QRadioButton>
 
 
 class kpEffectReduceColorsWidget : public kpEffectWidgetBase
diff --git a/kolourpaint/widgets/kpColorCells.h b/kolourpaint/widgets/kpColorCells.h
index f17bb5b6..571458ba 100644
--- a/kolourpaint/widgets/kpColorCells.h
+++ b/kolourpaint/widgets/kpColorCells.h
@@ -35,7 +35,7 @@
 #include <kpColorCellsBase.h>
 
 
-class QDropEvent;
+#include <QDropEvent>
 
 class kpColorCollection;
 
diff --git a/kolourpaint/widgets/kpDocumentSaveOptionsWidget.h b/kolourpaint/widgets/kpDocumentSaveOptionsWidget.h
index 5592b430..abe769c7 100644
--- a/kolourpaint/widgets/kpDocumentSaveOptionsWidget.h
+++ b/kolourpaint/widgets/kpDocumentSaveOptionsWidget.h
@@ -39,9 +39,9 @@
 
 
 class KComboBox;
-class QImage;
-class QLabel;
-class QTimer;
+#include <QImage>
+#include <QLabel>
+#include <QTimer>
 
 class KIntNumInput;
 class KPushButton;
diff --git a/kolourpaint/widgets/toolbars/kpColorToolBar.h b/kolourpaint/widgets/toolbars/kpColorToolBar.h
index e36abf64..f1b1c126 100644
--- a/kolourpaint/widgets/toolbars/kpColorToolBar.h
+++ b/kolourpaint/widgets/toolbars/kpColorToolBar.h
@@ -37,7 +37,7 @@
 #include <kpColor.h>
 
 
-class QBoxLayout;
+#include <QBoxLayout>
 
 class kpColorCells;
 class kpColorPalette;
diff --git a/kolourpaint/widgets/toolbars/kpToolToolBar.h b/kolourpaint/widgets/toolbars/kpToolToolBar.h
index d693487a..df927652 100644
--- a/kolourpaint/widgets/toolbars/kpToolToolBar.h
+++ b/kolourpaint/widgets/toolbars/kpToolToolBar.h
@@ -36,11 +36,11 @@
 #include <KToolBar>
 
 
-class QAbstractButton;
-class QBoxLayout;
-class QButtonGroup;
-class QGridLayout;
-class QWidget;
+#include <QAbstractButton>
+#include <QBoxLayout>
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QWidget>
 
 class kpTool;
 class kpToolButton;
diff --git a/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.h b/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.h
index 28109d16..9d991596 100644
--- a/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.h
+++ b/kolourpaint/widgets/toolbars/options/kpToolWidgetBase.h
@@ -38,7 +38,7 @@
 #include <qwidget.h>
 
 
-class QMouseEvent;
+#include <QMouseEvent>
 
 
 // TODO: This is a crazy and overcomplicated class that invents its own (buggy)
diff --git a/kolourpaint/widgets/toolbars/options/kpToolWidgetFillStyle.h b/kolourpaint/widgets/toolbars/options/kpToolWidgetFillStyle.h
index 3238d689..1313e005 100644
--- a/kolourpaint/widgets/toolbars/options/kpToolWidgetFillStyle.h
+++ b/kolourpaint/widgets/toolbars/options/kpToolWidgetFillStyle.h
@@ -33,8 +33,8 @@
 #include <kpToolWidgetBase.h>
 
 
-class QBrush;
-class QPixmap;
+#include <QBrush>
+#include <QPixmap>
 
 class kpColor;
 
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index cc985ca8..98057f85 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -27,8 +27,8 @@
 
 #include "kompareinterface.h"
 
-class QPrinter;
-class QWidget;
+#include <QPrinter>
+#include <QWidget>
 
 class KTemporaryFile;
 class KUrl;
diff --git a/kompare/komparepart/komparesaveoptionswidget.h b/kompare/komparepart/komparesaveoptionswidget.h
index 9c49815b..1a6db553 100644
--- a/kompare/komparepart/komparesaveoptionswidget.h
+++ b/kompare/komparepart/komparesaveoptionswidget.h
@@ -24,7 +24,7 @@
 #include "komparesaveoptionsbase.h"
 
 class DiffSettings;
-class QButtonGroup;
+#include <QButtonGroup>
 
 class KompareSaveOptionsWidget : public KompareSaveOptionsBase, public KompareFunctions
 {
diff --git a/kompare/komparepart/komparesplitter.h b/kompare/komparepart/komparesplitter.h
index 11a344f2..8bc9016d 100644
--- a/kompare/komparepart/komparesplitter.h
+++ b/kompare/komparepart/komparesplitter.h
@@ -22,11 +22,11 @@
 
 #include "komparemodellist.h"
 
-class QSplitterHandle;
-class QTimer;
-class QScrollBar;
-class QWheelEvent;
-class QKeyEvent;
+#include <QSplitterHandle>
+#include <QTimer>
+#include <QScrollBar>
+#include <QWheelEvent>
+#include <QKeyEvent>
 
 namespace Diff2 {
 class DiffModel;
diff --git a/kompare/libdialogpages/diffpage.h b/kompare/libdialogpages/diffpage.h
index 37490b1e..92fef042 100644
--- a/kompare/libdialogpages/diffpage.h
+++ b/kompare/libdialogpages/diffpage.h
@@ -22,12 +22,12 @@
 #include "pagebase.h"
 #include "dialogpagesexport.h"
 
-class QCheckBox;
-class QDialog;
-class QSpinBox;
-class QStringList;
-class QButtonGroup;
-class QGroupBox;
+#include <QCheckBox>
+#include <QDialog>
+#include <QSpinBox>
+#include <QStringList>
+#include <QButtonGroup>
+#include <QGroupBox>
 
 class KLineEdit;
 class KEditListWidget;
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 42afafcd..84ce981e 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -22,7 +22,7 @@
 #include "pagebase.h"
 #include "dialogpagesexport.h"
 
-class QGroupBox;
+#include <QGroupBox>
 
 class KComboBox;
 class KUrlComboBox;
diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h
index b5b770d1..ac5a9237 100644
--- a/kompare/libdialogpages/viewpage.h
+++ b/kompare/libdialogpages/viewpage.h
@@ -22,8 +22,8 @@
 #include "pagebase.h"
 #include "dialogpagesexport.h"
 
-class QFontComboBox;
-class QSpinBox;
+#include <QFontComboBox>
+#include <QSpinBox>
 
 class KColorButton;
 class KTabWidget;
diff --git a/kompare/libkomparediff2/difference.h b/kompare/libkomparediff2/difference.h
index 03ab1e02..eb45b88b 100644
--- a/kompare/libkomparediff2/difference.h
+++ b/kompare/libkomparediff2/difference.h
@@ -24,7 +24,7 @@
 #include "diff2export.h"
 #include "marker.h"
 
-class QString;
+#include <QString>
 
 namespace Diff2
 {
diff --git a/kompare/libkomparediff2/kompareprocess.h b/kompare/libkomparediff2/kompareprocess.h
index 288d9399..32b4c502 100644
--- a/kompare/libkomparediff2/kompareprocess.h
+++ b/kompare/libkomparediff2/kompareprocess.h
@@ -23,7 +23,7 @@
 
 #include "kompare.h"
 
-class QTextDecoder;
+#include <QTextDecoder>
 
 class DiffSettings;
 
diff --git a/kompare/libkomparediff2/parserbase.h b/kompare/libkomparediff2/parserbase.h
index b6ec269a..603fa5da 100644
--- a/kompare/libkomparediff2/parserbase.h
+++ b/kompare/libkomparediff2/parserbase.h
@@ -23,8 +23,8 @@
 #include "difference.h"
 #include "diffmodellist.h"
 
-class QStringList;
-class QString;
+#include <QStringList>
+#include <QString>
 
 namespace Diff2
 {
diff --git a/kompare/libkomparediff2/settingsbase.h b/kompare/libkomparediff2/settingsbase.h
index ee1284b9..3f3cb159 100644
--- a/kompare/libkomparediff2/settingsbase.h
+++ b/kompare/libkomparediff2/settingsbase.h
@@ -23,7 +23,7 @@
 #include "kompare.h"
 #include "diff2export.h"
 
-class QWidget;
+#include <QWidget>
 class KConfig;
 
 class DIFF2_EXPORT SettingsBase : public QObject
diff --git a/krdc/config/hostpreferenceslist.h b/krdc/config/hostpreferenceslist.h
index 050cae08..9a088719 100644
--- a/krdc/config/hostpreferenceslist.h
+++ b/krdc/config/hostpreferenceslist.h
@@ -33,7 +33,7 @@
 
 class KPushButton;
 
-class QListWidget;
+#include <QListWidget>
 
 class HostPreferencesList : public QWidget
 {
diff --git a/krdc/core/hostpreferences.h b/krdc/core/hostpreferences.h
index eb345ed6..d5bb9321 100644
--- a/krdc/core/hostpreferences.h
+++ b/krdc/core/hostpreferences.h
@@ -34,8 +34,8 @@
 
 #include <QSize>
 
-class QCheckBox;
-class QWidget;
+#include <QCheckBox>
+#include <QWidget>
 class KConfig;
 class KConfigGroup;
 
diff --git a/krdc/mainwindow.h b/krdc/mainwindow.h
index e3a9266d..bfa0b12c 100644
--- a/krdc/mainwindow.h
+++ b/krdc/mainwindow.h
@@ -44,9 +44,9 @@ class RemoteView;
 class SystemTrayIcon;
 class TabbedViewWidget;
 
-class QScrollArea;
-class QModelIndex;
-class QTableView;
+#include <QScrollArea>
+#include <QModelIndex>
+#include <QTableView>
 
 #ifdef TELEPATHY_SUPPORT
 class TubesManager;
diff --git a/krdc/rdp/rdpview.h b/krdc/rdp/rdpview.h
index d548879a..4870638b 100644
--- a/krdc/rdp/rdpview.h
+++ b/krdc/rdp/rdpview.h
@@ -35,7 +35,7 @@
 
 class RdpView;
 
-class QX11EmbedContainer;
+#include <QX11EmbedContainer>
 
 class RdpView : public RemoteView
 {
diff --git a/krfb/framebuffers/qt/qtframebuffer.h b/krfb/framebuffers/qt/qtframebuffer.h
index ee97ea79..fbf5d0b2 100644
--- a/krfb/framebuffers/qt/qtframebuffer.h
+++ b/krfb/framebuffers/qt/qtframebuffer.h
@@ -13,7 +13,7 @@
 #include <QImage>
 #include "framebuffer.h"
 
-class QTimer;
+#include <QTimer>
 /**
     @author Alessandro Praduroux <pradu@pradu.it>
 */
diff --git a/ksnapshot/freeregiongrabber.h b/ksnapshot/freeregiongrabber.h
index 0a327c3a..595e9451 100644
--- a/ksnapshot/freeregiongrabber.h
+++ b/ksnapshot/freeregiongrabber.h
@@ -25,8 +25,8 @@
 #include <QRect>
 #include <QPolygon>
 
-class QPaintEvent;
-class QMouseEvent;
+#include <QPaintEvent>
+#include <QMouseEvent>
 
 class FreeRegionGrabber : public QWidget
 {
diff --git a/ksnapshot/kbackgroundsnapshot.h b/ksnapshot/kbackgroundsnapshot.h
index f58f3171..62be7cea 100644
--- a/ksnapshot/kbackgroundsnapshot.h
+++ b/ksnapshot/kbackgroundsnapshot.h
@@ -23,7 +23,7 @@
 #include "ksnapshotobject.h"
 #include <QObject>
 
-class QPixmap;
+#include <QPixmap>
 
 class KBackgroundSnapshot: public QObject, public KSnapshotObject
 {
diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h
index 8b5fe299..41ae15ad 100644
--- a/ksnapshot/ksnapshot.h
+++ b/ksnapshot/ksnapshot.h
@@ -39,7 +39,7 @@
 #include <config-ksnapshot.h>
 
 class KSnapshotWidget;
-class QMenu;
+#include <QMenu>
 
 #ifdef KIPI_FOUND
 #include "ksnapshotimagecollectionshared.h"
diff --git a/ksnapshot/ksnapshotobject.h b/ksnapshot/ksnapshotobject.h
index c918fac4..9916e9d9 100644
--- a/ksnapshot/ksnapshotobject.h
+++ b/ksnapshot/ksnapshotobject.h
@@ -28,10 +28,10 @@
 
 #include <KUrl>
 #include <QPixmap>
-class QWidget;
+#include <QWidget>
 class RegionGrabber;
 class FreeRegionGrabber;
-class QString;
+#include <QString>
 
 class KSnapshotObject
 {
diff --git a/ksnapshot/regiongrabber.h b/ksnapshot/regiongrabber.h
index 3ade77ba..f8a0b74a 100644
--- a/ksnapshot/regiongrabber.h
+++ b/ksnapshot/regiongrabber.h
@@ -25,9 +25,9 @@
 #include <QVector>
 #include <QRect>
 
-class QPaintEvent;
-class QResizeEvent;
-class QMouseEvent;
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
 
 class RegionGrabber : public QWidget
 {
diff --git a/ksystemlog/src/lib/levelPrintPage.h b/ksystemlog/src/lib/levelPrintPage.h
index 3473eafe..426de5fb 100644
--- a/ksystemlog/src/lib/levelPrintPage.h
+++ b/ksystemlog/src/lib/levelPrintPage.h
@@ -25,11 +25,11 @@
 #include <QWidget>
 #include <QString>
 
-class QButtonGroup;
-class QVBoxLayout;
-class QGridLayout;
-class QCheckBox;
-class QLabel;
+#include <QButtonGroup>
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QLabel>
 
 /**
  @author Bojan Djurkovic
diff --git a/ksystemlog/src/lib/loadingBar.h b/ksystemlog/src/lib/loadingBar.h
index babd00e0..f0676f5c 100644
--- a/ksystemlog/src/lib/loadingBar.h
+++ b/ksystemlog/src/lib/loadingBar.h
@@ -27,7 +27,7 @@
 #include "logMode.h"
 #include "logFile.h"
 
-class QProgressBar;
+#include <QProgressBar>
 class LoadingBarPrivate;
 
 /**
diff --git a/ksystemlog/src/lib/logLine.h b/ksystemlog/src/lib/logLine.h
index e0e9f8a0..e62ab179 100644
--- a/ksystemlog/src/lib/logLine.h
+++ b/ksystemlog/src/lib/logLine.h
@@ -32,8 +32,8 @@
 #include "logLevel.h"
 
 class LogViewWidget;
-class QDateTime;
-class QStringList;
+#include <QDateTime>
+#include <QStringList>
 class LogViewWidgetItem;
 
 class LogLinePrivate;
diff --git a/ksystemlog/src/lib/logMode.h b/ksystemlog/src/lib/logMode.h
index 8cbb2c62..13e161b7 100644
--- a/ksystemlog/src/lib/logMode.h
+++ b/ksystemlog/src/lib/logMode.h
@@ -34,7 +34,7 @@ class LogModeItemBuilder;
 class LogModeConfiguration;
 class LogModeConfigurationWidget;
 
-class QAction;
+#include <QAction>
 
 
 //TODO Do not let this class visible to other classes (except sub-classes)
diff --git a/ksystemlog/src/lib/logViewColumns.h b/ksystemlog/src/lib/logViewColumns.h
index c03c6d22..6f19765f 100644
--- a/ksystemlog/src/lib/logViewColumns.h
+++ b/ksystemlog/src/lib/logViewColumns.h
@@ -26,7 +26,7 @@
 #include <QDataStream>
 
 class LogViewColumn;
-class QStringList;
+#include <QStringList>
 class LogViewColumnsPrivate;
 
 class LogViewColumns {
diff --git a/ksystemlog/src/lib/multipleActions.h b/ksystemlog/src/lib/multipleActions.h
index 73df9778..ea152649 100644
--- a/ksystemlog/src/lib/multipleActions.h
+++ b/ksystemlog/src/lib/multipleActions.h
@@ -33,7 +33,7 @@
 
 #include "logModeAction.h"
 
-class QAction;
+#include <QAction>
 
 /**
  * This class is used by LogModeFactory to provide multiple actions
diff --git a/ksystemlog/src/lib/processOutputLogFileReader.h b/ksystemlog/src/lib/processOutputLogFileReader.h
index a18b1712..66ecdbad 100644
--- a/ksystemlog/src/lib/processOutputLogFileReader.h
+++ b/ksystemlog/src/lib/processOutputLogFileReader.h
@@ -30,7 +30,7 @@
 
 #include "logFileReader.h"
 
-class QProcess;
+#include <QProcess>
 
 class ProcessOutputLogFileReaderPrivate;
 
diff --git a/ksystemlog/src/lib/simpleAction.h b/ksystemlog/src/lib/simpleAction.h
index 74f4a120..692c74f8 100644
--- a/ksystemlog/src/lib/simpleAction.h
+++ b/ksystemlog/src/lib/simpleAction.h
@@ -30,7 +30,7 @@
 
 #include "logModeAction.h"
 
-class QAction;
+#include <QAction>
 
 class SimpleAction : public LogModeAction {
 	
diff --git a/ksystemlog/src/lib/view.h b/ksystemlog/src/lib/view.h
index 7e3672f3..5be43e42 100644
--- a/ksystemlog/src/lib/view.h
+++ b/ksystemlog/src/lib/view.h
@@ -30,8 +30,8 @@
 #include "logViewColumn.h"
 #include "logViewColumns.h"
 
-class QDropEvent;
-class QDragEnterEvent;
+#include <QDropEvent>
+#include <QDragEnterEvent>
 
 
 class LoadingBar;
diff --git a/ksystemlog/src/mainWindow.h b/ksystemlog/src/mainWindow.h
index 38904cc4..65cd0bbc 100644
--- a/ksystemlog/src/mainWindow.h
+++ b/ksystemlog/src/mainWindow.h
@@ -32,7 +32,7 @@
 
 #include <ktoggleaction.h>
 
-class QAction;
+#include <QAction>
 
 class LogManager;
 class LogMode;
diff --git a/ksystemlog/src/modes/base/fileList.h b/ksystemlog/src/modes/base/fileList.h
index 46ae9783..0672be8e 100644
--- a/ksystemlog/src/modes/base/fileList.h
+++ b/ksystemlog/src/modes/base/fileList.h
@@ -29,7 +29,7 @@
 
 #include "ui_fileListBase.h"
 
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 class FileList : public QWidget, public Ui::FileListBase {
 
diff --git a/ksystemlog/src/modes/base/fileListHelper.h b/ksystemlog/src/modes/base/fileListHelper.h
index c930e42e..d80a2214 100644
--- a/ksystemlog/src/modes/base/fileListHelper.h
+++ b/ksystemlog/src/modes/base/fileListHelper.h
@@ -27,8 +27,8 @@
 
 #include <kurl.h>
 
-class QAction;
-class QPushButton;
+#include <QAction>
+#include <QPushButton>
 
 /**
  * Class which maintains common behavior between 
diff --git a/ksystemlog/src/modes/base/logLevelFileList.h b/ksystemlog/src/modes/base/logLevelFileList.h
index 22147a55..714d1a34 100644
--- a/ksystemlog/src/modes/base/logLevelFileList.h
+++ b/ksystemlog/src/modes/base/logLevelFileList.h
@@ -24,7 +24,7 @@
 
 #include "fileList.h"
 
-class QPushButton;
+#include <QPushButton>
 class LogLevel;
 
 
diff --git a/ksystemlog/src/modes/open/openLogMode.h b/ksystemlog/src/modes/open/openLogMode.h
index f05e0860..54a69644 100644
--- a/ksystemlog/src/modes/open/openLogMode.h
+++ b/ksystemlog/src/modes/open/openLogMode.h
@@ -40,7 +40,7 @@
 
 #include "logMode.h"
 
-class QWidget;
+#include <QWidget>
 
 class OpenLogMode : public LogMode {
 	
diff --git a/ksystemlog/src/statusBar.h b/ksystemlog/src/statusBar.h
index c886a0d7..f985db44 100644
--- a/ksystemlog/src/statusBar.h
+++ b/ksystemlog/src/statusBar.h
@@ -25,7 +25,7 @@
 
 #include <kstatusbar.h>
 
-class QString;
+#include <QString>
 
 
 
diff --git a/ksystemlog/src/tabLogManager.h b/ksystemlog/src/tabLogManager.h
index e7864a31..ba072149 100644
--- a/ksystemlog/src/tabLogManager.h
+++ b/ksystemlog/src/tabLogManager.h
@@ -25,7 +25,7 @@
 
 #include <QObject>
 
-class QString;
+#include <QString>
 
 class LogManager;
 
diff --git a/ksystemlog/src/tabLogViewsWidget.h b/ksystemlog/src/tabLogViewsWidget.h
index 85d368e5..5f0b5ade 100644
--- a/ksystemlog/src/tabLogViewsWidget.h
+++ b/ksystemlog/src/tabLogViewsWidget.h
@@ -25,8 +25,8 @@
 #include <ktabwidget.h>
 #include <QList>
 
-class QString;
-class QIcon;
+#include <QString>
+#include <QIcon>
 
 class LogManager;
 class TabLogManager;
diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h
index acd5c3c7..e78e204a 100644
--- a/ktimer/ktimer.h
+++ b/ktimer/ktimer.h
@@ -24,7 +24,7 @@
 #include <QProcess>
 #include "ui_prefwidget.h"
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 class KConfig;
 
 class KTimerJob : public QObject {
diff --git a/kuassel/src/client/abstractui.h b/kuassel/src/client/abstractui.h
index 74c53866..4b2a9152 100644
--- a/kuassel/src/client/abstractui.h
+++ b/kuassel/src/client/abstractui.h
@@ -30,8 +30,8 @@ class MessageModel;
 class AbstractMessageProcessor;
 class AbstractActionProvider;
 
-class QAction;
-class QMenu;
+#include <QAction>
+#include <QMenu>
 
 class AbstractUi : public QObject
 {
diff --git a/kuassel/src/client/buffermodel.h b/kuassel/src/client/buffermodel.h
index 05ddbef0..95960ddf 100644
--- a/kuassel/src/client/buffermodel.h
+++ b/kuassel/src/client/buffermodel.h
@@ -30,7 +30,7 @@
 #include "types.h"
 #include "selectionmodelsynchronizer.h"
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 class BufferModel : public QSortFilterProxyModel
 {
diff --git a/kuassel/src/client/clientauthhandler.h b/kuassel/src/client/clientauthhandler.h
index f6f2fc93..01ee8ee0 100644
--- a/kuassel/src/client/clientauthhandler.h
+++ b/kuassel/src/client/clientauthhandler.h
@@ -25,7 +25,7 @@
 #include "authhandler.h"
 #include "coreaccount.h"
 
-class QSslSocket;
+#include <QSslSocket>
 
 class RemotePeer;
 
diff --git a/kuassel/src/client/clientsettings.h b/kuassel/src/client/clientsettings.h
index 55f1814a..5a2305bd 100644
--- a/kuassel/src/client/clientsettings.h
+++ b/kuassel/src/client/clientsettings.h
@@ -25,8 +25,8 @@
 
 #include "types.h"
 
-class QHostAddress;
-class QSslSocket;
+#include <QHostAddress>
+#include <QSslSocket>
 
 class ClientSettings : public Settings
 {
diff --git a/kuassel/src/client/clienttransfer.h b/kuassel/src/client/clienttransfer.h
index 9753f41b..ea82a7af 100644
--- a/kuassel/src/client/clienttransfer.h
+++ b/kuassel/src/client/clienttransfer.h
@@ -25,7 +25,7 @@
 
 #include "transfer.h"
 
-class QFile;
+#include <QFile>
 
 class ClientTransfer : public Transfer
 {
diff --git a/kuassel/src/client/selectionmodelsynchronizer.h b/kuassel/src/client/selectionmodelsynchronizer.h
index f6b2e05c..21e464cf 100644
--- a/kuassel/src/client/selectionmodelsynchronizer.h
+++ b/kuassel/src/client/selectionmodelsynchronizer.h
@@ -24,7 +24,7 @@
 #include <QObject>
 #include <QItemSelectionModel>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 class SelectionModelSynchronizer : public QObject
 {
diff --git a/kuassel/src/common/bufferinfo.h b/kuassel/src/common/bufferinfo.h
index bcd0d1aa..daad092f 100644
--- a/kuassel/src/common/bufferinfo.h
+++ b/kuassel/src/common/bufferinfo.h
@@ -23,8 +23,8 @@
 
 #include "types.h"
 
-class QString;
-class QDataStream;
+#include <QString>
+#include <QDataStream>
 
 class BufferInfo
 {
diff --git a/kuassel/src/common/compressor.h b/kuassel/src/common/compressor.h
index f99c31fb..735ef68a 100644
--- a/kuassel/src/common/compressor.h
+++ b/kuassel/src/common/compressor.h
@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-class QTcpSocket;
+#include <QTcpSocket>
 
 typedef struct z_stream_s *z_streamp;
 
diff --git a/kuassel/src/common/internalpeer.h b/kuassel/src/common/internalpeer.h
index 1a52fda7..2e667885 100644
--- a/kuassel/src/common/internalpeer.h
+++ b/kuassel/src/common/internalpeer.h
@@ -25,7 +25,7 @@
 #include "protocol.h"
 #include "signalproxy.h"
 
-class QEvent;
+#include <QEvent>
 
 class InternalPeer : public Peer
 {
diff --git a/kuassel/src/common/peerfactory.h b/kuassel/src/common/peerfactory.h
index 6b1bdf3c..e441fb89 100644
--- a/kuassel/src/common/peerfactory.h
+++ b/kuassel/src/common/peerfactory.h
@@ -26,8 +26,8 @@
 #include "compressor.h"
 #include "protocol.h"
 
-class QObject;
-class QTcpSocket;
+#include <QObject>
+#include <QTcpSocket>
 
 class AuthHandler;
 class RemotePeer;
diff --git a/kuassel/src/common/protocols/datastream/datastreampeer.h b/kuassel/src/common/protocols/datastream/datastreampeer.h
index e01fb347..4225e3af 100644
--- a/kuassel/src/common/protocols/datastream/datastreampeer.h
+++ b/kuassel/src/common/protocols/datastream/datastreampeer.h
@@ -23,7 +23,7 @@
 
 #include "../../remotepeer.h"
 
-class QDataStream;
+#include <QDataStream>
 
 class DataStreamPeer : public RemotePeer
 {
diff --git a/kuassel/src/common/quassel.h b/kuassel/src/common/quassel.h
index 5e85662f..9d6725c4 100644
--- a/kuassel/src/common/quassel.h
+++ b/kuassel/src/common/quassel.h
@@ -28,7 +28,7 @@
 
 #include "abstractcliparser.h"
 
-class QFile;
+#include <QFile>
 
 class Quassel
 {
diff --git a/kuassel/src/common/remotepeer.h b/kuassel/src/common/remotepeer.h
index 44898297..857fa14a 100644
--- a/kuassel/src/common/remotepeer.h
+++ b/kuassel/src/common/remotepeer.h
@@ -28,7 +28,7 @@
 #include "protocol.h"
 #include "signalproxy.h"
 
-class QTimer;
+#include <QTimer>
 
 class AuthHandler;
 
diff --git a/kuassel/src/common/signalproxy.h b/kuassel/src/common/signalproxy.h
index 97efc2d7..82354d55 100644
--- a/kuassel/src/common/signalproxy.h
+++ b/kuassel/src/common/signalproxy.h
@@ -26,8 +26,8 @@
 
 #include "protocol.h"
 
-struct QMetaObject;
-class QIODevice;
+#include <QMetaObject>
+#include <QIODevice>
 
 class Peer;
 class SyncableObject;
diff --git a/kuassel/src/common/util.cpp b/kuassel/src/common/util.cpp
index 28c0a423..31be631c 100644
--- a/kuassel/src/common/util.cpp
+++ b/kuassel/src/common/util.cpp
@@ -27,7 +27,7 @@
 
 #include "quassel.h"
 
-class QMetaMethod;
+#include <QMetaMethod>
 
 // MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1
 static QList<int> utf8DetectionBlacklist = QList<int>()
diff --git a/kuassel/src/core/coreirclisthelper.h b/kuassel/src/core/coreirclisthelper.h
index 3b214523..67a31572 100644
--- a/kuassel/src/core/coreirclisthelper.h
+++ b/kuassel/src/core/coreirclisthelper.h
@@ -25,7 +25,7 @@
 
 #include "coresession.h"
 
-class QTimerEvent;
+#include <QTimerEvent>
 
 class CoreIrcListHelper : public IrcListHelper
 {
diff --git a/kuassel/src/core/coresession.h b/kuassel/src/core/coresession.h
index ade372a3..8fed0837 100644
--- a/kuassel/src/core/coresession.h
+++ b/kuassel/src/core/coresession.h
@@ -53,7 +53,7 @@ class SignalProxy;
 
 struct NetworkInfo;
 
-class QScriptEngine;
+#include <QScriptEngine>
 
 class CoreSession : public QObject
 {
diff --git a/kuassel/src/core/coretransfer.h b/kuassel/src/core/coretransfer.h
index 85248e61..45ebf4f7 100644
--- a/kuassel/src/core/coretransfer.h
+++ b/kuassel/src/core/coretransfer.h
@@ -26,7 +26,7 @@
 #include "transfer.h"
 #include "peer.h"
 
-class QTcpSocket;
+#include <QTcpSocket>
 
 class CoreTransfer : public Transfer
 {
diff --git a/kuassel/src/core/sessionthread.h b/kuassel/src/core/sessionthread.h
index 12b5ef3c..19894b87 100644
--- a/kuassel/src/core/sessionthread.h
+++ b/kuassel/src/core/sessionthread.h
@@ -29,7 +29,7 @@
 class CoreSession;
 class InternalPeer;
 class RemotePeer;
-class QIODevice;
+#include <QIODevice>
 
 class SessionThread : public QThread
 {
diff --git a/kuassel/src/core/sqlitestorage.h b/kuassel/src/core/sqlitestorage.h
index b2038dc4..bfe2de2c 100644
--- a/kuassel/src/core/sqlitestorage.h
+++ b/kuassel/src/core/sqlitestorage.h
@@ -25,7 +25,7 @@
 
 #include <QSqlDatabase>
 
-class QSqlQuery;
+#include <QSqlQuery>
 
 class SqliteStorage : public AbstractSqlStorage
 {
diff --git a/kuassel/src/qtui/bufferwidget.h b/kuassel/src/qtui/bufferwidget.h
index 88d5a4e5..f32c6104 100644
--- a/kuassel/src/qtui/bufferwidget.h
+++ b/kuassel/src/qtui/bufferwidget.h
@@ -25,7 +25,7 @@
 
 #include "abstractbuffercontainer.h"
 
-class QGraphicsItem;
+#include <QGraphicsItem>
 class ChatView;
 class ChatViewSearchBar;
 class ChatViewSearchController;
diff --git a/kuassel/src/qtui/channellistdlg.h b/kuassel/src/qtui/channellistdlg.h
index 61cd1395..f8f636bb 100644
--- a/kuassel/src/qtui/channellistdlg.h
+++ b/kuassel/src/qtui/channellistdlg.h
@@ -29,7 +29,7 @@
 
 #include <QSortFilterProxyModel>
 
-class QSpacerItem;
+#include <QSpacerItem>
 
 class ChannelListDlg : public QDialog
 {
diff --git a/kuassel/src/qtui/chatscene.h b/kuassel/src/qtui/chatscene.h
index af73e08f..f5df7226 100644
--- a/kuassel/src/qtui/chatscene.h
+++ b/kuassel/src/qtui/chatscene.h
@@ -40,7 +40,7 @@ class ColumnHandleItem;
 class MarkerLineItem;
 class WebPreviewItem;
 
-class QGraphicsSceneMouseEvent;
+#include <QGraphicsSceneMouseEvent>
 
 class ChatScene : public QGraphicsScene
 {
diff --git a/kuassel/src/qtui/chatview.h b/kuassel/src/qtui/chatview.h
index 9d7f3a98..a1a3cb70 100644
--- a/kuassel/src/qtui/chatview.h
+++ b/kuassel/src/qtui/chatview.h
@@ -32,7 +32,7 @@ class Buffer;
 class ChatLine;
 class ChatScene;
 class MessageFilter;
-class QMenu;
+#include <QMenu>
 
 class ChatView : public QGraphicsView, public AbstractChatView
 {
diff --git a/kuassel/src/qtui/chatviewsearchbar.h b/kuassel/src/qtui/chatviewsearchbar.h
index 3305eb11..bcbbedb0 100644
--- a/kuassel/src/qtui/chatviewsearchbar.h
+++ b/kuassel/src/qtui/chatviewsearchbar.h
@@ -26,7 +26,7 @@
 #include <QWidget>
 #include <QTimer>
 
-class QAction;
+#include <QAction>
 
 class ChatViewSearchBar : public QWidget
 {
diff --git a/kuassel/src/qtui/chatviewsearchcontroller.h b/kuassel/src/qtui/chatviewsearchcontroller.h
index 9d5506ca..cac4b8ca 100644
--- a/kuassel/src/qtui/chatviewsearchcontroller.h
+++ b/kuassel/src/qtui/chatviewsearchcontroller.h
@@ -30,7 +30,7 @@
 #include "chatscene.h"
 #include "message.h"
 
-class QGraphicsItem;
+#include <QGraphicsItem>
 class ChatLine;
 class SearchHighlightItem;
 
diff --git a/kuassel/src/qtui/debugbufferviewoverlay.h b/kuassel/src/qtui/debugbufferviewoverlay.h
index e75cd8b4..e79fdaf9 100644
--- a/kuassel/src/qtui/debugbufferviewoverlay.h
+++ b/kuassel/src/qtui/debugbufferviewoverlay.h
@@ -23,9 +23,9 @@
 
 #include "ui_debugbufferviewoverlay.h"
 
-class QLabel;
-class QLineEdit;
-class QTextEdit;
+#include <QLabel>
+#include <QLineEdit>
+#include <QTextEdit>
 
 class DebugBufferViewOverlay : public QWidget
 {
diff --git a/kuassel/src/qtui/dockmanagernotificationbackend.h b/kuassel/src/qtui/dockmanagernotificationbackend.h
index 70efb006..c6ecfd37 100644
--- a/kuassel/src/qtui/dockmanagernotificationbackend.h
+++ b/kuassel/src/qtui/dockmanagernotificationbackend.h
@@ -27,7 +27,7 @@
 #include "abstractnotificationbackend.h"
 #include "settingspage.h"
 
-class QCheckBox;
+#include <QCheckBox>
 
 class DockManagerNotificationBackend : public AbstractNotificationBackend
 {
diff --git a/kuassel/src/qtui/mainwin.h b/kuassel/src/qtui/mainwin.h
index 176be091..2785af90 100644
--- a/kuassel/src/qtui/mainwin.h
+++ b/kuassel/src/qtui/mainwin.h
@@ -44,9 +44,9 @@ class SystemTray;
 class ChatMonitorView;
 class TopicWidget;
 
-class QMenu;
-class QLabel;
-class QToolBar;
+#include <QMenu>
+#include <QLabel>
+#include <QToolBar>
 class KHelpMenu;
 
 //!\brief The main window of Quassel's QtUi.
diff --git a/kuassel/src/qtui/nicklistwidget.h b/kuassel/src/qtui/nicklistwidget.h
index a3b84365..0df78099 100644
--- a/kuassel/src/qtui/nicklistwidget.h
+++ b/kuassel/src/qtui/nicklistwidget.h
@@ -32,7 +32,7 @@
 
 class Buffer;
 class NickView;
-class QDockWidget;
+#include <QDockWidget>
 
 class NickListWidget : public AbstractItemView
 {
diff --git a/kuassel/src/qtui/settingspages/identitiessettingspage.h b/kuassel/src/qtui/settingspages/identitiessettingspage.h
index be0e9460..92f5753a 100644
--- a/kuassel/src/qtui/settingspages/identitiessettingspage.h
+++ b/kuassel/src/qtui/settingspages/identitiessettingspage.h
@@ -30,7 +30,7 @@
 #include "ui_createidentitydlg.h"
 #include "ui_saveidentitiesdlg.h"
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 class IdentitiesSettingsPage : public SettingsPage
 {
diff --git a/kuassel/src/qtui/settingspages/ignorelistsettingspage.h b/kuassel/src/qtui/settingspages/ignorelistsettingspage.h
index 91a0af32..2c4c2c77 100644
--- a/kuassel/src/qtui/settingspages/ignorelistsettingspage.h
+++ b/kuassel/src/qtui/settingspages/ignorelistsettingspage.h
@@ -30,9 +30,9 @@
 #include "ignorelistmodel.h"
 #include "clientignorelistmanager.h"
 
-class QEvent;
-class QPainter;
-class QAbstractItemModel;
+#include <QEvent>
+#include <QPainter>
+#include <QAbstractItemModel>
 
 // the delegate is used to draw the checkbox in column 0
 class IgnoreListDelegate : public QStyledItemDelegate
diff --git a/kuassel/src/qtui/settingspages/itemviewsettingspage.h b/kuassel/src/qtui/settingspages/itemviewsettingspage.h
index 89ca8bab..27f92fb1 100644
--- a/kuassel/src/qtui/settingspages/itemviewsettingspage.h
+++ b/kuassel/src/qtui/settingspages/itemviewsettingspage.h
@@ -25,8 +25,8 @@
 #include "ui_itemviewsettingspage.h"
 
 class ColorButton;
-class QSignalMapper;
-class QTreeWidgetItem;
+#include <QSignalMapper>
+#include <QTreeWidgetItem>
 
 class ItemViewSettingsPage : public SettingsPage
 {
diff --git a/kuassel/src/qtui/sslinfodlg.h b/kuassel/src/qtui/sslinfodlg.h
index 067cc4c5..d1b37811 100644
--- a/kuassel/src/qtui/sslinfodlg.h
+++ b/kuassel/src/qtui/sslinfodlg.h
@@ -26,7 +26,7 @@
 
 #include "ui_sslinfodlg.h"
 
-class QSslSocket;
+#include <QSslSocket>
 
 // ========================================
 //  SslInfoDialog
diff --git a/kuassel/src/qtui/systemtray.h b/kuassel/src/qtui/systemtray.h
index a359ae16..a40f687c 100644
--- a/kuassel/src/qtui/systemtray.h
+++ b/kuassel/src/qtui/systemtray.h
@@ -24,7 +24,7 @@
 #include <QIcon>
 
 class Action;
-class QMenu;
+#include <QMenu>
 
 class SystemTray : public QObject
 {
diff --git a/kuassel/src/qtui/systraynotificationbackend.h b/kuassel/src/qtui/systraynotificationbackend.h
index 5d993713..55cf79a8 100644
--- a/kuassel/src/qtui/systraynotificationbackend.h
+++ b/kuassel/src/qtui/systraynotificationbackend.h
@@ -25,7 +25,7 @@
 #include "settingspage.h"
 #include "systemtray.h"
 
-class QCheckBox;
+#include <QCheckBox>
 
 class SystrayNotificationBackend : public AbstractNotificationBackend
 {
diff --git a/kuassel/src/qtui/taskbarnotificationbackend.h b/kuassel/src/qtui/taskbarnotificationbackend.h
index 5536d668..c3628d99 100644
--- a/kuassel/src/qtui/taskbarnotificationbackend.h
+++ b/kuassel/src/qtui/taskbarnotificationbackend.h
@@ -25,8 +25,8 @@
 
 #include "settingspage.h"
 
-class QCheckBox;
-class QSpinBox;
+#include <QCheckBox>
+#include <QSpinBox>
 
 class TaskbarNotificationBackend : public AbstractNotificationBackend
 {
diff --git a/kuassel/src/uisupport/clearablelineedit.h b/kuassel/src/uisupport/clearablelineedit.h
index d55be74d..4e4812eb 100644
--- a/kuassel/src/uisupport/clearablelineedit.h
+++ b/kuassel/src/uisupport/clearablelineedit.h
@@ -23,7 +23,7 @@
 
 #include <QLineEdit>
 
-class QToolButton;
+#include <QToolButton>
 
 class ClearableLineEdit : public QLineEdit
 {
diff --git a/kuassel/src/uisupport/clickable.h b/kuassel/src/uisupport/clickable.h
index d64c1402..a439ecde 100644
--- a/kuassel/src/uisupport/clickable.h
+++ b/kuassel/src/uisupport/clickable.h
@@ -25,7 +25,7 @@
 
 #include "types.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 class Clickable
 {
diff --git a/kuassel/src/uisupport/multilineedit.h b/kuassel/src/uisupport/multilineedit.h
index 2d387c9d..a16574e7 100644
--- a/kuassel/src/uisupport/multilineedit.h
+++ b/kuassel/src/uisupport/multilineedit.h
@@ -27,7 +27,7 @@
 #include <KTextEdit>
 #define MultiLineEditParent KTextEdit
 
-class QKeyEvent;
+#include <QKeyEvent>
 class TabCompleter;
 
 class MultiLineEdit : public MultiLineEditParent
diff --git a/kuassel/src/uisupport/networkmodelcontroller.h b/kuassel/src/uisupport/networkmodelcontroller.h
index 11dd97a6..c15051f6 100644
--- a/kuassel/src/uisupport/networkmodelcontroller.h
+++ b/kuassel/src/uisupport/networkmodelcontroller.h
@@ -27,9 +27,9 @@
 #include "actioncollection.h"
 #include "messagefilter.h"
 
-class QComboBox;
-class QDialogButtonBox;
-class QLineEdit;
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QLineEdit>
 
 class NetworkModelController : public QObject
 {
diff --git a/kuassel/src/uisupport/settingspage.h b/kuassel/src/uisupport/settingspage.h
index ccd93fba..73466c65 100644
--- a/kuassel/src/uisupport/settingspage.h
+++ b/kuassel/src/uisupport/settingspage.h
@@ -23,9 +23,9 @@
 
 #include <QWidget>
 
-class QCheckBox;
-class QComboBox;
-class QSpinBox;
+#include <QCheckBox>
+#include <QComboBox>
+#include <QSpinBox>
 
 //! A SettingsPage is a page in the settings dialog.
 /** The SettingsDlg provides suitable standard buttons, such as Ok, Apply, Cancel, Restore Defaults and Reset.
diff --git a/kuassel/src/uisupport/toolbaractionprovider.h b/kuassel/src/uisupport/toolbaractionprovider.h
index ab3e6bd2..89c92176 100644
--- a/kuassel/src/uisupport/toolbaractionprovider.h
+++ b/kuassel/src/uisupport/toolbaractionprovider.h
@@ -23,7 +23,7 @@
 
 #include "networkmodelcontroller.h"
 
-class QToolBar;
+#include <QToolBar>
 
 class ToolBarActionProvider : public NetworkModelController
 {
diff --git a/libksane/libksane/splittercollapser.h b/libksane/libksane/splittercollapser.h
index 2c80933e..ef4c4073 100644
--- a/libksane/libksane/splittercollapser.h
+++ b/libksane/libksane/splittercollapser.h
@@ -28,7 +28,7 @@ License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // KDE
 
-class QSplitter;
+#include <QSplitter>
 
 namespace KSaneIface {
 
diff --git a/libksane/libksane/widgets/labeled_entry.h b/libksane/libksane/widgets/labeled_entry.h
index 78aa4a14..e9c081cf 100644
--- a/libksane/libksane/widgets/labeled_entry.h
+++ b/libksane/libksane/widgets/labeled_entry.h
@@ -34,7 +34,7 @@
  *@author Kåre Särs
  */
 
-class QPushButton;
+#include <QPushButton>
 class KLineEdit;
 
 namespace KSaneIface
diff --git a/libktorrent/src/bcodec/bencoder.h b/libktorrent/src/bcodec/bencoder.h
index 8c8f964e..ce4f2e74 100644
--- a/libktorrent/src/bcodec/bencoder.h
+++ b/libktorrent/src/bcodec/bencoder.h
@@ -23,7 +23,7 @@
 #include <ktorrent_export.h>
 #include <util/file.h>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace bt
 {
diff --git a/libktorrent/src/datachecker/datachecker.h b/libktorrent/src/datachecker/datachecker.h
index e0b845b0..1f1b88ab 100644
--- a/libktorrent/src/datachecker/datachecker.h
+++ b/libktorrent/src/datachecker/datachecker.h
@@ -25,7 +25,7 @@
 #include <ktorrent_export.h>
 
 
-class QString;
+#include <QString>
 
 namespace bt 
 {
diff --git a/libktorrent/src/dht/dhtbase.h b/libktorrent/src/dht/dhtbase.h
index 3382d467..90e0e78d 100644
--- a/libktorrent/src/dht/dhtbase.h
+++ b/libktorrent/src/dht/dhtbase.h
@@ -24,7 +24,7 @@
 #include <qmap.h>
 #include <util/constants.h>
 
-class QString;
+#include <QString>
 
 namespace bt
 {
diff --git a/libktorrent/src/diskio/cache.h b/libktorrent/src/diskio/cache.h
index 3bb7239f..eee34877 100644
--- a/libktorrent/src/diskio/cache.h
+++ b/libktorrent/src/diskio/cache.h
@@ -29,7 +29,7 @@
 #include <QSet>
 
 
-class QStringList;
+#include <QStringList>
 
 namespace bt
 {
diff --git a/libktorrent/src/diskio/chunkmanager.h b/libktorrent/src/diskio/chunkmanager.h
index 42349137..7a1d12af 100644
--- a/libktorrent/src/diskio/chunkmanager.h
+++ b/libktorrent/src/diskio/chunkmanager.h
@@ -31,7 +31,7 @@
 #include "chunk.h"
 
 
-class QStringList;
+#include <QStringList>
 
 namespace bt
 {
diff --git a/libktorrent/src/interfaces/logmonitorinterface.h b/libktorrent/src/interfaces/logmonitorinterface.h
index 1d07822f..2b4eb995 100644
--- a/libktorrent/src/interfaces/logmonitorinterface.h
+++ b/libktorrent/src/interfaces/logmonitorinterface.h
@@ -22,7 +22,7 @@
 
 #include <ktorrent_export.h>
 
-class QString;
+#include <QString>
 
 namespace bt
 {
diff --git a/libktorrent/src/interfaces/torrentfileinterface.h b/libktorrent/src/interfaces/torrentfileinterface.h
index 8b3ada8d..6564fe14 100644
--- a/libktorrent/src/interfaces/torrentfileinterface.h
+++ b/libktorrent/src/interfaces/torrentfileinterface.h
@@ -25,7 +25,7 @@
 #include <ktorrent_export.h>
 #include <util/constants.h>
 
-class QTextCodec;
+#include <QTextCodec>
 
 namespace bt
 {
diff --git a/libktorrent/src/mse/encryptedpacketsocket.h b/libktorrent/src/mse/encryptedpacketsocket.h
index a8959e84..8ba6798e 100644
--- a/libktorrent/src/mse/encryptedpacketsocket.h
+++ b/libktorrent/src/mse/encryptedpacketsocket.h
@@ -24,7 +24,7 @@
 #include <net/packetsocket.h>
 #include <ktorrent_export.h>
 
-class QString;
+#include <QString>
 
 using bt::Uint8;
 using bt::Uint16;
diff --git a/libktorrent/src/torrent/torrent.h b/libktorrent/src/torrent/torrent.h
index 78b7ff8f..b3d2cba5 100644
--- a/libktorrent/src/torrent/torrent.h
+++ b/libktorrent/src/torrent/torrent.h
@@ -31,7 +31,7 @@
 #include <ktorrent_export.h>
 #include "torrentfile.h"
 
-class QTextCodec;
+#include <QTextCodec>
 
 
 namespace bt
diff --git a/libktorrent/src/torrent/torrentcontrol.h b/libktorrent/src/torrent/torrentcontrol.h
index 98651d57..037c7892 100644
--- a/libktorrent/src/torrent/torrentcontrol.h
+++ b/libktorrent/src/torrent/torrentcontrol.h
@@ -32,8 +32,8 @@
 #include "torrent.h"
 #include "globals.h"
 
-class QStringList;
-class QString;
+#include <QStringList>
+#include <QString>
 class KJob;
 
 
diff --git a/libktorrent/src/util/fileops.h b/libktorrent/src/util/fileops.h
index 9bbd4b92..3d5f7f44 100644
--- a/libktorrent/src/util/fileops.h
+++ b/libktorrent/src/util/fileops.h
@@ -23,7 +23,7 @@
 #include <util/constants.h>
 #include <ktorrent_export.h>
 
-class QString;
+#include <QString>
 
 #ifdef CopyFile
 #undef CopyFile
diff --git a/libktorrent/src/util/sha1hash.h b/libktorrent/src/util/sha1hash.h
index 655ffa57..d456f5f6 100644
--- a/libktorrent/src/util/sha1hash.h
+++ b/libktorrent/src/util/sha1hash.h
@@ -24,7 +24,7 @@
 #include <ktorrent_export.h>
 #include "constants.h"
 
-class QString;
+#include <QString>
 
 namespace bt
 {
diff --git a/libktorrent/src/version.h b/libktorrent/src/version.h
index 59842dfb..cd0b7255 100644
--- a/libktorrent/src/version.h
+++ b/libktorrent/src/version.h
@@ -29,7 +29,7 @@
 #define LIBKTORRENT_RELEASE 1
 #define LIBKTORRENT_VERSION ((LIBKTORRENT_MAJOR << 16) | (LIBKTORRENT_MINOR << 8) | LIBKTORRENT_RELEASE)
 
-class QString;
+#include <QString>
 
 namespace bt 
 {
diff --git a/lokalize/src/catalog/catalog_private.h b/lokalize/src/catalog/catalog_private.h
index bbe8888a..55c86386 100644
--- a/lokalize/src/catalog/catalog_private.h
+++ b/lokalize/src/catalog/catalog_private.h
@@ -53,7 +53,7 @@
 #include <QSet>
 #include <QTimer>
 
-class QTextCodec;
+#include <QTextCodec>
 class CatalogStorage;
 class Catalog;
 
diff --git a/lokalize/src/catalog/gettext/catalogfileplugin.h b/lokalize/src/catalog/gettext/catalogfileplugin.h
index e0ac9875..a2414a89 100644
--- a/lokalize/src/catalog/gettext/catalogfileplugin.h
+++ b/lokalize/src/catalog/gettext/catalogfileplugin.h
@@ -36,9 +36,9 @@
 #include <kdemacros.h>
 #include <QList>
 #include <QTextCodec>
-class QIODevice;
-class QString;
-class QStringList;
+#include <QIODevice>
+#include <QString>
+#include <QStringList>
 
 namespace GettextCatalog {
 
diff --git a/lokalize/src/catalog/gettext/gettextimport.h b/lokalize/src/catalog/gettext/gettextimport.h
index a0b9accb..ce4a0f54 100644
--- a/lokalize/src/catalog/gettext/gettextimport.h
+++ b/lokalize/src/catalog/gettext/gettextimport.h
@@ -41,7 +41,7 @@
 #include <QStringList>
 #include <QTextStream>
 
-class QTextCodec;
+#include <QTextCodec>
 
 namespace GettextCatalog {
 
diff --git a/lokalize/src/catalog/gettext/importplugin_private.h b/lokalize/src/catalog/gettext/importplugin_private.h
index e7e5e2eb..15a8e604 100644
--- a/lokalize/src/catalog/gettext/importplugin_private.h
+++ b/lokalize/src/catalog/gettext/importplugin_private.h
@@ -40,7 +40,7 @@
 #include <QLinkedList>
 #include <QTextCodec>
 
-class QTextCodec;
+#include <QTextCodec>
 namespace GettextCatalog {
 class GettextStorage;
 
diff --git a/lokalize/src/catalog/ts/tsstorage.h b/lokalize/src/catalog/ts/tsstorage.h
index 07e6dc3c..c7728192 100644
--- a/lokalize/src/catalog/ts/tsstorage.h
+++ b/lokalize/src/catalog/ts/tsstorage.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVector>
 #include <QMap>
-// class QDomDocument;
+// #include <QDomDocument>
 
 class TsStorage: public CatalogStorage
 {
diff --git a/lokalize/src/catalog/xliff/xliffstorage.h b/lokalize/src/catalog/xliff/xliffstorage.h
index 403f715a..375b2a15 100644
--- a/lokalize/src/catalog/xliff/xliffstorage.h
+++ b/lokalize/src/catalog/xliff/xliffstorage.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVector>
 #include <QMap>
-// class QDomDocument;
+// #include <QDomDocument>
 
 class XliffStorage: public CatalogStorage
 {
diff --git a/lokalize/src/cataloglistview/cataloglistview.h b/lokalize/src/cataloglistview/cataloglistview.h
index d4250835..6f1d5047 100644
--- a/lokalize/src/cataloglistview/cataloglistview.h
+++ b/lokalize/src/cataloglistview/cataloglistview.h
@@ -28,14 +28,14 @@
 #include "mergecatalog.h"
 
 #include <QDockWidget>
-class QTreeView;
+#include <QTreeView>
 class CatalogTreeFilterModel;
 class CatalogTreeModel;
 class Catalog;
 class KLineEdit;
-class QMenu;
-class QAction;
-class QModelIndex;
+#include <QMenu>
+#include <QAction>
+#include <QModelIndex>
 class CatalogTreeView;
 
 class CatalogView: public QDockWidget
diff --git a/lokalize/src/common/languagelistmodel.h b/lokalize/src/common/languagelistmodel.h
index 263147d5..b5e70df3 100644
--- a/lokalize/src/common/languagelistmodel.h
+++ b/lokalize/src/common/languagelistmodel.h
@@ -26,7 +26,7 @@
 #define LANGUAGELISTMODEL_H
 
 #include <QStringListModel>
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 
 class LanguageListModel: public QStringListModel
diff --git a/lokalize/src/editorview.h b/lokalize/src/editorview.h
index f3b49a1a..f3aa08c7 100644
--- a/lokalize/src/editorview.h
+++ b/lokalize/src/editorview.h
@@ -35,8 +35,8 @@ class Catalog;
 class LedsWidget;
 class TranslationUnitTextEdit;
 class KTabBar;
-class QContextMenuEvent;
-class QDragEnterEvent;
+#include <QContextMenuEvent>
+#include <QDragEnterEvent>
 
 /**
  * This is the main view class for Lokalize Editor.
@@ -119,7 +119,7 @@ private slots:
 
 
 class KLed;
-class QLabel;
+#include <QLabel>
 class LedsWidget:public QWidget
 {
 Q_OBJECT
diff --git a/lokalize/src/filesearch/filesearchtab.h b/lokalize/src/filesearch/filesearchtab.h
index 927ae5b3..7cb8c475 100644
--- a/lokalize/src/filesearch/filesearchtab.h
+++ b/lokalize/src/filesearch/filesearchtab.h
@@ -37,12 +37,12 @@
 #include <state.h>
 #include <phase.h>
 
-class QLabel;
+#include <QLabel>
 class QaView;
-class QStringListModel;
-class QComboBox;
-class QTreeView;
-class QSortFilterProxyModel;
+#include <QStringListModel>
+#include <QComboBox>
+#include <QTreeView>
+#include <QSortFilterProxyModel>
 
 namespace ThreadWeaver{class Job;}
 namespace ThreadWeaver{class JobCollection;}
diff --git a/lokalize/src/glossary/glossaryview.h b/lokalize/src/glossary/glossaryview.h
index 06087095..9b786a02 100644
--- a/lokalize/src/glossary/glossaryview.h
+++ b/lokalize/src/glossary/glossaryview.h
@@ -30,12 +30,12 @@
 //#include <QList>
 class Catalog;
 class FlowLayout;
-class QDragEnterEvent;
-class QDropEvent;
-class QEvent;
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QEvent>
 class KAction;
-class QFrame;
-class QScrollArea;
+#include <QFrame>
+#include <QScrollArea>
 #include <QVector>
 
 namespace GlossaryNS {
diff --git a/lokalize/src/glossary/glossarywindow.h b/lokalize/src/glossary/glossarywindow.h
index 2e214c1d..23a650e9 100644
--- a/lokalize/src/glossary/glossarywindow.h
+++ b/lokalize/src/glossary/glossarywindow.h
@@ -30,11 +30,11 @@
 #include <QListView>
 #include <QStringListModel>
 
-class QListView;
+#include <QListView>
 //class KTextEdit;
 class KLineEdit;
 class KComboBox;
-//class QStringListModel;
+//#include <QStringListModel>
 
 
 class AuxTextEdit: public KTextEdit
diff --git a/lokalize/src/lokalizemainwindow.h b/lokalize/src/lokalizemainwindow.h
index b302c4ae..21a282f6 100644
--- a/lokalize/src/lokalizemainwindow.h
+++ b/lokalize/src/lokalizemainwindow.h
@@ -35,9 +35,9 @@
 #include <QtDBus/qdbusextratypes.h>
 
 
-class QMdiSubWindow;
-class QMdiArea;
-class QActionGroup;
+#include <QMdiSubWindow>
+#include <QMdiArea>
+#include <QActionGroup>
 class KAction;
 class KRecentFilesAction;
 class EditorTab;
diff --git a/lokalize/src/mergemode/mergeview.h b/lokalize/src/mergemode/mergeview.h
index 7df0887c..ca243023 100644
--- a/lokalize/src/mergemode/mergeview.h
+++ b/lokalize/src/mergemode/mergeview.h
@@ -33,8 +33,8 @@
 class KTextEdit;
 class Catalog;
 class MergeCatalog;
-class QDragEnterEvent;
-class QDropEvent;
+#include <QDragEnterEvent>
+#include <QDropEvent>
 
 
 
diff --git a/lokalize/src/msgctxtview.h b/lokalize/src/msgctxtview.h
index 3035dc50..c1184073 100644
--- a/lokalize/src/msgctxtview.h
+++ b/lokalize/src/msgctxtview.h
@@ -30,10 +30,10 @@
 #include <QMap>
 #include <QDockWidget>
 
-class QTextBrowser;
+#include <QTextBrowser>
 class Catalog;
 class NoteEditor;
-class QStackedLayout;
+#include <QStackedLayout>
 
 class MsgCtxtView: public QDockWidget
 {
diff --git a/lokalize/src/noteeditor.h b/lokalize/src/noteeditor.h
index 652acb5c..8ee34740 100644
--- a/lokalize/src/noteeditor.h
+++ b/lokalize/src/noteeditor.h
@@ -28,10 +28,10 @@
 
 #include <KTextEdit>
 #include <QPlainTextEdit>
-class QStringListModel;
-class QLabel;
+#include <QStringListModel>
+#include <QLabel>
 class KComboBox;
-class QTextBrowser;
+#include <QTextBrowser>
 class TextEdit;
 
 int displayNotes(QTextBrowser* m_browser, const QVector<Note>& notes, int active=0, bool multiple=true);
diff --git a/lokalize/src/phaseswindow.h b/lokalize/src/phaseswindow.h
index c77ad283..eba3b55a 100644
--- a/lokalize/src/phaseswindow.h
+++ b/lokalize/src/phaseswindow.h
@@ -33,11 +33,11 @@
 #include <QVector>
 #include <QMap>
 
-class QStackedLayout;
+#include <QStackedLayout>
 class NoteEditor;
 class PhasesModel;
 class MyTreeView;
-class QTextBrowser;
+#include <QTextBrowser>
 class PhasesWindow: public KDialog
 {
 Q_OBJECT
diff --git a/lokalize/src/project/projectmodel.h b/lokalize/src/project/projectmodel.h
index ebbaab4e..dfa8a5d6 100644
--- a/lokalize/src/project/projectmodel.h
+++ b/lokalize/src/project/projectmodel.h
@@ -37,7 +37,7 @@
 #include "project.h"
 #include "projectlocal.h"
 
-class QTimer;
+#include <QTimer>
 class UpdateStatsJob;
 namespace ThreadWeaver {class Weaver;}
 
diff --git a/lokalize/src/project/projecttab.h b/lokalize/src/project/projecttab.h
index 098a4777..837fd70b 100644
--- a/lokalize/src/project/projecttab.h
+++ b/lokalize/src/project/projecttab.h
@@ -31,11 +31,11 @@
 
 #include <KXMLGUIClient>
 
-class QStackedLayout;
+#include <QStackedLayout>
 class ProjectWidget;
 class KLineEdit;
-class QContextMenuEvent;
-class QProgressBar;
+#include <QContextMenuEvent>
+#include <QProgressBar>
 
 /**
  * Project Overview Tab
diff --git a/lokalize/src/project/projectwidget.h b/lokalize/src/project/projectwidget.h
index b3814671..f22ab005 100644
--- a/lokalize/src/project/projectwidget.h
+++ b/lokalize/src/project/projectwidget.h
@@ -31,7 +31,7 @@
 #include "projectmodel.h"
 
 class SortFilterProxyModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 /**
  * This class is considered a 'view',
diff --git a/lokalize/src/projectmodel.h b/lokalize/src/projectmodel.h
index ebbaab4e..dfa8a5d6 100644
--- a/lokalize/src/projectmodel.h
+++ b/lokalize/src/projectmodel.h
@@ -37,7 +37,7 @@
 #include "project.h"
 #include "projectlocal.h"
 
-class QTimer;
+#include <QTimer>
 class UpdateStatsJob;
 namespace ThreadWeaver {class Weaver;}
 
diff --git a/lokalize/src/projecttab.h b/lokalize/src/projecttab.h
index 098a4777..837fd70b 100644
--- a/lokalize/src/projecttab.h
+++ b/lokalize/src/projecttab.h
@@ -31,11 +31,11 @@
 
 #include <KXMLGUIClient>
 
-class QStackedLayout;
+#include <QStackedLayout>
 class ProjectWidget;
 class KLineEdit;
-class QContextMenuEvent;
-class QProgressBar;
+#include <QContextMenuEvent>
+#include <QProgressBar>
 
 /**
  * Project Overview Tab
diff --git a/lokalize/src/projectwidget.h b/lokalize/src/projectwidget.h
index b3814671..f22ab005 100644
--- a/lokalize/src/projectwidget.h
+++ b/lokalize/src/projectwidget.h
@@ -31,7 +31,7 @@
 #include "projectmodel.h"
 
 class SortFilterProxyModel;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 /**
  * This class is considered a 'view',
diff --git a/lokalize/src/syntaxhighlighter.h b/lokalize/src/syntaxhighlighter.h
index 60ac6a5e..54245594 100644
--- a/lokalize/src/syntaxhighlighter.h
+++ b/lokalize/src/syntaxhighlighter.h
@@ -32,7 +32,7 @@
 #include <QtGui/qtextformat.h>
 
 
-class QTextDocument;
+#include <QTextDocument>
 
 class SyntaxHighlighter : public Sonnet::Highlighter
 {
diff --git a/lokalize/src/tm/dbfilesmodel.h b/lokalize/src/tm/dbfilesmodel.h
index c7ce938b..530f830c 100644
--- a/lokalize/src/tm/dbfilesmodel.h
+++ b/lokalize/src/tm/dbfilesmodel.h
@@ -28,7 +28,7 @@
 
 #include <QSortFilterProxyModel>
 #include <QtCore/qdatetime.h>
-class QFileSystemModel;
+#include <QFileSystemModel>
 class QPersistentModelIndex;
 
 namespace ThreadWeaver{class Job;}
diff --git a/lokalize/src/tm/jobs.h b/lokalize/src/tm/jobs.h
index 07332eeb..f2d53694 100644
--- a/lokalize/src/tm/jobs.h
+++ b/lokalize/src/tm/jobs.h
@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <QString>
 #include <QSqlDatabase>
-class QSqlQuery;
+#include <QSqlQuery>
 
 /**
  * Translation Memory classes. see initDb() function for the database scheme
diff --git a/lokalize/src/tm/tmmanager.h b/lokalize/src/tm/tmmanager.h
index 27cbdff5..dae099e6 100644
--- a/lokalize/src/tm/tmmanager.h
+++ b/lokalize/src/tm/tmmanager.h
@@ -37,7 +37,7 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QTimer>
 
-class QTreeView;
+#include <QTreeView>
 
 #include "ui_dbparams.h"
 #include <kdialog.h>
diff --git a/lokalize/src/tm/tmtab.h b/lokalize/src/tm/tmtab.h
index 4b2c1d8a..ada2c324 100644
--- a/lokalize/src/tm/tmtab.h
+++ b/lokalize/src/tm/tmtab.h
@@ -37,10 +37,10 @@
 class QaView;
 class Ui_QueryOptions;
 class KLineEdit;
-class QComboBox;
-class QTreeView;
-class QSortFilterProxyModel;
-class QCheckBox;
+#include <QComboBox>
+#include <QTreeView>
+#include <QSortFilterProxyModel>
+#include <QCheckBox>
 
 
 namespace ThreadWeaver{class Job;}
diff --git a/lokalize/src/tm/tmview.h b/lokalize/src/tm/tmview.h
index b72e76b4..5ceb3cc3 100644
--- a/lokalize/src/tm/tmview.h
+++ b/lokalize/src/tm/tmview.h
@@ -36,8 +36,8 @@
 
 class Catalog;
 class KAction;
-class QDropEvent;
-class QDragEnterEvent;
+#include <QDropEvent>
+#include <QDragEnterEvent>
 
 namespace ThreadWeaver{class Job;}
 
diff --git a/lokalize/src/webquery/webquerycontroller.h b/lokalize/src/webquery/webquerycontroller.h
index 130d7cbc..9346f7e2 100644
--- a/lokalize/src/webquery/webquerycontroller.h
+++ b/lokalize/src/webquery/webquerycontroller.h
@@ -40,7 +40,7 @@
 #include <QRegExp>
 class Catalog;
 class WebQueryView;
-class QTextCodec;
+#include <QTextCodec>
 class KJob;
 
 struct CatalogData
diff --git a/lokalize/src/webquery/webqueryview.h b/lokalize/src/webquery/webqueryview.h
index 4276bf15..b15b2424 100644
--- a/lokalize/src/webquery/webqueryview.h
+++ b/lokalize/src/webquery/webqueryview.h
@@ -38,12 +38,12 @@
 //#include <QList>
 class Catalog;
 // class FlowLayout;
-// class QHBoxLayout;
-class QSplitter;
-class QTextBrowser;
-class QDragEnterEvent;
-class QDropEvent;
-class QEvent;
+// #include <QHBoxLayout>
+#include <QSplitter>
+#include <QTextBrowser>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QEvent>
 class KAction;
 class Ui_QueryControl;
 #include <QVector>
diff --git a/lokalize/src/xlifftextedit.h b/lokalize/src/xlifftextedit.h
index 5fa97d1e..b223e0b4 100644
--- a/lokalize/src/xlifftextedit.h
+++ b/lokalize/src/xlifftextedit.h
@@ -29,7 +29,7 @@
 #include "catalogstring.h"
 
 #include <KTextEdit>
-class QMouseEvent;
+#include <QMouseEvent>
 class SyntaxHighlighter;//TODO rename
 class KCompletionBox;
 class MyCompletionBox;
diff --git a/okular/conf/preferencesdialog.h b/okular/conf/preferencesdialog.h
index dcea37e4..ac6e198e 100644
--- a/okular/conf/preferencesdialog.h
+++ b/okular/conf/preferencesdialog.h
@@ -14,7 +14,7 @@
 #include "part.h"
 #include "settings.h"
 
-class QWidget;
+#include <QWidget>
 class KConfigSkeleton;
 
 class DlgGeneral;
diff --git a/okular/conf/widgetannottools.h b/okular/conf/widgetannottools.h
index f15aa1c4..946d3457 100644
--- a/okular/conf/widgetannottools.h
+++ b/okular/conf/widgetannottools.h
@@ -17,10 +17,10 @@
 class KLineEdit;
 class KComboBox;
 class KPushButton;
-class QLabel;
-class QListWidget;
-class QListWidgetItem;
-class QGroupBox;
+#include <QLabel>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QGroupBox>
 class AnnotationWidget;
 
 namespace Okular
diff --git a/okular/core/annotations_p.h b/okular/core/annotations_p.h
index 07b124a4..55fc05a5 100644
--- a/okular/core/annotations_p.h
+++ b/okular/core/annotations_p.h
@@ -19,7 +19,7 @@
 #include <QtCore/QVariant>
 #include <QtGui/QColor>
 
-class QTransform;
+#include <QTransform>
 
 namespace Okular {
 
diff --git a/okular/core/area.h b/okular/core/area.h
index 1fade455..206fea4c 100644
--- a/okular/core/area.h
+++ b/okular/core/area.h
@@ -20,8 +20,8 @@
 #include "global.h"
 #include "okular_export.h"
 
-class QPolygonF;
-class QRect;
+#include <QPolygonF>
+#include <QRect>
 
 namespace Okular {
 
diff --git a/okular/core/audioplayer_p.h b/okular/core/audioplayer_p.h
index 32fe4de8..0cccf111 100644
--- a/okular/core/audioplayer_p.h
+++ b/okular/core/audioplayer_p.h
@@ -15,7 +15,7 @@
 #include <qsignalmapper.h>
 #include <kurl.h>
 
-class QBuffer;
+#include <QBuffer>
 class PlayData;
 class SoundInfo;
 
diff --git a/okular/core/bookmarkmanager.h b/okular/core/bookmarkmanager.h
index e24efc66..8dcf80cd 100644
--- a/okular/core/bookmarkmanager.h
+++ b/okular/core/bookmarkmanager.h
@@ -14,7 +14,7 @@
 
 #include "okular_export.h"
 
-class QAction;
+#include <QAction>
 class KUrl;
 
 namespace Okular {
diff --git a/okular/core/document.h b/okular/core/document.h
index 7efc1ef0..2998a62e 100644
--- a/okular/core/document.h
+++ b/okular/core/document.h
@@ -24,7 +24,7 @@
 
 #include <kmimetype.h>
 
-class QPrintDialog;
+#include <QPrintDialog>
 class KComponentData;
 class KBookmark;
 class KConfigDialog;
diff --git a/okular/core/document_p.h b/okular/core/document_p.h
index b4bc6a8b..e84d5be9 100644
--- a/okular/core/document_p.h
+++ b/okular/core/document_p.h
@@ -27,10 +27,10 @@
 #include "fontinfo.h"
 #include "generator.h"
 
-class QUndoStack;
-class QEventLoop;
-class QFile;
-class QTimer;
+#include <QUndoStack>
+#include <QEventLoop>
+#include <QFile>
+#include <QTimer>
 class KTemporaryFile;
 
 struct AllocatedPixmap;
diff --git a/okular/core/fileprinter.h b/okular/core/fileprinter.h
index c7cd32ae..b15dc2ce 100644
--- a/okular/core/fileprinter.h
+++ b/okular/core/fileprinter.h
@@ -21,7 +21,7 @@
 #include "okular_export.h"
 #include "generator.h"
 
-class QSize;
+#include <QSize>
 
 namespace Okular {
 
diff --git a/okular/core/generator.h b/okular/core/generator.h
index 977a9025..49847ff0 100644
--- a/okular/core/generator.h
+++ b/okular/core/generator.h
@@ -33,10 +33,10 @@
     K_PLUGIN_FACTORY( classname ## Factory, registerPlugin< classname >(); ) \
     K_EXPORT_PLUGIN( classname ## Factory( aboutdata ) )
 
-class QByteArray;
-class QMutex;
-class QPrinter;
-class QPrintDialog;
+#include <QByteArray>
+#include <QMutex>
+#include <QPrinter>
+#include <QPrintDialog>
 class KIcon;
 
 namespace Okular {
diff --git a/okular/core/generator_p.h b/okular/core/generator_p.h
index 8a860377..ebc7f6e4 100644
--- a/okular/core/generator_p.h
+++ b/okular/core/generator_p.h
@@ -16,8 +16,8 @@
 #include <QtCore/QThread>
 #include <QtGui/QImage>
 
-class QEventLoop;
-class QMutex;
+#include <QEventLoop>
+#include <QMutex>
 
 namespace Okular {
 
diff --git a/okular/core/movie.h b/okular/core/movie.h
index 8d0e2fe7..759a7ca7 100644
--- a/okular/core/movie.h
+++ b/okular/core/movie.h
@@ -16,7 +16,7 @@
 
 #include <QtCore/QSize>
 
-class QImage;
+#include <QImage>
 
 namespace Okular {
 
diff --git a/okular/core/page.h b/okular/core/page.h
index 3d1817a3..06ce0175 100644
--- a/okular/core/page.h
+++ b/okular/core/page.h
@@ -17,7 +17,7 @@
 #include "global.h"
 #include "textpage.h"
 
-class QPixmap;
+#include <QPixmap>
 
 class PagePainter;
 
diff --git a/okular/core/page_p.h b/okular/core/page_p.h
index 69a2c66c..1ca5ae85 100644
--- a/okular/core/page_p.h
+++ b/okular/core/page_p.h
@@ -22,7 +22,7 @@
 #include "global.h"
 #include "area.h"
 
-class QColor;
+#include <QColor>
 
 namespace Okular {
 
diff --git a/okular/core/sourcereference.h b/okular/core/sourcereference.h
index b767b270..b7477d53 100644
--- a/okular/core/sourcereference.h
+++ b/okular/core/sourcereference.h
@@ -12,7 +12,7 @@
 
 #include "okular_export.h"
 
-class QString;
+#include <QString>
 
 namespace Okular {
 
diff --git a/okular/core/sourcereference_p.h b/okular/core/sourcereference_p.h
index cf7b3e82..cc5e5309 100644
--- a/okular/core/sourcereference_p.h
+++ b/okular/core/sourcereference_p.h
@@ -10,7 +10,7 @@
 #ifndef OKULAR_SOURCEREFERENCE_P_H
 #define OKULAR_SOURCEREFERENCE_P_H
 
-class QString;
+#include <QString>
 
 namespace Okular
 {
diff --git a/okular/core/textdocumentgenerator.h b/okular/core/textdocumentgenerator.h
index ec331d6d..c5fcea37 100644
--- a/okular/core/textdocumentgenerator.h
+++ b/okular/core/textdocumentgenerator.h
@@ -17,8 +17,8 @@
 #include "textdocumentsettings.h"
 #include "../interfaces/configinterface.h"
 
-class QTextBlock;
-class QTextDocument;
+#include <QTextBlock>
+#include <QTextDocument>
 
 namespace Okular {
 
diff --git a/okular/core/textpage.h b/okular/core/textpage.h
index 36cbe399..af76c009 100644
--- a/okular/core/textpage.h
+++ b/okular/core/textpage.h
@@ -16,7 +16,7 @@
 #include "okular_export.h"
 #include "global.h"
 
-class QTransform;
+#include <QTransform>
 
 namespace Okular {
 
diff --git a/okular/core/tile.h b/okular/core/tile.h
index d9e6ab56..8e0ff526 100644
--- a/okular/core/tile.h
+++ b/okular/core/tile.h
@@ -11,7 +11,7 @@
 
 #include "area.h"
 
-class QPixmap;
+#include <QPixmap>
 
 namespace Okular {
 
diff --git a/okular/core/tilesmanager_p.h b/okular/core/tilesmanager_p.h
index e2d4fefc..b3306a52 100644
--- a/okular/core/tilesmanager_p.h
+++ b/okular/core/tilesmanager_p.h
@@ -12,7 +12,7 @@
 #include "okular_export.h"
 #include "area.h"
 
-class QPixmap;
+#include <QPixmap>
 
 namespace Okular {
 
diff --git a/okular/core/utils.h b/okular/core/utils.h
index dc490f7c..8419a410 100644
--- a/okular/core/utils.h
+++ b/okular/core/utils.h
@@ -13,9 +13,9 @@
 #include "okular_export.h"
 #include "area.h"
 
-class QRect;
-class QImage;
-class QWidget;
+#include <QRect>
+#include <QImage>
+#include <QWidget>
 
 namespace Okular
 {
diff --git a/okular/core/utils_p.h b/okular/core/utils_p.h
index 3b3f5117..3221f219 100644
--- a/okular/core/utils_p.h
+++ b/okular/core/utils_p.h
@@ -10,7 +10,7 @@
 #ifndef _OKULAR_UTILS_P_H_
 #define _OKULAR_UTILS_P_H_
 
-class QIODevice;
+#include <QIODevice>
 
 namespace Okular
 {
diff --git a/okular/core/view.h b/okular/core/view.h
index a369d246..861197e0 100644
--- a/okular/core/view.h
+++ b/okular/core/view.h
@@ -12,8 +12,8 @@
 
 #include "okular_export.h"
 
-class QString;
-class QVariant;
+#include <QString>
+#include <QVariant>
 
 namespace Okular {
 
diff --git a/okular/generators/comicbook/document.h b/okular/generators/comicbook/document.h
index 22c32134..a9090cba 100644
--- a/okular/generators/comicbook/document.h
+++ b/okular/generators/comicbook/document.h
@@ -14,8 +14,8 @@
 
 class KArchiveDirectory;
 class KArchive;
-class QImage;
-class QSize;
+#include <QImage>
+#include <QSize>
 class Unrar;
 class Directory;
 
diff --git a/okular/generators/comicbook/unrar.h b/okular/generators/comicbook/unrar.h
index d0fca3ca..711a4202 100644
--- a/okular/generators/comicbook/unrar.h
+++ b/okular/generators/comicbook/unrar.h
@@ -14,7 +14,7 @@
 #include <QtCore/QProcess>
 #include <QtCore/QStringList>
 
-class QEventLoop;
+#include <QEventLoop>
 class KTempDir;
 class KPtyProcess;
 
diff --git a/okular/generators/comicbook/unrarflavours.h b/okular/generators/comicbook/unrarflavours.h
index 974cd04e..d540b946 100644
--- a/okular/generators/comicbook/unrarflavours.h
+++ b/okular/generators/comicbook/unrarflavours.h
@@ -12,7 +12,7 @@
 
 #include <QtCore/QString>
 
-class QStringList;
+#include <QStringList>
 
 class UnrarFlavour
 {
diff --git a/okular/generators/djvu/kdjvu.h b/okular/generators/djvu/kdjvu.h
index ad584faa..1eabd234 100644
--- a/okular/generators/djvu/kdjvu.h
+++ b/okular/generators/djvu/kdjvu.h
@@ -18,8 +18,8 @@
 #include <qvariant.h>
 #include <qvector.h>
 
-class QDomDocument;
-class QFile;
+#include <QDomDocument>
+#include <QFile>
 
 #ifndef MINIEXP_H
 typedef struct miniexp_s* miniexp_t;
diff --git a/okular/generators/dvi/dviRenderer.h b/okular/generators/dvi/dviRenderer.h
index b07716f6..c2867388 100644
--- a/okular/generators/dvi/dviRenderer.h
+++ b/okular/generators/dvi/dviRenderer.h
@@ -36,7 +36,7 @@ class DocumentWidget;
 class dvifile;
 class dviRenderer;
 class ghostscript_interface;
-class QEventLoop;
+#include <QEventLoop>
 class KProgressDialog;
 class PreBookmark;
 class TeXFontDefinition;
diff --git a/okular/generators/dvi/dviexport.h b/okular/generators/dvi/dviexport.h
index 9cba0756..e360d05b 100644
--- a/okular/generators/dvi/dviexport.h
+++ b/okular/generators/dvi/dviexport.h
@@ -27,7 +27,7 @@
 
 class dviRenderer;
 class KProcess;
-class QStringList;
+#include <QStringList>
 
 
 class DVIExport: public QObject, public QSharedData
diff --git a/okular/generators/dvi/dvisourcesplitter.h b/okular/generators/dvi/dvisourcesplitter.h
index 2bc2a2ea..f720c77b 100644
--- a/okular/generators/dvi/dvisourcesplitter.h
+++ b/okular/generators/dvi/dvisourcesplitter.h
@@ -12,7 +12,7 @@
 
 #include <QFileInfo>
 
-class QString;
+#include <QString>
 
 
 class DVI_SourceFileSplitter
diff --git a/okular/generators/dvi/fontEncodingPool.h b/okular/generators/dvi/fontEncodingPool.h
index 3f6cf5ce..400cffdb 100644
--- a/okular/generators/dvi/fontEncodingPool.h
+++ b/okular/generators/dvi/fontEncodingPool.h
@@ -13,7 +13,7 @@
 
 #include <QHash>
 
-class QString;
+#include <QString>
 
 
 class fontEncodingPool {
diff --git a/okular/generators/dvi/length.h b/okular/generators/dvi/length.h
index ea5abed6..7ca92992 100644
--- a/okular/generators/dvi/length.h
+++ b/okular/generators/dvi/length.h
@@ -15,7 +15,7 @@
 #include <cmath>
 #include <math.h>
 
-class QString;
+#include <QString>
 
 #define mm_per_cm 10.0
 #define mm_per_m 1000.0
diff --git a/okular/generators/dvi/pageSize.h b/okular/generators/dvi/pageSize.h
index eca464d2..b77e2ec1 100644
--- a/okular/generators/dvi/pageSize.h
+++ b/okular/generators/dvi/pageSize.h
@@ -16,8 +16,8 @@
 
 #include <QObject>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 
 /* \brief This class represents physical page sizes.
diff --git a/okular/generators/dvi/psgs.h b/okular/generators/dvi/psgs.h
index eaab035b..ee1e044c 100644
--- a/okular/generators/dvi/psgs.h
+++ b/okular/generators/dvi/psgs.h
@@ -17,7 +17,7 @@
 
 class KUrl;
 class PageNumber;
-class QPainter;
+#include <QPainter>
 
 
 class pageInfo
diff --git a/okular/generators/dvi/simplePageSize.h b/okular/generators/dvi/simplePageSize.h
index 3d14f39f..3388883c 100644
--- a/okular/generators/dvi/simplePageSize.h
+++ b/okular/generators/dvi/simplePageSize.h
@@ -17,8 +17,8 @@
 
 #include <QSize>
 
-class QPaintDevice;
-class QString;
+#include <QPaintDevice>
+#include <QString>
 
 
 /** \brief This class represents physical page sizes.
diff --git a/okular/generators/epub/converter.h b/okular/generators/epub/converter.h
index d368c70e..892b66d2 100644
--- a/okular/generators/epub/converter.h
+++ b/okular/generators/epub/converter.h
@@ -15,7 +15,7 @@
 
 #include "epubdocument.h"
 
-class QTextCursor;
+#include <QTextCursor>
 
 namespace Epub {
   class Converter : public Okular::TextDocumentConverter
diff --git a/okular/generators/fictionbook/converter.h b/okular/generators/fictionbook/converter.h
index 7de5dc46..799e9d60 100644
--- a/okular/generators/fictionbook/converter.h
+++ b/okular/generators/fictionbook/converter.h
@@ -12,8 +12,8 @@
 
 #include <core/textdocumentgenerator.h>
 
-class QDomElement;
-class QTextCursor;
+#include <QDomElement>
+#include <QTextCursor>
 
 namespace FictionBook {
 
diff --git a/okular/generators/mobipocket/mobidocument.h b/okular/generators/mobipocket/mobidocument.h
index 1d1b9bf5..4eec7a43 100644
--- a/okular/generators/mobipocket/mobidocument.h
+++ b/okular/generators/mobipocket/mobidocument.h
@@ -13,7 +13,7 @@
 #include <QUrl>
 #include <QVariant>
 
-class QFile;
+#include <QFile>
 namespace Mobipocket {
 class Document;
 class QFileStream;
diff --git a/okular/generators/ooo/converter.h b/okular/generators/ooo/converter.h
index bb8fdc95..34563f72 100644
--- a/okular/generators/ooo/converter.h
+++ b/okular/generators/ooo/converter.h
@@ -17,8 +17,8 @@
 
 #include "styleinformation.h"
 
-class QDomElement;
-class QDomText;
+#include <QDomElement>
+#include <QDomText>
 
 namespace OOO {
 
diff --git a/okular/generators/ooo/formatproperty.h b/okular/generators/ooo/formatproperty.h
index 279e3ee3..dbaccd0f 100644
--- a/okular/generators/ooo/formatproperty.h
+++ b/okular/generators/ooo/formatproperty.h
@@ -13,10 +13,10 @@
 #include <QtCore/QVector>
 #include <QtGui/QColor>
 
-class QTextBlockFormat;
-class QTextCharFormat;
-class QTextFormat;
-class QTextListFormat;
+#include <QTextBlockFormat>
+#include <QTextCharFormat>
+#include <QTextFormat>
+#include <QTextListFormat>
 class QTextTableFormat;
 
 namespace OOO {
diff --git a/okular/generators/ooo/styleparser.h b/okular/generators/ooo/styleparser.h
index 47604969..91984d64 100644
--- a/okular/generators/ooo/styleparser.h
+++ b/okular/generators/ooo/styleparser.h
@@ -12,8 +12,8 @@
 
 #include "formatproperty.h"
 
-class QDomDocument;
-class QDomElement;
+#include <QDomDocument>
+#include <QDomElement>
 
 namespace OOO {
 
diff --git a/okular/generators/plucker/generator_plucker.h b/okular/generators/plucker/generator_plucker.h
index d8cc2d08..8c1c74ad 100644
--- a/okular/generators/plucker/generator_plucker.h
+++ b/okular/generators/plucker/generator_plucker.h
@@ -17,7 +17,7 @@
 
 #include "qunpluck.h"
 
-class QTextDocument;
+#include <QTextDocument>
 
 class PluckerGenerator : public Okular::Generator
 {
diff --git a/okular/generators/plucker/unpluck/image.h b/okular/generators/plucker/unpluck/image.h
index ce736037..5e27a60e 100644
--- a/okular/generators/plucker/unpluck/image.h
+++ b/okular/generators/plucker/unpluck/image.h
@@ -12,7 +12,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-class QImage;
+#include <QImage>
 
 bool TranscribePalmImageToJPEG( unsigned char *image_in, QImage &image );
 bool TranscribeMultiImageRecord( plkr_Document *doc, QImage &image, unsigned char *bytes );
diff --git a/okular/generators/plucker/unpluck/qunpluck.h b/okular/generators/plucker/unpluck/qunpluck.h
index 56d05ed9..c50c031c 100644
--- a/okular/generators/plucker/unpluck/qunpluck.h
+++ b/okular/generators/plucker/unpluck/qunpluck.h
@@ -20,7 +20,7 @@
 
 class Context;
 class RecordNode;
-class QTextDocument;
+#include <QTextDocument>
 
 namespace Okular {
 class Action;
diff --git a/okular/generators/spectre/rendererthread.h b/okular/generators/spectre/rendererthread.h
index bc680d3e..29004c3d 100644
--- a/okular/generators/spectre/rendererthread.h
+++ b/okular/generators/spectre/rendererthread.h
@@ -18,7 +18,7 @@
 
 #include <libspectre/spectre.h>
 
-class QImage;
+#include <QImage>
 class GSGenerator;
 
 namespace Okular
diff --git a/okular/interfaces/printinterface.h b/okular/interfaces/printinterface.h
index 31ce5baf..7c8b4b77 100644
--- a/okular/interfaces/printinterface.h
+++ b/okular/interfaces/printinterface.h
@@ -14,7 +14,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 
 namespace Okular {
 
diff --git a/okular/part.h b/okular/part.h
index c8a7b3e6..f5609104 100644
--- a/okular/part.h
+++ b/okular/part.h
@@ -32,10 +32,10 @@
 
 #include <QtDBus/QtDBus>
 
-class QAction;
-class QWidget;
-class QPrinter;
-class QMenu;
+#include <QAction>
+#include <QWidget>
+#include <QPrinter>
+#include <QMenu>
 
 class KUrl;
 class KConfigDialog;
diff --git a/okular/plasma/components/pageitem.h b/okular/plasma/components/pageitem.h
index 932bde32..b03da436 100644
--- a/okular/plasma/components/pageitem.h
+++ b/okular/plasma/components/pageitem.h
@@ -25,7 +25,7 @@
 #include <core/document.h>
 #include <core/view.h>
 
-class QTimer;
+#include <QTimer>
 
 class DocumentItem;
 
diff --git a/okular/shell/okular_main.h b/okular/shell/okular_main.h
index 950b18ef..a46c8bbb 100644
--- a/okular/shell/okular_main.h
+++ b/okular/shell/okular_main.h
@@ -12,8 +12,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Okular
 {
diff --git a/okular/tests/testingutils.h b/okular/tests/testingutils.h
index 72fa3d1e..3ed209e3 100644
--- a/okular/tests/testingutils.h
+++ b/okular/tests/testingutils.h
@@ -11,8 +11,8 @@
 #define OKULAR_TESTINGUTILS_H
 
 template<class T >
-class QLinkedList;
-class QString;
+#include <QLinkedList>
+#include <QString>
 
 namespace Okular {
 class NormalizedPoint;
diff --git a/okular/ui/annotationpropertiesdialog.h b/okular/ui/annotationpropertiesdialog.h
index 3e121046..dfb96e32 100644
--- a/okular/ui/annotationpropertiesdialog.h
+++ b/okular/ui/annotationpropertiesdialog.h
@@ -12,8 +12,8 @@
 
 #include <kpagedialog.h>
 
-class QLabel;
-class QLineEdit;
+#include <QLabel>
+#include <QLineEdit>
 class AnnotationWidget;
 
 namespace Okular {
diff --git a/okular/ui/annotationtools.h b/okular/ui/annotationtools.h
index dc36dc7c..c7ac8e46 100644
--- a/okular/ui/annotationtools.h
+++ b/okular/ui/annotationtools.h
@@ -17,9 +17,9 @@
 
 #include "core/area.h"
 
-class QMouseEvent;
+#include <QMouseEvent>
 class QTabletEvent;
-class QPainter;
+#include <QPainter>
 class PageViewItem;
 namespace Okular {
 class Annotation;
diff --git a/okular/ui/annotationwidgets.h b/okular/ui/annotationwidgets.h
index 6e7a2183..f2f77593 100644
--- a/okular/ui/annotationwidgets.h
+++ b/okular/ui/annotationwidgets.h
@@ -14,11 +14,11 @@
 
 #include "core/annotations.h"
 
-class QCheckBox;
-class QComboBox;
-class QDoubleSpinBox;
-class QLabel;
-class QWidget;
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QWidget>
 class KColorButton;
 class KIntNumInput;
 class KFontRequester;
diff --git a/okular/ui/annotwindow.h b/okular/ui/annotwindow.h
index 579f3d33..ad96bd1b 100644
--- a/okular/ui/annotwindow.h
+++ b/okular/ui/annotwindow.h
@@ -25,7 +25,7 @@ class LatexRenderer;
 
 class KTextEdit;
 class MovableTitle;
-class QMenu;
+#include <QMenu>
 
 class AnnotWindow : public QFrame
 {
diff --git a/okular/ui/bookmarklist.h b/okular/ui/bookmarklist.h
index 03acd43b..ead38023 100644
--- a/okular/ui/bookmarklist.h
+++ b/okular/ui/bookmarklist.h
@@ -14,9 +14,9 @@
 
 #include "core/observer.h"
 
-class QAction;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QAction>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 class KTreeWidgetSearchLine;
 class KUrl;
 class BookmarkItem;
diff --git a/okular/ui/embeddedfilesdialog.h b/okular/ui/embeddedfilesdialog.h
index f3e2d038..33b8da6f 100644
--- a/okular/ui/embeddedfilesdialog.h
+++ b/okular/ui/embeddedfilesdialog.h
@@ -12,7 +12,7 @@
 
 #include <kdialog.h>
 
-class QTreeWidget;
+#include <QTreeWidget>
 
 namespace Okular {
 class Document;
diff --git a/okular/ui/findbar.h b/okular/ui/findbar.h
index 1166628e..1931bd4b 100644
--- a/okular/ui/findbar.h
+++ b/okular/ui/findbar.h
@@ -12,7 +12,7 @@
 
 #include <qwidget.h>
 
-class QAction;
+#include <QAction>
 class SearchLineWidget;
 
 namespace Okular {
diff --git a/okular/ui/formwidgets.h b/okular/ui/formwidgets.h
index 9b5d455e..75a3f163 100644
--- a/okular/ui/formwidgets.h
+++ b/okular/ui/formwidgets.h
@@ -22,12 +22,12 @@
 #include <kurlrequester.h>
 
 class ComboEdit;
-class QMenu;
-class QButtonGroup;
+#include <QMenu>
+#include <QButtonGroup>
 class FormWidgetIface;
 class PageViewItem;
 class RadioButtonEdit;
-class QEvent;
+#include <QEvent>
 
 namespace Okular {
 class Action;
diff --git a/okular/ui/guiutils.h b/okular/ui/guiutils.h
index cb970338..6c29e0da 100644
--- a/okular/ui/guiutils.h
+++ b/okular/ui/guiutils.h
@@ -12,11 +12,11 @@
 
 #include <QtCore/QString>
 
-class QColor;
-class QImage;
-class QPixmap;
-class QSize;
-class QWidget;
+#include <QColor>
+#include <QImage>
+#include <QPixmap>
+#include <QSize>
+#include <QWidget>
 class KIconLoader;
 
 namespace Okular {
diff --git a/okular/ui/ktreeviewsearchline.h b/okular/ui/ktreeviewsearchline.h
index fbf9f215..bd94beab 100644
--- a/okular/ui/ktreeviewsearchline.h
+++ b/okular/ui/ktreeviewsearchline.h
@@ -24,8 +24,8 @@
 
 #include <klineedit.h>
 
-class QModelIndex;
-class QTreeView;
+#include <QModelIndex>
+#include <QTreeView>
 
 /**
  * This class makes it easy to add a search line for filtering the items in
diff --git a/okular/ui/latexrenderer.h b/okular/ui/latexrenderer.h
index 3b46be3a..33b22361 100644
--- a/okular/ui/latexrenderer.h
+++ b/okular/ui/latexrenderer.h
@@ -15,8 +15,8 @@
 
 #include <QStringList>
 
-class QString;
-class QColor;
+#include <QString>
+#include <QColor>
 
 namespace GuiUtils
 {
diff --git a/okular/ui/minibar.h b/okular/ui/minibar.h
index 5654ad88..d0a5085e 100644
--- a/okular/ui/minibar.h
+++ b/okular/ui/minibar.h
@@ -22,9 +22,9 @@ class Document;
 
 class MiniBar;
 class HoverButton;
-class QIntValidator;
-class QLabel;
-class QToolBar;
+#include <QIntValidator>
+#include <QLabel>
+#include <QToolBar>
 
 // [private widget] lineEdit for entering/validating page numbers
 class PagesEdit : public KLineEdit
diff --git a/okular/ui/pagepainter.h b/okular/ui/pagepainter.h
index 68b24165..f3354dcc 100644
--- a/okular/ui/pagepainter.h
+++ b/okular/ui/pagepainter.h
@@ -16,8 +16,8 @@
 
 #include "core/area.h"  // for NormalizedPoint
 
-class QPainter;
-class QRect;
+#include <QPainter>
+#include <QRect>
 namespace Okular {
     class DocumentObserver;
     class Page;
diff --git a/okular/ui/pageviewannotator.h b/okular/ui/pageviewannotator.h
index f70eff9a..1b425541 100644
--- a/okular/ui/pageviewannotator.h
+++ b/okular/ui/pageviewannotator.h
@@ -17,9 +17,9 @@
 #include "pageviewutils.h"
 #include "annotationtools.h"
 
-class QKeyEvent;
-class QMouseEvent;
-class QPainter;
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPainter>
 
 namespace Okular
 {
diff --git a/okular/ui/pageviewutils.h b/okular/ui/pageviewutils.h
index bb1a76b0..6f357d6b 100644
--- a/okular/ui/pageviewutils.h
+++ b/okular/ui/pageviewutils.h
@@ -20,9 +20,9 @@
 
 #include "core/area.h"
 
-class QAction;
-class QLabel;
-class QTimer;
+#include <QAction>
+#include <QLabel>
+#include <QTimer>
 class FormWidgetIface;
 class PageView;
 class VideoWidget;
diff --git a/okular/ui/presentationwidget.h b/okular/ui/presentationwidget.h
index 5f9478dd..008fe386 100644
--- a/okular/ui/presentationwidget.h
+++ b/okular/ui/presentationwidget.h
@@ -18,9 +18,9 @@
 #include "core/observer.h"
 #include "core/pagetransition.h"
 
-class QLineEdit;
-class QToolBar;
-class QTimer;
+#include <QLineEdit>
+#include <QToolBar>
+#include <QTimer>
 class KActionCollection;
 class KSelectAction;
 class SmoothPathEngine;
diff --git a/okular/ui/propertiesdialog.h b/okular/ui/propertiesdialog.h
index d63de7b4..efd9e2b8 100644
--- a/okular/ui/propertiesdialog.h
+++ b/okular/ui/propertiesdialog.h
@@ -17,8 +17,8 @@
 
 #include "core/fontinfo.h"
 
-class QLabel;
-class QProgressBar;
+#include <QLabel>
+#include <QProgressBar>
 class FontsListModel;
 class KSqueezedTextLabel;
 
diff --git a/okular/ui/searchlineedit.h b/okular/ui/searchlineedit.h
index 63ff4965..b5aa13d9 100644
--- a/okular/ui/searchlineedit.h
+++ b/okular/ui/searchlineedit.h
@@ -15,7 +15,7 @@
 
 #include <klineedit.h>
 
-class QTimer;
+#include <QTimer>
 class KPixmapSequenceWidget;
 
 /**
diff --git a/okular/ui/searchwidget.h b/okular/ui/searchwidget.h
index b93fc46f..ed10ecbd 100644
--- a/okular/ui/searchwidget.h
+++ b/okular/ui/searchwidget.h
@@ -16,8 +16,8 @@ namespace Okular {
 class Document;
 }
 
-class QAction;
-class QMenu;
+#include <QAction>
+#include <QMenu>
 
 class SearchLineEdit;
 
diff --git a/okular/ui/side_reviews.h b/okular/ui/side_reviews.h
index 9d1f9b08..4c01f5ec 100644
--- a/okular/ui/side_reviews.h
+++ b/okular/ui/side_reviews.h
@@ -16,7 +16,7 @@
 
 #include "core/observer.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace Okular {
 class Annotation;
diff --git a/okular/ui/sidebar.h b/okular/ui/sidebar.h
index cf5dfc6c..cdb86209 100644
--- a/okular/ui/sidebar.h
+++ b/okular/ui/sidebar.h
@@ -13,8 +13,8 @@
 #include <qwidget.h>
 #include <KUrl>
 
-class QIcon;
-class QListWidgetItem;
+#include <QIcon>
+#include <QListWidgetItem>
 
 class Sidebar : public QWidget
 {
diff --git a/okular/ui/snapshottaker.h b/okular/ui/snapshottaker.h
index 0a522625..87408062 100644
--- a/okular/ui/snapshottaker.h
+++ b/okular/ui/snapshottaker.h
@@ -14,7 +14,7 @@
 
 #include <QtCore/QObject>
 
-class QImage;
+#include <QImage>
 
 class SnapshotTaker : public QObject
 {
diff --git a/okular/ui/toc.h b/okular/ui/toc.h
index 3338c8d7..597ca92a 100644
--- a/okular/ui/toc.h
+++ b/okular/ui/toc.h
@@ -16,9 +16,9 @@
 
 #include "okular_part_export.h"
 
-class QDomNode;
-class QModelIndex;
-class QTreeView;
+#include <QDomNode>
+#include <QModelIndex>
+#include <QTreeView>
 class KTreeViewSearchLine;
 class TOCModel;
 
diff --git a/okular/ui/toolaction.h b/okular/ui/toolaction.h
index 9e6a3c5f..0a0f721e 100644
--- a/okular/ui/toolaction.h
+++ b/okular/ui/toolaction.h
@@ -15,7 +15,7 @@
 
 #include <kaction.h>
 
-class QToolButton;
+#include <QToolButton>
 
 class ToolAction : public KAction
 {
diff --git a/partitionmanager/src/backend/corebackend.h b/partitionmanager/src/backend/corebackend.h
index 86ac73c1..89f19c85 100644
--- a/partitionmanager/src/backend/corebackend.h
+++ b/partitionmanager/src/backend/corebackend.h
@@ -33,7 +33,7 @@ class PartitionTable;
 
 class KAboutData;
 
-class QString;
+#include <QString>
 
 /**
   * Interface class for backend plugins.
diff --git a/partitionmanager/src/backend/corebackendmanager.h b/partitionmanager/src/backend/corebackendmanager.h
index 133b861b..c9a13a96 100644
--- a/partitionmanager/src/backend/corebackendmanager.h
+++ b/partitionmanager/src/backend/corebackendmanager.h
@@ -25,8 +25,8 @@
 
 #include <kservice.h>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 class CoreBackend;
 
 /**
diff --git a/partitionmanager/src/config/advancedpagewidget.h b/partitionmanager/src/config/advancedpagewidget.h
index 7265a624..d1585a68 100644
--- a/partitionmanager/src/config/advancedpagewidget.h
+++ b/partitionmanager/src/config/advancedpagewidget.h
@@ -27,7 +27,7 @@
 
 #include <QWidget>
 
-class QString;
+#include <QString>
 class KComboBox;
 
 class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced
diff --git a/partitionmanager/src/config/generalpagewidget.h b/partitionmanager/src/config/generalpagewidget.h
index 118d5dd3..5623c378 100644
--- a/partitionmanager/src/config/generalpagewidget.h
+++ b/partitionmanager/src/config/generalpagewidget.h
@@ -27,7 +27,7 @@
 
 #include <QWidget>
 
-class QString;
+#include <QString>
 class KComboBox;
 
 class GeneralPageWidget : public QWidget, public Ui::ConfigurePageGeneral
diff --git a/partitionmanager/src/core/copysourcefile.h b/partitionmanager/src/core/copysourcefile.h
index 411987d6..c02ef0c4 100644
--- a/partitionmanager/src/core/copysourcefile.h
+++ b/partitionmanager/src/core/copysourcefile.h
@@ -26,7 +26,7 @@
 #include <qglobal.h>
 #include <QFile>
 
-class QString;
+#include <QString>
 class CopyTarget;
 
 /** A file to copy from.
diff --git a/partitionmanager/src/core/copytargetfile.h b/partitionmanager/src/core/copytargetfile.h
index a35472f0..5531feab 100644
--- a/partitionmanager/src/core/copytargetfile.h
+++ b/partitionmanager/src/core/copytargetfile.h
@@ -26,7 +26,7 @@
 #include <qglobal.h>
 #include <QFile>
 
-class QString;
+#include <QString>
 
 /** A file to copy to.
 
diff --git a/partitionmanager/src/core/partition.h b/partitionmanager/src/core/partition.h
index fe5d2740..df8cf130 100644
--- a/partitionmanager/src/core/partition.h
+++ b/partitionmanager/src/core/partition.h
@@ -59,8 +59,8 @@ class FileSystem;
 
 class Report;
 
-class QString;
-class QTextStream;
+#include <QString>
+#include <QTextStream>
 
 /** A partition or some unallocated space on a Device.
 
diff --git a/partitionmanager/src/core/partitionrole.h b/partitionmanager/src/core/partitionrole.h
index ad80df9b..6bb70589 100644
--- a/partitionmanager/src/core/partitionrole.h
+++ b/partitionmanager/src/core/partitionrole.h
@@ -25,7 +25,7 @@
 
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 /** A Partition's role.
 
diff --git a/partitionmanager/src/core/partitiontable.h b/partitionmanager/src/core/partitiontable.h
index 86addadf..9e78bad7 100644
--- a/partitionmanager/src/core/partitiontable.h
+++ b/partitionmanager/src/core/partitiontable.h
@@ -33,7 +33,7 @@ class Device;
 class Partition;
 class CoreBackend;
 
-class QTextStream;
+#include <QTextStream>
 
 /** The partition table (a.k.a Disk Label)
 
diff --git a/partitionmanager/src/fs/btrfs.h b/partitionmanager/src/fs/btrfs.h
index 3bc08a70..a784524d 100644
--- a/partitionmanager/src/fs/btrfs.h
+++ b/partitionmanager/src/fs/btrfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/exfat.h b/partitionmanager/src/fs/exfat.h
index 871f1ef4..2cd7729e 100644
--- a/partitionmanager/src/fs/exfat.h
+++ b/partitionmanager/src/fs/exfat.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ext2.h b/partitionmanager/src/fs/ext2.h
index 87098b7d..fec0f689 100644
--- a/partitionmanager/src/fs/ext2.h
+++ b/partitionmanager/src/fs/ext2.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ext3.h b/partitionmanager/src/fs/ext3.h
index 72e47aea..0b0f8e63 100644
--- a/partitionmanager/src/fs/ext3.h
+++ b/partitionmanager/src/fs/ext3.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ext4.h b/partitionmanager/src/fs/ext4.h
index a2c05cb3..d4cc1db3 100644
--- a/partitionmanager/src/fs/ext4.h
+++ b/partitionmanager/src/fs/ext4.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/extended.h b/partitionmanager/src/fs/extended.h
index d2dab2b3..de9a1064 100644
--- a/partitionmanager/src/fs/extended.h
+++ b/partitionmanager/src/fs/extended.h
@@ -27,7 +27,7 @@
 
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/fat16.h b/partitionmanager/src/fs/fat16.h
index 3ea78cb5..bd47861f 100644
--- a/partitionmanager/src/fs/fat16.h
+++ b/partitionmanager/src/fs/fat16.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/fat32.h b/partitionmanager/src/fs/fat32.h
index 35a501da..2441eaf8 100644
--- a/partitionmanager/src/fs/fat32.h
+++ b/partitionmanager/src/fs/fat32.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/filesystemfactory.h b/partitionmanager/src/fs/filesystemfactory.h
index bda8ca5b..d54ac16d 100644
--- a/partitionmanager/src/fs/filesystemfactory.h
+++ b/partitionmanager/src/fs/filesystemfactory.h
@@ -28,7 +28,7 @@
 #include <QMap>
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 /** Factory to create instances of FileSystem.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/fs/hfs.h b/partitionmanager/src/fs/hfs.h
index cc724c70..d5ff4056 100644
--- a/partitionmanager/src/fs/hfs.h
+++ b/partitionmanager/src/fs/hfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/hfsplus.h b/partitionmanager/src/fs/hfsplus.h
index d3a343ae..326da90c 100644
--- a/partitionmanager/src/fs/hfsplus.h
+++ b/partitionmanager/src/fs/hfsplus.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/hpfs.h b/partitionmanager/src/fs/hpfs.h
index 6a4ab078..fe12cd45 100644
--- a/partitionmanager/src/fs/hpfs.h
+++ b/partitionmanager/src/fs/hpfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/jfs.h b/partitionmanager/src/fs/jfs.h
index 1e849423..17426692 100644
--- a/partitionmanager/src/fs/jfs.h
+++ b/partitionmanager/src/fs/jfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/linuxswap.h b/partitionmanager/src/fs/linuxswap.h
index d3539be7..e41d0998 100644
--- a/partitionmanager/src/fs/linuxswap.h
+++ b/partitionmanager/src/fs/linuxswap.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/luks.h b/partitionmanager/src/fs/luks.h
index 00614799..da7b5274 100644
--- a/partitionmanager/src/fs/luks.h
+++ b/partitionmanager/src/fs/luks.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/lvm2_pv.h b/partitionmanager/src/fs/lvm2_pv.h
index f3ae3ffc..dea13bbb 100644
--- a/partitionmanager/src/fs/lvm2_pv.h
+++ b/partitionmanager/src/fs/lvm2_pv.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/nilfs2.h b/partitionmanager/src/fs/nilfs2.h
index af1b29d7..4465eebd 100644
--- a/partitionmanager/src/fs/nilfs2.h
+++ b/partitionmanager/src/fs/nilfs2.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ntfs.h b/partitionmanager/src/fs/ntfs.h
index aa62d8bd..260ad6e3 100644
--- a/partitionmanager/src/fs/ntfs.h
+++ b/partitionmanager/src/fs/ntfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ocfs2.h b/partitionmanager/src/fs/ocfs2.h
index fba5fc20..7a0fd942 100644
--- a/partitionmanager/src/fs/ocfs2.h
+++ b/partitionmanager/src/fs/ocfs2.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/reiser4.h b/partitionmanager/src/fs/reiser4.h
index 30e40e29..f33426e0 100644
--- a/partitionmanager/src/fs/reiser4.h
+++ b/partitionmanager/src/fs/reiser4.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/reiserfs.h b/partitionmanager/src/fs/reiserfs.h
index f0448839..887944ff 100644
--- a/partitionmanager/src/fs/reiserfs.h
+++ b/partitionmanager/src/fs/reiserfs.h
@@ -31,7 +31,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/ufs.h b/partitionmanager/src/fs/ufs.h
index 9fb80f29..8a64c512 100644
--- a/partitionmanager/src/fs/ufs.h
+++ b/partitionmanager/src/fs/ufs.h
@@ -27,7 +27,7 @@
 
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/unformatted.h b/partitionmanager/src/fs/unformatted.h
index fcb714e4..a468c98b 100644
--- a/partitionmanager/src/fs/unformatted.h
+++ b/partitionmanager/src/fs/unformatted.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/xfs.h b/partitionmanager/src/fs/xfs.h
index 6f50cf3e..e1b221e2 100644
--- a/partitionmanager/src/fs/xfs.h
+++ b/partitionmanager/src/fs/xfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/fs/zfs.h b/partitionmanager/src/fs/zfs.h
index ca8e185b..6b8236a5 100644
--- a/partitionmanager/src/fs/zfs.h
+++ b/partitionmanager/src/fs/zfs.h
@@ -29,7 +29,7 @@
 
 class Report;
 
-class QString;
+#include <QString>
 
 namespace FS
 {
diff --git a/partitionmanager/src/gui/applyprogressdialog.h b/partitionmanager/src/gui/applyprogressdialog.h
index 2691e913..4ab96bf1 100644
--- a/partitionmanager/src/gui/applyprogressdialog.h
+++ b/partitionmanager/src/gui/applyprogressdialog.h
@@ -35,9 +35,9 @@ class ApplyProgressDetailsWidget;
 class Report;
 
 
-class QTreeWidgetItem;
-class QCloseEvent;
-class QKeyEvent;
+#include <QTreeWidgetItem>
+#include <QCloseEvent>
+#include <QKeyEvent>
 
 /** Show progress.
 
diff --git a/partitionmanager/src/gui/devicepropsdialog.h b/partitionmanager/src/gui/devicepropsdialog.h
index d7f08982..daa04a67 100644
--- a/partitionmanager/src/gui/devicepropsdialog.h
+++ b/partitionmanager/src/gui/devicepropsdialog.h
@@ -26,8 +26,8 @@
 class Device;
 class DevicePropsWidget;
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 /** Show Device properties.
 
diff --git a/partitionmanager/src/gui/editmountoptionsdialog.h b/partitionmanager/src/gui/editmountoptionsdialog.h
index 096644ce..aaabbd09 100644
--- a/partitionmanager/src/gui/editmountoptionsdialog.h
+++ b/partitionmanager/src/gui/editmountoptionsdialog.h
@@ -24,9 +24,9 @@
 #include <kdialog.h>
 
 class EditMountOptionsDialogWidget;
-class QStringList;
-class QString;
-class QWidget;
+#include <QStringList>
+#include <QString>
+#include <QWidget>
 
 class EditMountOptionsDialog : public KDialog
 {
diff --git a/partitionmanager/src/gui/editmountoptionsdialogwidget.h b/partitionmanager/src/gui/editmountoptionsdialogwidget.h
index 94e688ba..4fd44199 100644
--- a/partitionmanager/src/gui/editmountoptionsdialogwidget.h
+++ b/partitionmanager/src/gui/editmountoptionsdialogwidget.h
@@ -25,8 +25,8 @@
 
 #include <QWidget>
 
-class QStringList;
-class QPlainTextEdit;
+#include <QStringList>
+#include <QPlainTextEdit>
 
 class EditMountOptionsDialogWidget : public QWidget, public Ui::EditMountOptionsDialogWidgetBase
 {
diff --git a/partitionmanager/src/gui/editmountpointdialog.h b/partitionmanager/src/gui/editmountpointdialog.h
index d19e648c..7f226d89 100644
--- a/partitionmanager/src/gui/editmountpointdialog.h
+++ b/partitionmanager/src/gui/editmountpointdialog.h
@@ -26,8 +26,8 @@
 class EditMountPointDialogWidget;
 class Partition;
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 class EditMountPointDialog : public KDialog
 {
diff --git a/partitionmanager/src/gui/editmountpointdialogwidget.h b/partitionmanager/src/gui/editmountpointdialogwidget.h
index 853404f8..e04427a5 100644
--- a/partitionmanager/src/gui/editmountpointdialogwidget.h
+++ b/partitionmanager/src/gui/editmountpointdialogwidget.h
@@ -32,11 +32,11 @@ class KPushButton;
 class KLineEdit;
 class KComboBox;
 
-class QWidget;
-class QSpinBox;
-class QCheckBox;
-class QStringList;
-class QFile;
+#include <QWidget>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QStringList>
+#include <QFile>
 
 class MountEntry;
 
diff --git a/partitionmanager/src/gui/infopane.h b/partitionmanager/src/gui/infopane.h
index 02fd23d1..8854d34c 100644
--- a/partitionmanager/src/gui/infopane.h
+++ b/partitionmanager/src/gui/infopane.h
@@ -26,8 +26,8 @@
 class Partition;
 class Device;
 
-class QGridLayout;
-class QString;
+#include <QGridLayout>
+#include <QString>
 
 /** Show information about Partitions and Devices
 
diff --git a/partitionmanager/src/gui/listdevices.h b/partitionmanager/src/gui/listdevices.h
index 0fc27530..32f8bca5 100644
--- a/partitionmanager/src/gui/listdevices.h
+++ b/partitionmanager/src/gui/listdevices.h
@@ -30,7 +30,7 @@
 #include <QWidget>
 
 class Device;
-class QPoint;
+#include <QPoint>
 class KActionCollection;
 
 /** A list of devices.
diff --git a/partitionmanager/src/gui/listoperations.h b/partitionmanager/src/gui/listoperations.h
index a2488a2a..fc0e45b5 100644
--- a/partitionmanager/src/gui/listoperations.h
+++ b/partitionmanager/src/gui/listoperations.h
@@ -30,7 +30,7 @@
 #include <QWidget>
 
 class Operation;
-class QPoint;
+#include <QPoint>
 class KActionCollection;
 
 /** A list of pending operations.
diff --git a/partitionmanager/src/gui/mainwindow.h b/partitionmanager/src/gui/mainwindow.h
index 18c09c69..8cb95f5e 100644
--- a/partitionmanager/src/gui/mainwindow.h
+++ b/partitionmanager/src/gui/mainwindow.h
@@ -39,10 +39,10 @@ class InfoPane;
 
 class KActionCollection;
 
-class QWidget;
-class QLabel;
-class QCloseEvent;
-class QEvent;
+#include <QWidget>
+#include <QLabel>
+#include <QCloseEvent>
+#include <QEvent>
 
 /** The application's main window.
 
diff --git a/partitionmanager/src/gui/partitionmanagerwidget.h b/partitionmanager/src/gui/partitionmanagerwidget.h
index 5a22e4d2..53754f2e 100644
--- a/partitionmanager/src/gui/partitionmanagerwidget.h
+++ b/partitionmanager/src/gui/partitionmanagerwidget.h
@@ -34,9 +34,9 @@ class Partition;
 class PartWidget;
 class Device;
 
-class QWidget;
-class QLabel;
-class QPoint;
+#include <QWidget>
+#include <QLabel>
+#include <QPoint>
 
 /** The central widget for the application.
 
diff --git a/partitionmanager/src/gui/partpropsdialog.h b/partitionmanager/src/gui/partpropsdialog.h
index fb112449..28e37a13 100644
--- a/partitionmanager/src/gui/partpropsdialog.h
+++ b/partitionmanager/src/gui/partpropsdialog.h
@@ -31,8 +31,8 @@
 class Device;
 class PartPropsWidget;
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 
 /** Show Partition properties.
diff --git a/partitionmanager/src/gui/partresizerwidget.h b/partitionmanager/src/gui/partresizerwidget.h
index 645c98c6..4c0aa64c 100644
--- a/partitionmanager/src/gui/partresizerwidget.h
+++ b/partitionmanager/src/gui/partresizerwidget.h
@@ -30,9 +30,9 @@ class Device;
 
 class NewDialog;
 
-class QPaintEvent;
-class QResizeEvent;
-class QMouseEvent;
+#include <QPaintEvent>
+#include <QResizeEvent>
+#include <QMouseEvent>
 
 /** Widget that allows the user to resize a Partition.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/gui/parttablewidget.h b/partitionmanager/src/gui/parttablewidget.h
index b62a93cd..84bf4cd6 100644
--- a/partitionmanager/src/gui/parttablewidget.h
+++ b/partitionmanager/src/gui/parttablewidget.h
@@ -29,8 +29,8 @@
 class PartWidget;
 class PartitionTable;
 
-class QResizeEvent;
-class QMouseEvent;
+#include <QResizeEvent>
+#include <QMouseEvent>
 
 /** Widget that represents a PartitionTable.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/gui/partwidget.h b/partitionmanager/src/gui/partwidget.h
index 2b1a36c0..d8bfc1d1 100644
--- a/partitionmanager/src/gui/partwidget.h
+++ b/partitionmanager/src/gui/partwidget.h
@@ -27,8 +27,8 @@
 
 class Partition;
 
-class QPaintEvent;
-class QResizeEvent;
+#include <QPaintEvent>
+#include <QResizeEvent>
 
 /** Widget that represents a Partition.
 
diff --git a/partitionmanager/src/gui/partwidgetbase.h b/partitionmanager/src/gui/partwidgetbase.h
index 2f6349b8..f8be3470 100644
--- a/partitionmanager/src/gui/partwidgetbase.h
+++ b/partitionmanager/src/gui/partwidgetbase.h
@@ -28,7 +28,7 @@
 
 class Partition;
 class PartWidget;
-class QWidget;
+#include <QWidget>
 
 /** Base class for all widgets that need to position Partitions.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/gui/scanprogressdialog.h b/partitionmanager/src/gui/scanprogressdialog.h
index 2c0fb4a3..6299a673 100644
--- a/partitionmanager/src/gui/scanprogressdialog.h
+++ b/partitionmanager/src/gui/scanprogressdialog.h
@@ -23,7 +23,7 @@
 
 #include <kprogressdialog.h>
 
-class QShowEvent;
+#include <QShowEvent>
 
 class ScanProgressDialog : public KProgressDialog
 {
diff --git a/partitionmanager/src/gui/smartdialog.h b/partitionmanager/src/gui/smartdialog.h
index 4149c6e9..facd3d78 100644
--- a/partitionmanager/src/gui/smartdialog.h
+++ b/partitionmanager/src/gui/smartdialog.h
@@ -26,9 +26,9 @@
 class Device;
 class SmartDialogWidget;
 
-class QWidget;
-class QString;
-class QPoint;
+#include <QWidget>
+#include <QString>
+#include <QPoint>
 
 /** Show SMART properties.
 
diff --git a/partitionmanager/src/gui/smartdialogwidget.h b/partitionmanager/src/gui/smartdialogwidget.h
index f512cd5f..bb7424d2 100644
--- a/partitionmanager/src/gui/smartdialogwidget.h
+++ b/partitionmanager/src/gui/smartdialogwidget.h
@@ -23,8 +23,8 @@
 
 #include "ui_smartdialogwidgetbase.h"
 
-class QStyledItemDelegate;
-class QPoint;
+#include <QStyledItemDelegate>
+#include <QPoint>
 
 /** Central widget in the SmartDialogWidget
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/gui/treelog.h b/partitionmanager/src/gui/treelog.h
index 7d0c5083..e521b177 100644
--- a/partitionmanager/src/gui/treelog.h
+++ b/partitionmanager/src/gui/treelog.h
@@ -31,7 +31,7 @@
 
 #include <kdebug.h>
 
-class QTreeWidget;
+#include <QTreeWidget>
 
 /** A tree for formatted log output.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/checkfilesystemjob.h b/partitionmanager/src/jobs/checkfilesystemjob.h
index 4ce40ada..a4cc9c48 100644
--- a/partitionmanager/src/jobs/checkfilesystemjob.h
+++ b/partitionmanager/src/jobs/checkfilesystemjob.h
@@ -26,7 +26,7 @@
 class Partition;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Check a FileSystem.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/copyfilesystemjob.h b/partitionmanager/src/jobs/copyfilesystemjob.h
index 6c4af33d..81542549 100644
--- a/partitionmanager/src/jobs/copyfilesystemjob.h
+++ b/partitionmanager/src/jobs/copyfilesystemjob.h
@@ -29,7 +29,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Copy a FileSystem.
 
diff --git a/partitionmanager/src/jobs/createfilesystemjob.h b/partitionmanager/src/jobs/createfilesystemjob.h
index f5bce2f5..ead70a6b 100644
--- a/partitionmanager/src/jobs/createfilesystemjob.h
+++ b/partitionmanager/src/jobs/createfilesystemjob.h
@@ -27,7 +27,7 @@ class Device;
 class Partition;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Create a FileSystem.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/createpartitionjob.h b/partitionmanager/src/jobs/createpartitionjob.h
index 4a389dd6..a189f6d6 100644
--- a/partitionmanager/src/jobs/createpartitionjob.h
+++ b/partitionmanager/src/jobs/createpartitionjob.h
@@ -27,7 +27,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Create a Partition.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/createpartitiontablejob.h b/partitionmanager/src/jobs/createpartitiontablejob.h
index 837f89f7..584bdf5f 100644
--- a/partitionmanager/src/jobs/createpartitiontablejob.h
+++ b/partitionmanager/src/jobs/createpartitiontablejob.h
@@ -26,7 +26,7 @@
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Create a PartitionTable.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/deletefilesystemjob.h b/partitionmanager/src/jobs/deletefilesystemjob.h
index 6b01e517..3f1759f9 100644
--- a/partitionmanager/src/jobs/deletefilesystemjob.h
+++ b/partitionmanager/src/jobs/deletefilesystemjob.h
@@ -27,7 +27,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Delete a FileSystem.
 
diff --git a/partitionmanager/src/jobs/deletepartitionjob.h b/partitionmanager/src/jobs/deletepartitionjob.h
index 7f702b47..cb910cbd 100644
--- a/partitionmanager/src/jobs/deletepartitionjob.h
+++ b/partitionmanager/src/jobs/deletepartitionjob.h
@@ -27,7 +27,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Delete a Partition.
 	@author Volker Lanz <vl@fidra.de>
diff --git a/partitionmanager/src/jobs/job.h b/partitionmanager/src/jobs/job.h
index 4ce07c7c..fdd344fe 100644
--- a/partitionmanager/src/jobs/job.h
+++ b/partitionmanager/src/jobs/job.h
@@ -28,8 +28,8 @@
 #include <QObject>
 #include <qglobal.h>
 
-class QString;
-class QIcon;
+#include <QString>
+#include <QIcon>
 
 class CopySource;
 class CopyTarget;
diff --git a/partitionmanager/src/jobs/movefilesystemjob.h b/partitionmanager/src/jobs/movefilesystemjob.h
index fe965f97..7b829acd 100644
--- a/partitionmanager/src/jobs/movefilesystemjob.h
+++ b/partitionmanager/src/jobs/movefilesystemjob.h
@@ -27,7 +27,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Move a FileSystem.
 
diff --git a/partitionmanager/src/jobs/resizefilesystemjob.h b/partitionmanager/src/jobs/resizefilesystemjob.h
index a83bbba1..58fc1c7a 100644
--- a/partitionmanager/src/jobs/resizefilesystemjob.h
+++ b/partitionmanager/src/jobs/resizefilesystemjob.h
@@ -27,7 +27,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Resize a FileSystem.
 
diff --git a/partitionmanager/src/jobs/setpartflagsjob.h b/partitionmanager/src/jobs/setpartflagsjob.h
index baebf30c..a26ce223 100644
--- a/partitionmanager/src/jobs/setpartflagsjob.h
+++ b/partitionmanager/src/jobs/setpartflagsjob.h
@@ -29,7 +29,7 @@ class Device;
 class Partition;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Set a Partition's flags.
 
diff --git a/partitionmanager/src/jobs/setpartgeometryjob.h b/partitionmanager/src/jobs/setpartgeometryjob.h
index 870917c3..2ccf4b0c 100644
--- a/partitionmanager/src/jobs/setpartgeometryjob.h
+++ b/partitionmanager/src/jobs/setpartgeometryjob.h
@@ -29,7 +29,7 @@ class Partition;
 class Device;
 class Report;
 
-class QString;
+#include <QString>
 
 /** Set a Partition's geometry.
 
diff --git a/partitionmanager/src/ops/operation.h b/partitionmanager/src/ops/operation.h
index 2c737ee0..369ef29d 100644
--- a/partitionmanager/src/ops/operation.h
+++ b/partitionmanager/src/ops/operation.h
@@ -32,8 +32,8 @@ class Job;
 class OperationRunner;
 class Report;
 
-class QString;
-class QIcon;
+#include <QString>
+#include <QIcon>
 
 /** Base class of all Operations.
 
diff --git a/partitionmanager/src/plugins/dummy/dummybackend.h b/partitionmanager/src/plugins/dummy/dummybackend.h
index 9c610210..d15efc0c 100644
--- a/partitionmanager/src/plugins/dummy/dummybackend.h
+++ b/partitionmanager/src/plugins/dummy/dummybackend.h
@@ -28,7 +28,7 @@
 
 class Device;
 class KPluginFactory;
-class QString;
+#include <QString>
 
 /** Dummy backend plugin that doesn't really do anything.
 
diff --git a/partitionmanager/src/plugins/libparted/libpartedbackend.h b/partitionmanager/src/plugins/libparted/libpartedbackend.h
index 48cd3442..cbec0ac0 100644
--- a/partitionmanager/src/plugins/libparted/libpartedbackend.h
+++ b/partitionmanager/src/plugins/libparted/libpartedbackend.h
@@ -40,7 +40,7 @@ class OperationStack;
 
 class Device;
 class KPluginFactory;
-class QString;
+#include <QString>
 
 /** Backend plugin for libparted.
 
diff --git a/partitionmanager/src/util/helpers.h b/partitionmanager/src/util/helpers.h
index c8729086..e9649c9a 100644
--- a/partitionmanager/src/util/helpers.h
+++ b/partitionmanager/src/util/helpers.h
@@ -26,10 +26,10 @@
 #include "fs/filesystem.h"
 
 class KAboutData;
-class QString;
-class QIcon;
-class QPoint;
-class QTreeWidget;
+#include <QString>
+#include <QIcon>
+#include <QPoint>
+#include <QTreeWidget>
 
 LIBPARTITIONMANAGERPRIVATE_EXPORT void registerMetaTypes();
 LIBPARTITIONMANAGERPRIVATE_EXPORT bool checkPermissions();
diff --git a/partitionmanager/src/util/htmlreport.h b/partitionmanager/src/util/htmlreport.h
index 93703e2d..6a9d0929 100644
--- a/partitionmanager/src/util/htmlreport.h
+++ b/partitionmanager/src/util/htmlreport.h
@@ -21,7 +21,7 @@
 
 #define HTMLREPORT__H
 
-class QString;
+#include <QString>
 
 class HtmlReport
 {
diff --git a/print-manager/configure-printer/ConfigurePrinterInterface.h b/print-manager/configure-printer/ConfigurePrinterInterface.h
index 1e9f9b02..090c374b 100644
--- a/print-manager/configure-printer/ConfigurePrinterInterface.h
+++ b/print-manager/configure-printer/ConfigurePrinterInterface.h
@@ -24,8 +24,8 @@
 #include <QtCore/QObject>
 #include <QtDBus/QDBusContext>
 
-class QTimer;
-class QWidget;
+#include <QTimer>
+#include <QWidget>
 class ConfigurePrinterInterface : public QObject, protected QDBusContext
 {
     Q_OBJECT
diff --git a/print-manager/printer-manager-kcm/PrinterDelegate.h b/print-manager/printer-manager-kcm/PrinterDelegate.h
index 95a94bc7..4c5354ad 100644
--- a/print-manager/printer-manager-kcm/PrinterDelegate.h
+++ b/print-manager/printer-manager-kcm/PrinterDelegate.h
@@ -24,7 +24,7 @@
 #include <QApplication>
 #include <QtGui/QStyledItemDelegate>
 
-class QPainter;
+#include <QPainter>
 
 /**
  * Delegate for displaying the printers
diff --git a/print-manager/printer-manager-kcm/PrinterDescription.h b/print-manager/printer-manager-kcm/PrinterDescription.h
index 1445d322..568b8af9 100644
--- a/print-manager/printer-manager-kcm/PrinterDescription.h
+++ b/print-manager/printer-manager-kcm/PrinterDescription.h
@@ -25,8 +25,8 @@
 
 #include <KCupsRequest.h>
 
-class QToolButton;
-class QSortFilterProxyModel;
+#include <QToolButton>
+#include <QSortFilterProxyModel>
 
 namespace Ui {
     class PrinterDescription;
diff --git a/svgpart/svgpart.h b/svgpart/svgpart.h
index cb2a1e21..a447a738 100644
--- a/svgpart/svgpart.h
+++ b/svgpart/svgpart.h
@@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kparts/part.h>
 
 
-class QGraphicsScene;
-class QGraphicsSvgItem;
-class QGraphicsView;
-class QSvgRenderer;
+#include <QGraphicsScene>
+#include <QGraphicsSvgItem>
+#include <QGraphicsView>
+#include <QSvgRenderer>
 
 class SvgPart : public KParts::ReadOnlyPart {
 	Q_OBJECT
diff --git a/syndication/abstractparser.h b/syndication/abstractparser.h
index 1015eaee..bb41c1ea 100644
--- a/syndication/abstractparser.h
+++ b/syndication/abstractparser.h
@@ -27,7 +27,7 @@
 
 #include "ksyndication_export.h"
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/syndication/atom/atomtools.h b/syndication/atom/atomtools.h
index 5ce2c38f..5bc31a25 100644
--- a/syndication/atom/atomtools.h
+++ b/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/syndication/atom/category.h b/syndication/atom/category.h
index 3c935443..0c29ae12 100644
--- a/syndication/atom/category.h
+++ b/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/syndication/atom/constants.h b/syndication/atom/constants.h
index da05b089..1c6113b7 100644
--- a/syndication/atom/constants.h
+++ b/syndication/atom/constants.h
@@ -24,7 +24,7 @@
 
 #include <syndication/ksyndication_export.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace Atom {
diff --git a/syndication/atom/content.h b/syndication/atom/content.h
index 76178458..67e040a2 100644
--- a/syndication/atom/content.h
+++ b/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/syndication/atom/document.h b/syndication/atom/document.h
index 336563c1..6685b718 100644
--- a/syndication/atom/document.h
+++ b/syndication/atom/document.h
@@ -28,7 +28,7 @@
 
 #include <ctime>
 
-template <class T> class QList;
+#include <QList>
 
 namespace Syndication {
 
diff --git a/syndication/atom/entry.h b/syndication/atom/entry.h
index fc5df2bd..ff564f31 100644
--- a/syndication/atom/entry.h
+++ b/syndication/atom/entry.h
@@ -30,8 +30,8 @@
 
 #include <ctime>
 
-class QDomElement;
-class QString;
+#include <QDomElement>
+#include <QString>
 
 namespace Syndication {
 
diff --git a/syndication/atom/generator.h b/syndication/atom/generator.h
index 6839e51a..e9edae90 100644
--- a/syndication/atom/generator.h
+++ b/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/syndication/atom/link.h b/syndication/atom/link.h
index ace86066..05c00be9 100644
--- a/syndication/atom/link.h
+++ b/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/syndication/atom/parser.h b/syndication/atom/parser.h
index 9aca582b..9be1e22b 100644
--- a/syndication/atom/parser.h
+++ b/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/syndication/atom/person.h b/syndication/atom/person.h
index c3a96c1d..0247b83d 100644
--- a/syndication/atom/person.h
+++ b/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/syndication/atom/source.h b/syndication/atom/source.h
index c25e20af..22af5f3f 100644
--- a/syndication/atom/source.h
+++ b/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/syndication/constants.h b/syndication/constants.h
index 5560ef0c..b63c4564 100644
--- a/syndication/constants.h
+++ b/syndication/constants.h
@@ -25,7 +25,7 @@
 
 #include "ksyndication_export.h"
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/syndication/dataretriever.h b/syndication/dataretriever.h
index a9cfd882..9257be09 100644
--- a/syndication/dataretriever.h
+++ b/syndication/dataretriever.h
@@ -23,7 +23,7 @@ namespace KIO
 class KJob;
 class KUrl;
 
-class QByteArray;
+#include <QByteArray>
 
 namespace Syndication
 {
diff --git a/syndication/documentsource.h b/syndication/documentsource.h
index a4af692c..ff4581bb 100644
--- a/syndication/documentsource.h
+++ b/syndication/documentsource.h
@@ -28,8 +28,8 @@
 
 #include "ksyndication_export.h"
 
-class QByteArray;
-class QDomDocument;
+#include <QByteArray>
+#include <QDomDocument>
 
 namespace Syndication {
 
diff --git a/syndication/elementwrapper.h b/syndication/elementwrapper.h
index 686ed9c8..913c596f 100644
--- a/syndication/elementwrapper.h
+++ b/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/syndication/feed.h b/syndication/feed.h
index bce08ac7..ff8209fe 100644
--- a/syndication/feed.h
+++ b/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/syndication/item.h b/syndication/item.h
index 1d439660..b77ffd65 100644
--- a/syndication/item.h
+++ b/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/syndication/rdf/contentvocab.h b/syndication/rdf/contentvocab.h
index f6646c33..1d6b91d1 100644
--- a/syndication/rdf/contentvocab.h
+++ b/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/syndication/rdf/document.h b/syndication/rdf/document.h
index 232837da..f7d00d70 100644
--- a/syndication/rdf/document.h
+++ b/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/syndication/rdf/dublincore.h b/syndication/rdf/dublincore.h
index f048b32c..3fdc94e6 100644
--- a/syndication/rdf/dublincore.h
+++ b/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/syndication/rdf/dublincorevocab.h b/syndication/rdf/dublincorevocab.h
index 68f41c50..21539c68 100644
--- a/syndication/rdf/dublincorevocab.h
+++ b/syndication/rdf/dublincorevocab.h
@@ -25,7 +25,7 @@
 
 #include <syndication/rdf/property.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/syndication/rdf/item.h b/syndication/rdf/item.h
index 47241903..689030c3 100644
--- a/syndication/rdf/item.h
+++ b/syndication/rdf/item.h
@@ -27,7 +27,7 @@
 
 #include <syndication/specificitem.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/syndication/rdf/model.h b/syndication/rdf/model.h
index 39e6b167..9b0172cf 100644
--- a/syndication/rdf/model.h
+++ b/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/syndication/rdf/modelmaker.h b/syndication/rdf/modelmaker.h
index 4abfcd5c..737bb912 100644
--- a/syndication/rdf/modelmaker.h
+++ b/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/syndication/rdf/property.h b/syndication/rdf/property.h
index b631db6f..db3ea588 100644
--- a/syndication/rdf/property.h
+++ b/syndication/rdf/property.h
@@ -25,7 +25,7 @@
 
 #include <syndication/rdf/resource.h>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/syndication/rdf/rdfvocab.h b/syndication/rdf/rdfvocab.h
index 7ba41619..457210e8 100644
--- a/syndication/rdf/rdfvocab.h
+++ b/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/syndication/rdf/resource.h b/syndication/rdf/resource.h
index 78445c51..ae027118 100644
--- a/syndication/rdf/resource.h
+++ b/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/syndication/rdf/rssvocab.h b/syndication/rdf/rssvocab.h
index 2aef6072..9ca39436 100644
--- a/syndication/rdf/rssvocab.h
+++ b/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/syndication/rdf/sequence.h b/syndication/rdf/sequence.h
index 04b7cb96..06b73d98 100644
--- a/syndication/rdf/sequence.h
+++ b/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/syndication/rdf/statement.h b/syndication/rdf/statement.h
index cb5e1489..8c19a616 100644
--- a/syndication/rdf/statement.h
+++ b/syndication/rdf/statement.h
@@ -26,7 +26,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/syndication/rdf/syndicationinfo.h b/syndication/rdf/syndicationinfo.h
index f204df15..18a0c801 100644
--- a/syndication/rdf/syndicationinfo.h
+++ b/syndication/rdf/syndicationinfo.h
@@ -26,7 +26,7 @@
 
 #include <ctime>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 namespace RDF {
diff --git a/syndication/rdf/syndicationvocab.h b/syndication/rdf/syndicationvocab.h
index 9b123fd7..37df223b 100644
--- a/syndication/rdf/syndicationvocab.h
+++ b/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/syndication/rss2/category.h b/syndication/rss2/category.h
index 9a0d4681..9b4551cb 100644
--- a/syndication/rss2/category.h
+++ b/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/syndication/rss2/cloud.h b/syndication/rss2/cloud.h
index cb5e72a7..105d1005 100644
--- a/syndication/rss2/cloud.h
+++ b/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/syndication/rss2/document.h b/syndication/rss2/document.h
index f4b8adec..ef5acfea 100644
--- a/syndication/rss2/document.h
+++ b/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/syndication/rss2/enclosure.h b/syndication/rss2/enclosure.h
index 0d6437df..d2c0dd95 100644
--- a/syndication/rss2/enclosure.h
+++ b/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/syndication/rss2/image.h b/syndication/rss2/image.h
index 473fe223..cf9e8aed 100644
--- a/syndication/rss2/image.h
+++ b/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/syndication/rss2/item.h b/syndication/rss2/item.h
index e54c39c8..c8925348 100644
--- a/syndication/rss2/item.h
+++ b/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/syndication/rss2/source.h b/syndication/rss2/source.h
index 95960ac8..11322ea2 100644
--- a/syndication/rss2/source.h
+++ b/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/syndication/rss2/textinput.h b/syndication/rss2/textinput.h
index a6486033..5873444c 100644
--- a/syndication/rss2/textinput.h
+++ b/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/syndication/rss2/tools_p.h b/syndication/rss2/tools_p.h
index 1fe23a38..6d8e82ef 100644
--- a/syndication/rss2/tools_p.h
+++ b/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/syndication/specificdocument.h b/syndication/specificdocument.h
index 9484e666..63ef6c12 100644
--- a/syndication/specificdocument.h
+++ b/syndication/specificdocument.h
@@ -26,7 +26,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-class QString;
+#include <QString>
 
 namespace Syndication {
 
diff --git a/syndication/tools.h b/syndication/tools.h
index 557075af..ffce063b 100644
--- a/syndication/tools.h
+++ b/syndication/tools.h
@@ -31,8 +31,8 @@
 
 #include <ctime>
 
-class QByteArray;
-class QString;
+#include <QByteArray>
+#include <QString>
 
 namespace Syndication {
 
diff --git a/yakuake/app/config/appearancesettings.h b/yakuake/app/config/appearancesettings.h
index 9b0bdb6b..7238b51e 100644
--- a/yakuake/app/config/appearancesettings.h
+++ b/yakuake/app/config/appearancesettings.h
@@ -30,8 +30,8 @@
 
 class SkinListDelegate;
 
-class QStandardItem;
-class QStandardItemModel;
+#include <QStandardItem>
+#include <QStandardItemModel>
 
 class AppearanceSettings : public QWidget, private Ui::AppearanceSettings
 {
diff --git a/yakuake/app/tabbar.h b/yakuake/app/tabbar.h
index 0c7709ad..7f019ffb 100644
--- a/yakuake/app/tabbar.h
+++ b/yakuake/app/tabbar.h
@@ -35,8 +35,8 @@ class KLineEdit;
 class KMenu;
 class KPushButton;
 
-class QToolButton;
-class QLabel;
+#include <QToolButton>
+#include <QLabel>
 
 
 class TabBar : public QWidget
diff --git a/yakuake/app/terminal.h b/yakuake/app/terminal.h
index 23e70a00..c3111e37 100644
--- a/yakuake/app/terminal.h
+++ b/yakuake/app/terminal.h
@@ -25,7 +25,7 @@
 #include <KParts/Part>
 
 
-class QKeyEvent;
+#include <QKeyEvent>
 
 class TerminalInterface;
 
diff --git a/yakuake/app/visualeventoverlay.h b/yakuake/app/visualeventoverlay.h
index 4a1c3ace..5e5e6bed 100644
--- a/yakuake/app/visualeventoverlay.h
+++ b/yakuake/app/visualeventoverlay.h
@@ -30,7 +30,7 @@
 class SessionStack;
 class Terminal;
 
-class QTimer;
+#include <QTimer>
 
 
 class EventRect : public QRect