diff --git a/dnssd/avahi-servicebrowser_p.h b/dnssd/avahi-servicebrowser_p.h
index 2611b269..d48b9674 100644
--- a/dnssd/avahi-servicebrowser_p.h
+++ b/dnssd/avahi-servicebrowser_p.h
@@ -32,7 +32,7 @@ namespace DNSSD
 
 class ServiceBrowserPrivate : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 public:
 	ServiceBrowserPrivate(ServiceBrowser* parent) : QObject(), m_running(false), m_browser(0), m_parent(parent)
 	{}
diff --git a/dnssd/avahi-servicetypebrowser_p.h b/dnssd/avahi-servicetypebrowser_p.h
index 97cd50d5..2991324e 100644
--- a/dnssd/avahi-servicetypebrowser_p.h
+++ b/dnssd/avahi-servicetypebrowser_p.h
@@ -31,7 +31,7 @@ namespace DNSSD
 
 class ServiceTypeBrowserPrivate : public QObject 
 {   
-Q_OBJECT
+    Q_OBJECT
 public: 
     ServiceTypeBrowserPrivate(ServiceTypeBrowser* parent) : m_browser(0), m_parent(parent),m_started(false) {}
     ~ServiceTypeBrowserPrivate() {  if (m_browser) m_browser->Free(); }
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index 901a9361..f0072710 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -22,9 +22,9 @@
 #define DNSSDDOMAINBROWSER_H
 
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include <dnssd/remoteservice.h>
 
-class QStringList;
 namespace DNSSD
 {
 class DomainBrowserPrivate;
diff --git a/dnssd/mdnsd-domainbrowser_p.h b/dnssd/mdnsd-domainbrowser_p.h
index f7e17549..8d025668 100644
--- a/dnssd/mdnsd-domainbrowser_p.h
+++ b/dnssd/mdnsd-domainbrowser_p.h
@@ -21,9 +21,9 @@
 #ifndef MDNSD_DOMAINBROWSER_P_H
 #define MDNSD_DOMAINBROWSER_P_H
 
+#include <QtCore/QStringList>
 #include "mdnsd-responder.h"
 #include "domainbrowser.h"
-#include <QtCore/QStringList>
 
 namespace DNSSD
 {
diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h
index 8ca8e855..b0e8d839 100644
--- a/dnssd/publicservice.h
+++ b/dnssd/publicservice.h
@@ -22,8 +22,8 @@
 #define DNSSDPUBLICSERVICE_H
 
 #include <QtCore/QObject>
-#include <dnssd/servicebase.h>
 #include <QtCore/QStringList>
+#include <dnssd/servicebase.h>
 
 namespace DNSSD
 {
diff --git a/dnssd/servicetypebrowser.h b/dnssd/servicetypebrowser.h
index 3f23759d..f1aaae2a 100644
--- a/dnssd/servicetypebrowser.h
+++ b/dnssd/servicetypebrowser.h
@@ -22,9 +22,9 @@
 #define DNSSDSERVICETYPEBROWSER_H
 
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 #include <dnssd/remoteservice.h>
 
-class QStringList;
 namespace DNSSD
 {
 class ServiceTypeBrowserPrivate;
diff --git a/interfaces/ktexteditor/annotationinterface.h b/interfaces/ktexteditor/annotationinterface.h
index 3c1ddc71..d3db86b8 100644
--- a/interfaces/ktexteditor/annotationinterface.h
+++ b/interfaces/ktexteditor/annotationinterface.h
@@ -24,8 +24,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 
 #include <QtCore/QObject>
-
-class QMenu;
+#include <QtGui/QMenu>
 
 namespace KTextEditor
 {
diff --git a/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h b/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h
index 81280260..93de9938 100644
--- a/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h
+++ b/interfaces/ktexteditor/codecompletionmodelcontrollerinterface.h
@@ -25,7 +25,7 @@
 #include <ktexteditor/cursor.h>
 #include "codecompletionmodel.h"
 
-class QModelIndex;
+#include <QModelIndex>
 
 namespace KTextEditor {
 class View;
diff --git a/interfaces/ktexteditor/commandinterface.h b/interfaces/ktexteditor/commandinterface.h
index 60550cb6..59378151 100644
--- a/interfaces/ktexteditor/commandinterface.h
+++ b/interfaces/ktexteditor/commandinterface.h
@@ -25,8 +25,8 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/range.h>
 #include <QtCore/QObject>
+#include <QtCore/QStringList>
 
-class QStringList;
 class KCompletion;
 
 namespace KTextEditor
diff --git a/interfaces/ktexteditor/editorchooser.h b/interfaces/ktexteditor/editorchooser.h
index ebc51f74..7149f68a 100644
--- a/interfaces/ktexteditor/editorchooser.h
+++ b/interfaces/ktexteditor/editorchooser.h
@@ -23,10 +23,10 @@
 #include <ktexteditor/document.h>
 #include <ktexteditor/editor.h>
 
+#include <QtCore/QString>
 #include <QtGui/QWidget>
 
 class KConfig;
-class QString;
 
 namespace KTextEditor
 {
diff --git a/interfaces/ktexteditor/markinterface.h b/interfaces/ktexteditor/markinterface.h
index d98b67c0..9eca7fcb 100644
--- a/interfaces/ktexteditor/markinterface.h
+++ b/interfaces/ktexteditor/markinterface.h
@@ -25,10 +25,9 @@
 
 #include <QtCore/QHash>
 #include <QtCore/QObject>
-
-class QPixmap;
-class QPoint;
-class QMenu;
+#include <QtCore/QPoint>
+#include <QtGui/QPixmap>
+#include <QtGui/QMenu>
 
 namespace KTextEditor
 {
diff --git a/interfaces/ktexteditor/searchinterface.h b/interfaces/ktexteditor/searchinterface.h
index e53734cd..228f522d 100644
--- a/interfaces/ktexteditor/searchinterface.h
+++ b/interfaces/ktexteditor/searchinterface.h
@@ -24,7 +24,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/range.h>
 
-class QString;
+#include <QString>
 
 namespace KTextEditor
 {
diff --git a/interfaces/ktexteditor/smartinterface.h b/interfaces/ktexteditor/smartinterface.h
index 99871282..d2f5651b 100644
--- a/interfaces/ktexteditor/smartinterface.h
+++ b/interfaces/ktexteditor/smartinterface.h
@@ -23,7 +23,7 @@
 #include <ktexteditor/ktexteditor_export.h>
 #include <ktexteditor/smartrange.h>
 
-class QMutex;
+#include <QMutex>
 
 namespace KTextEditor
 {
diff --git a/interfaces/ktexteditor/smartrange.h b/interfaces/ktexteditor/smartrange.h
index 22a2540b..eeff5e16 100644
--- a/interfaces/ktexteditor/smartrange.h
+++ b/interfaces/ktexteditor/smartrange.h
@@ -28,7 +28,7 @@
 #include <QtCore/QList>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-template <class T> class QStack;
+#include <QStack>
 #endif
 
 class KAction;
diff --git a/interfaces/ktexteditor/variableinterface.h b/interfaces/ktexteditor/variableinterface.h
index d6314793..00acff86 100644
--- a/interfaces/ktexteditor/variableinterface.h
+++ b/interfaces/ktexteditor/variableinterface.h
@@ -26,7 +26,7 @@
 
 #include <QtCore/QObject>
 
-class QString;
+#include <QString>
 
 namespace KTextEditor {
 
diff --git a/interfaces/ktexteditor/view.h b/interfaces/ktexteditor/view.h
index 7c230d21..9ad1e4da 100644
--- a/interfaces/ktexteditor/view.h
+++ b/interfaces/ktexteditor/view.h
@@ -29,7 +29,7 @@
 // widget
 #include <QtGui/QWidget>
 
-class QMenu;
+#include <QMenu>
 
 namespace KTextEditor
 {
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 0e9a987a..ea10d77d 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -21,7 +21,7 @@
 
 #include <QtCore/QObject>
 
-class QStringList;
+#include <QStringList>
 
 /**
  * TerminalInterface is an interface implemented by KonsolePart to
diff --git a/kcddb/libkcddb/cdinfodialog.h b/kcddb/libkcddb/cdinfodialog.h
index 50caebc8..942e259c 100644
--- a/kcddb/libkcddb/cdinfodialog.h
+++ b/kcddb/libkcddb/cdinfodialog.h
@@ -26,8 +26,8 @@
 
 #include <kdialog.h>
 
-class QStandardItemModel;
-class QModelIndex;
+#include <QStandardItemModel>
+#include <QModelIndex>
 
 namespace KCDDB
 {
diff --git a/kdeclarative/bindings/i18n_p.h b/kdeclarative/bindings/i18n_p.h
index de4af555..2ce0d76c 100644
--- a/kdeclarative/bindings/i18n_p.h
+++ b/kdeclarative/bindings/i18n_p.h
@@ -21,8 +21,8 @@
 
 #include <QtScript/QScriptValue>
 
-class QScriptContext;
-class QScriptEngine;
+#include <QScriptContext>
+#include <QScriptEngine>
 
 QScriptValue jsi18n(QScriptContext *context, QScriptEngine *engine);
 QScriptValue jsi18nc(QScriptContext *context, QScriptEngine *engine);
diff --git a/kdeclarative/kdeclarative.h b/kdeclarative/kdeclarative.h
index d95f6bb4..63ac8100 100644
--- a/kdeclarative/kdeclarative.h
+++ b/kdeclarative/kdeclarative.h
@@ -24,8 +24,8 @@
 
 #include <QStringList>
 
-class QDeclarativeEngine;
-class QScriptEngine;
+#include <QDeclarativeEngine>
+#include <QScriptEngine>
 
 class KDeclarativePrivate;
 
diff --git a/kdecore/date/kcalendarsystemprivate_p.h b/kdecore/date/kcalendarsystemprivate_p.h
index 3f7cd430..e8059368 100644
--- a/kdecore/date/kcalendarsystemprivate_p.h
+++ b/kdecore/date/kcalendarsystemprivate_p.h
@@ -20,9 +20,9 @@
 #ifndef KCALENDARSYSTEMPRIVATE_H
 #define KCALENDARSYSTEMPRIVATE_H
 
-class QChar;
-class QString;
-class QDate;
+#include <QChar>
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 class KCalendarEra;
diff --git a/kdecore/date/kdatetime.cpp b/kdecore/date/kdatetime.cpp
index 759ae607..5c2079c8 100644
--- a/kdecore/date/kdatetime.cpp
+++ b/kdecore/date/kdatetime.cpp
@@ -242,6 +242,7 @@ bool KDateTime::Spec::equivalentTo(const Spec &other) const
     }
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream & operator<<(QDataStream &s, const KDateTime::Spec &spec)
 {
     // The specification type is encoded in order to insulate from changes
@@ -303,6 +304,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime::Spec &spec)
     }
     return s;
 }
+QT_END_NAMESPACE
 
 
 /*----------------------------------------------------------------------------*/
@@ -2434,6 +2436,7 @@ KDateTime KDateTime::realCurrentLocalDateTime()
 #endif
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream & operator<<(QDataStream &s, const KDateTime &dt)
 {
     s << dt.date() << dt.time() << dt.timeSpec() << quint8(dt.isDateOnly() ? 0x01 : 0x00);
@@ -2453,6 +2456,7 @@ QDataStream & operator>>(QDataStream &s, KDateTime &kdt)
         kdt = KDateTime(d, t, spec);
     return s;
 }
+QT_END_NAMESPACE
 
 
 /*
diff --git a/kdecore/date/kdatetime.h b/kdecore/date/kdatetime.h
index e51bf5f7..0b38a649 100644
--- a/kdecore/date/kdatetime.h
+++ b/kdecore/date/kdatetime.h
@@ -28,9 +28,9 @@
 
 #include <ktimezone.h>
 
-#include <QtCore/qmetatype.h>
+#include <QMetaType>
+#include <QDataStream>
 
-class QDataStream;
 class KDateTimePrivate;
 class KDateTimeSpecPrivate;
 
@@ -1626,6 +1626,7 @@ class KDECORE_EXPORT KDateTime //krazy:exclude=dpointer (implicitly shared)
 Q_DECLARE_METATYPE(KDateTime)
 Q_DECLARE_METATYPE(KDateTime::Spec)
 
+QT_BEGIN_NAMESPACE
 /** Write @p spec to the datastream @p out, in binary format. */
 QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime::Spec &spec);
 /** Read a KDateTime::Spec object into @p spec from @p in, in binary format. */
@@ -1635,5 +1636,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &spec);
 QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime &dateTime);
 /** Read a KDateTime object into @p dateTime from @p in, in binary format. */
 QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime);
+QT_END_NAMESPACE
 
 #endif
diff --git a/kdecore/date/kdatetimeformatter_p.h b/kdecore/date/kdatetimeformatter_p.h
index bfa04dcf..b146ba82 100644
--- a/kdecore/date/kdatetimeformatter_p.h
+++ b/kdecore/date/kdatetimeformatter_p.h
@@ -23,10 +23,10 @@
 #include "klocale.h"
 #include "kglobal.h"
 
-class QChar;
-class QString;
-class QDate;
-class QTime;
+#include <QChar>
+#include <QString>
+#include <QDate>
+#include <QTime>
 
 class KDateTime;
 class KCalendarSystem;
diff --git a/kdecore/date/kdatetimeparser_p.h b/kdecore/date/kdatetimeparser_p.h
index 4a25b341..094d2d37 100644
--- a/kdecore/date/kdatetimeparser_p.h
+++ b/kdecore/date/kdatetimeparser_p.h
@@ -23,10 +23,10 @@
 #include "klocale.h"
 #include "kglobal.h"
 
-class QChar;
-class QString;
-class QDate;
-class QTime;
+#include <QChar>
+#include <QString>
+#include <QDate>
+#include <QTime>
 
 class KDateTime;
 class KCalendarSystem;
diff --git a/kdecore/date/kdayperiod_p.h b/kdecore/date/kdayperiod_p.h
index 817e5610..7c3064c8 100644
--- a/kdecore/date/kdayperiod_p.h
+++ b/kdecore/date/kdayperiod_p.h
@@ -25,9 +25,9 @@
 #include "klocale.h"
 #include <kdecore_export.h>
 
-class QDate;
-class QString;
-class QTime;
+#include <QDate>
+#include <QString>
+#include <QTime>
 
 class KDayPeriodPrivate;
 
diff --git a/kdecore/date/klocalizeddate.cpp b/kdecore/date/klocalizeddate.cpp
index b918e9e4..5f4a44a0 100644
--- a/kdecore/date/klocalizeddate.cpp
+++ b/kdecore/date/klocalizeddate.cpp
@@ -587,6 +587,7 @@ bool KLocalizedDate::operator>=(const QDate &rhs) const
     return (date() >= rhs);
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream &operator<<(QDataStream &out, const KLocalizedDate &date)
 {
     return out << (quint32)(date.toJulianDay()) << date.calendar()->calendarSystem();
@@ -614,3 +615,4 @@ QDebug operator<<(QDebug dbg, const KLocalizedDate &date)
     }
     return dbg.space();
 }
+QT_END_NAMESPACE
diff --git a/kdecore/date/klocalizeddate.h b/kdecore/date/klocalizeddate.h
index c91fd840..659b3ee9 100644
--- a/kdecore/date/klocalizeddate.h
+++ b/kdecore/date/klocalizeddate.h
@@ -1157,6 +1157,7 @@ private:
 
 Q_DECLARE_METATYPE(KLocalizedDate)
 
+QT_BEGIN_NAMESPACE
 /**
  * Data stream output operator
  *
@@ -1180,5 +1181,6 @@ QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &date);
  * @param date the date to write to the stream
  */
 QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
+QT_END_NAMESPACE
 
 #endif // KLOCALIZEDDATE_H
diff --git a/kdecore/io/kdebug.h b/kdecore/io/kdebug.h
index 6ed06680..9675177f 100644
--- a/kdecore/io/kdebug.h
+++ b/kdecore/io/kdebug.h
@@ -192,7 +192,7 @@ KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);
 // operators for KDE types
 class KUrl;
 class KDateTime;
-class QObject;
+#include <QObject>
 KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url);
 KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time);
 
diff --git a/kdecore/io/kdirwatch_p.h b/kdecore/io/kdirwatch_p.h
index 59517052..19fee02d 100644
--- a/kdecore/io/kdirwatch_p.h
+++ b/kdecore/io/kdirwatch_p.h
@@ -34,6 +34,7 @@
 #include <QtCore/qmap.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qtimer.h>
+#include <QtCore/qsocketnotifier.h>
 
 #ifdef HAVE_FAM
 #include <limits.h>
diff --git a/kdecore/jobs/kjob_p.h b/kdecore/jobs/kjob_p.h
index 62ebb3e2..115bf90b 100644
--- a/kdecore/jobs/kjob_p.h
+++ b/kdecore/jobs/kjob_p.h
@@ -26,8 +26,8 @@
 #include <QtCore/qmap.h>
 
 class KJobUiDelegate;
-class QTimer;
-class QEventLoop;
+#include <QTimer>
+#include <QEventLoop>
 
 // This is a private class, but it's exported for
 // KIO::Job's usage. Other Job classes in kdelibs may
diff --git a/kdecore/kernel/kauthorized.h b/kdecore/kernel/kauthorized.h
index c58012e6..ea3cc8de 100644
--- a/kdecore/kernel/kauthorized.h
+++ b/kdecore/kernel/kauthorized.h
@@ -24,8 +24,8 @@
 #include <kdecore_export.h>
 
 class KUrl;
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 /**
 * Extracted from kapplication (3.x). Kiosk authorization framework
diff --git a/kdecore/localization/kcatalog.cpp b/kdecore/localization/kcatalog.cpp
index d4e3b770..13888350 100644
--- a/kdecore/localization/kcatalog.cpp
+++ b/kdecore/localization/kcatalog.cpp
@@ -31,37 +31,13 @@
 #include <locale.h>
 #include "gettext.h"
 
-
-static bool s_localeSet = false;
-
-// Initialize the locale very early during application startup
-// This is necessary for e.g. toLocal8Bit() to work, even before
-// a Q[Core]Application exists (David)
-int kInitializeLocale()
-{
-    setlocale(LC_ALL, "");
-    extern Q_CORE_EXPORT bool qt_locale_initialized; // in Qt since 4.5.0
-    qt_locale_initialized = true; // as recommended by Thiago
-    s_localeSet = true;
-    return 1;
-}
-Q_CONSTRUCTOR_FUNCTION(kInitializeLocale)
-
 // not defined on win32 :(
 
 static char *langenv = 0;
 static const int langenvMaxlen = 42;
 // = "LANGUAGE=" + 32 chars for language code + terminating zero
 
-class KCatalogStaticData
-{
-public:
-    KCatalogStaticData() {}
-
-    QMutex mutex;
-};
-
-K_GLOBAL_STATIC(KCatalogStaticData, catalogStaticData)
+Q_GLOBAL_STATIC(QMutex, catalogLock)
 
 class KCatalogPrivate
 {
@@ -93,10 +69,7 @@ QByteArray KCatalogPrivate::currentLanguage;
 KCatalog::KCatalog(const QString & name, const QString & language )
   : d( new KCatalogPrivate )
 {
-    // Set locales if the static initializer didn't work
-    if (!s_localeSet) {
-        kInitializeLocale();
-    }
+  setlocale(LC_ALL, "");
 
   // Find locale directory for this catalog.
   QString localeDir = catalogLocaleDir( name, language );
@@ -203,7 +176,7 @@ void KCatalogPrivate::resetSystemLanguage ()
 
 QString KCatalog::translate(const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dgettext(d->name, msgid);
   d->resetSystemLanguage();
@@ -212,7 +185,7 @@ QString KCatalog::translate(const char * msgid) const
 
 QString KCatalog::translate(const char * msgctxt, const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
   d->resetSystemLanguage();
@@ -222,7 +195,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid) const
 QString KCatalog::translate(const char * msgid, const char * msgid_plural,
                             unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -232,7 +205,7 @@ QString KCatalog::translate(const char * msgid, const char * msgid_plural,
 QString KCatalog::translate(const char * msgctxt, const char * msgid,
                             const char * msgid_plural, unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -241,7 +214,7 @@ QString KCatalog::translate(const char * msgctxt, const char * msgid,
 
 QString KCatalog::translateStrict(const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dgettext(d->name, msgid);
   d->resetSystemLanguage();
@@ -250,7 +223,7 @@ QString KCatalog::translateStrict(const char * msgid) const
 
 QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dpgettext_expr(d->name, msgctxt, msgid);
   d->resetSystemLanguage();
@@ -260,7 +233,7 @@ QString KCatalog::translateStrict(const char * msgctxt, const char * msgid) cons
 QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
                                   unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dngettext(d->name, msgid, msgid_plural, n);
   d->resetSystemLanguage();
@@ -270,7 +243,7 @@ QString KCatalog::translateStrict(const char * msgid, const char * msgid_plural,
 QString KCatalog::translateStrict(const char * msgctxt, const char * msgid,
                                   const char * msgid_plural, unsigned long n) const
 {
-  QMutexLocker locker(&catalogStaticData->mutex);
+  QMutexLocker locker(catalogLock());
   d->setupGettextEnv();
   const char *msgstr = dnpgettext_expr(d->name, msgctxt, msgid, msgid_plural, n);
   d->resetSystemLanguage();
diff --git a/kdecore/localization/kcharsets.h b/kdecore/localization/kcharsets.h
index e5ded397..41171215 100644
--- a/kdecore/localization/kcharsets.h
+++ b/kdecore/localization/kcharsets.h
@@ -25,10 +25,10 @@
 class KCharsets;
 class KCharsetsPrivate;
 
-class QChar;
-class QString;
-class QStringList;
-class QTextCodec;
+#include <QChar>
+#include <QString>
+#include <QStringList>
+#include <QTextCodec>
 
 namespace KGlobal
 {
diff --git a/kdecore/localization/kcurrencycode.h b/kdecore/localization/kcurrencycode.h
index 0e3975fb..4fb8e32e 100644
--- a/kdecore/localization/kcurrencycode.h
+++ b/kdecore/localization/kcurrencycode.h
@@ -25,9 +25,9 @@
 #include <QtCore/qshareddata.h>
 #include <QtCore/qdatetime.h>
 
-class QDate;
-class QStringList;
-class QFileInfo;
+#include <QDate>
+#include <QStringList>
+#include <QFileInfo>
 
 class KCurrencyCodePrivate;
 
diff --git a/kdecore/localization/kencodingdetector.h b/kdecore/localization/kencodingdetector.h
index 272850b4..f0203340 100644
--- a/kdecore/localization/kencodingdetector.h
+++ b/kdecore/localization/kencodingdetector.h
@@ -26,8 +26,8 @@
 #include <kdecore_export.h>
 #include <QtCore/qstring.h>
 
-class QTextCodec;
-class QTextDecoder;
+#include <QTextCodec>
+#include <QTextDecoder>
 class KEncodingDetectorPrivate;
 
 /**
diff --git a/kdecore/localization/klocale_p.h b/kdecore/localization/klocale_p.h
index ebb44292..13699b7f 100644
--- a/kdecore/localization/klocale_p.h
+++ b/kdecore/localization/klocale_p.h
@@ -24,7 +24,7 @@
 #include "klocale.h"
 #include "kdayperiod_p.h"
 
-class QMutex;
+#include <QMutex>
 
 class KCatalog;
 
diff --git a/kdecore/network/klocalsocket_p.h b/kdecore/network/klocalsocket_p.h
index 3caf60c5..61e9298b 100644
--- a/kdecore/network/klocalsocket_p.h
+++ b/kdecore/network/klocalsocket_p.h
@@ -24,7 +24,7 @@
 #include "klocalsocket.h"
 #define MIN_SOCKADDR_UN_LEN	(sizeof(quint16) + sizeof(char))
 
-class QSocketNotifier;
+#include <QSocketNotifier>
 
 class KLocalSocketPrivate
 {
diff --git a/kdecore/network/ksocketfactory.h b/kdecore/network/ksocketfactory.h
index 4e963569..9254349a 100644
--- a/kdecore/network/ksocketfactory.h
+++ b/kdecore/network/ksocketfactory.h
@@ -26,10 +26,10 @@
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QHostAddress>
 
-class QTcpSocket;
-class QTcpServer;
-class QUdpSocket;
-class QUrl;
+#include <QTcpSocket>
+#include <QTcpServer>
+#include <QUdpSocket>
+#include <QUrl>
 
 /**
  * @namespace KSocketFactory
diff --git a/kdecore/network/ksslcertificatemanager.h b/kdecore/network/ksslcertificatemanager.h
index 9128ba73..c2dd0e7b 100644
--- a/kdecore/network/ksslcertificatemanager.h
+++ b/kdecore/network/ksslcertificatemanager.h
@@ -27,7 +27,7 @@
 #include <QtNetwork/QSslError>
 #include <QtCore/qdatetime.h>
 
-class QSslCertificate;
+#include <QSslCertificate>
 class KSslCertificateRulePrivate;
 class KSslCertificateManagerPrivate;
 
diff --git a/kdecore/network/kssld/kssld.h b/kdecore/network/kssld/kssld.h
index 04e01339..30e32f53 100644
--- a/kdecore/network/kssld/kssld.h
+++ b/kdecore/network/kssld/kssld.h
@@ -28,8 +28,8 @@
 
 class KSSLDPrivate;
 class KSslCertificateRule;
-class QSslCertificate;
-class QString;
+#include <QSslCertificate>
+#include <QString>
 
 class KSSLD : public KDEDModule
 {
diff --git a/kdecore/network/kssld/kssld_dbusmetatypes.h b/kdecore/network/kssld/kssld_dbusmetatypes.h
index 25055ddf..61f4505b 100644
--- a/kdecore/network/kssld/kssld_dbusmetatypes.h
+++ b/kdecore/network/kssld/kssld_dbusmetatypes.h
@@ -31,6 +31,7 @@ Q_DECLARE_METATYPE(QList<QSslCertificate>)
 Q_DECLARE_METATYPE(KSslError::Error)
 Q_DECLARE_METATYPE(QList<KSslError::Error>)
 
+QT_BEGIN_NAMESPACE
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert)
 {
@@ -102,6 +103,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KSslError::Error
     return argument;
 }
 
+QT_END_NAMESPACE
 
 static void registerMetaTypesForKSSLD()
 {
diff --git a/kdecore/network/ktcpsocket.h b/kdecore/network/ktcpsocket.h
index c57c5e9e..bf710b20 100644
--- a/kdecore/network/ktcpsocket.h
+++ b/kdecore/network/ktcpsocket.h
@@ -138,7 +138,7 @@ private:
 //TODO protocol (or maybe even application?) dependent automatic proxy choice
 
 class KTcpSocketPrivate;
-class QHostAddress;
+#include <QHostAddress>
 class KUrl;
 
 class KDECORE_EXPORT KTcpSocket: public QIODevice
diff --git a/kdecore/services/kmimeglobsfileparser_p.h b/kdecore/services/kmimeglobsfileparser_p.h
index e5a3a221..79a1481b 100644
--- a/kdecore/services/kmimeglobsfileparser_p.h
+++ b/kdecore/services/kmimeglobsfileparser_p.h
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <QtCore/QHash>
 
-class QIODevice;
-class QString;
+#include <QIODevice>
+#include <QString>
 
 /**
  * @internal
diff --git a/kdecore/services/kmimemagicrule_p.h b/kdecore/services/kmimemagicrule_p.h
index 80cf451c..93559530 100644
--- a/kdecore/services/kmimemagicrule_p.h
+++ b/kdecore/services/kmimemagicrule_p.h
@@ -23,7 +23,7 @@
 #include <QList>
 #include <QString>
 
-class QIODevice;
+#include <QIODevice>
 
 /**
  * @internal
diff --git a/kdecore/services/kservice.h b/kdecore/services/kservice.h
index a628d496..cc9a184a 100644
--- a/kdecore/services/kservice.h
+++ b/kdecore/services/kservice.h
@@ -27,10 +27,11 @@
 #include <ksycocaentry.h>
 #include <klocale.h>
 
+#include <QDataStream>
+#include <QWidget>
+
 class KServiceType;
-class QDataStream;
 class KDesktopFile;
-class QWidget;
 
 class KServicePrivate;
 
diff --git a/kdecore/services/kserviceaction.h b/kdecore/services/kserviceaction.h
index 1c5ed9a1..b7a18c1d 100644
--- a/kdecore/services/kserviceaction.h
+++ b/kdecore/services/kserviceaction.h
@@ -21,10 +21,11 @@
 #define KSERVICEACTION_H
 
 #include <kdecore_export.h>
+
 #include <QtCore/qshareddata.h>
 #include <QtCore/qdatastream.h>
+#include <QtCore/qvariant.h>
 
-class QVariant;
 class KServiceActionPrivate;
 
 /**
@@ -115,6 +116,7 @@ private:
     friend KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );
 };
 
+// FIXME: namespace the operators via QT_BEGIN_NAMEPSACE/QT_END_NAMESPACE
 KDECORE_EXPORT QDataStream& operator>>( QDataStream& str, KServiceAction& act );
 KDECORE_EXPORT QDataStream& operator<<( QDataStream& str, const KServiceAction& act );
 
diff --git a/kdecore/services/kservicetype.cpp b/kdecore/services/kservicetype.cpp
index 60eed378..0f4bf150 100644
--- a/kdecore/services/kservicetype.cpp
+++ b/kdecore/services/kservicetype.cpp
@@ -31,9 +31,6 @@
 
 extern int servicesDebugArea();
 
-template QDataStream& operator>> <QString, QVariant>(QDataStream&, QMap<QString, QVariant>&);
-template QDataStream& operator<< <QString, QVariant>(QDataStream&, const QMap<QString, QVariant>&);
-
 KServiceType::KServiceType( KServiceTypePrivate &dd, const QString& _name,
                             const QString& _comment )
     : KSycocaEntry(dd)
diff --git a/kdecore/services/kservicetype.h b/kdecore/services/kservicetype.h
index a25644dd..b61f0c4f 100644
--- a/kdecore/services/kservicetype.h
+++ b/kdecore/services/kservicetype.h
@@ -178,7 +178,9 @@ private:
     Q_DECLARE_PRIVATE(KServiceType)
 };
 
+//QT_BEGIN_NAMESPACE
 //QDataStream& operator>>( QDataStream& _str, KServiceType& s );
 //QDataStream& operator<<( QDataStream& _str, KServiceType& s );
+//QT_END_NAMESPACE
 
 #endif
diff --git a/kdecore/sycoca/kprotocolinfo.cpp b/kdecore/sycoca/kprotocolinfo.cpp
index 3459d0f6..068f80f2 100644
--- a/kdecore/sycoca/kprotocolinfo.cpp
+++ b/kdecore/sycoca/kprotocolinfo.cpp
@@ -473,6 +473,7 @@ bool KProtocolInfo::isKnownProtocol( const QString &protocol )
   return prot || isHelperProtocol(protocol);
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field )  {
   s >> field.name;
   int type;
@@ -486,3 +487,4 @@ QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field
   s << static_cast<int>( field.type );
   return s;
 }
+QT_END_NAMESPACE
diff --git a/kdecore/sycoca/kprotocolinfo.h b/kdecore/sycoca/kprotocolinfo.h
index 505ef242..3699f50d 100644
--- a/kdecore/sycoca/kprotocolinfo.h
+++ b/kdecore/sycoca/kprotocolinfo.h
@@ -23,7 +23,7 @@
 #include <ksycocaentry.h>
 #include <kservice.h>
 
-class QDataStream;
+#include <QDataStream>
 class KProtocolInfoPrivate;
 
 /**
@@ -370,7 +370,9 @@ private:
 
 };
 
+QT_BEGIN_NAMESPACE
 KDECORE_EXPORT QDataStream& operator>>( QDataStream& s, KProtocolInfo::ExtraField& field );
 KDECORE_EXPORT QDataStream& operator<<( QDataStream& s, const KProtocolInfo::ExtraField& field );
+QT_END_NAMESPACE
 
 #endif
diff --git a/kdecore/sycoca/ksycoca.h b/kdecore/sycoca/ksycoca.h
index d53aa998..5bb9fdd5 100644
--- a/kdecore/sycoca/ksycoca.h
+++ b/kdecore/sycoca/ksycoca.h
@@ -26,7 +26,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
 
-class QDataStream;
+#include <QDataStream>
 class KSycocaFactory;
 class KSycocaFactoryList;
 class KSycocaPrivate;
diff --git a/kdecore/sycoca/ksycocadict_p.h b/kdecore/sycoca/ksycocadict_p.h
index 43b0072f..6a1610a2 100644
--- a/kdecore/sycoca/ksycocadict_p.h
+++ b/kdecore/sycoca/ksycocadict_p.h
@@ -24,8 +24,8 @@
 
 #include <QList>
 
-class QString;
-class QDataStream;
+#include <QString>
+#include <QDataStream>
 
 /**
  * @internal
diff --git a/kdecore/sycoca/ksycocafactory.h b/kdecore/sycoca/ksycocafactory.h
index 3c6e205b..48928c9a 100644
--- a/kdecore/sycoca/ksycocafactory.h
+++ b/kdecore/sycoca/ksycocafactory.h
@@ -21,11 +21,11 @@
 
 #include <ksycocaentry.h>
 
-class QString;
+#include <QString>
 class KSycocaDict;
 class KSycocaResourceList;
-template <typename T> class QList;
-template <typename KT, typename VT> class QHash;
+#include <QList>
+#include <QHash>
 
 typedef QHash<QString, KSycocaEntry::Ptr> KSycocaEntryDict;
 
diff --git a/kdecore/tests/kcalendartest.h b/kdecore/tests/kcalendartest.h
index 505c137b..8fbb64aa 100644
--- a/kdecore/tests/kcalendartest.h
+++ b/kdecore/tests/kcalendartest.h
@@ -25,8 +25,8 @@
 
 #include "klocale.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 
diff --git a/kdecore/tests/kdatetimeformattertest.h b/kdecore/tests/kdatetimeformattertest.h
index 71fb06cc..4b01d94c 100644
--- a/kdecore/tests/kdatetimeformattertest.h
+++ b/kdecore/tests/kdatetimeformattertest.h
@@ -24,8 +24,8 @@
 
 #include "kdatetimeformatter_p.h"
 
-class QString;
-class QDate;
+#include <QString>
+#include <QDate>
 
 class KCalendarSystem;
 
diff --git a/kdecore/tests/kdirwatchtest_gui.h b/kdecore/tests/kdirwatchtest_gui.h
index e45f62dd..c970b5d8 100644
--- a/kdecore/tests/kdirwatchtest_gui.h
+++ b/kdecore/tests/kdirwatchtest_gui.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QDialog>
 
-class QTextBrowser;
+#include <QTextBrowser>
 
 class KDirWatchTest_GUI : public QWidget
 {
diff --git a/kdecore/tests/ktcpsockettest.h b/kdecore/tests/ktcpsockettest.h
index 3b8921b2..8a57ee77 100644
--- a/kdecore/tests/ktcpsockettest.h
+++ b/kdecore/tests/ktcpsockettest.h
@@ -47,8 +47,8 @@ public Q_SLOTS: //auxiliary slots to check signal emission from the socket
 };
 
 
-class QTcpServer;
-class QTcpSocket;
+#include <QTcpServer>
+#include <QTcpSocket>
 
 class Server : public QObject
 {
diff --git a/kdecore/util/kautostart.h b/kdecore/util/kautostart.h
index e419f301..52928181 100644
--- a/kdecore/util/kautostart.h
+++ b/kdecore/util/kautostart.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QStringList;
+#include <QStringList>
 
 /**
  * KAutostart provides a programmatic means to control the state of
diff --git a/kdecore/util/kdedmodule.h b/kdecore/util/kdedmodule.h
index 224a5a3f..37219ee5 100644
--- a/kdecore/util/kdedmodule.h
+++ b/kdecore/util/kdedmodule.h
@@ -30,7 +30,7 @@
 class KDEDModulePrivate;
 class Kded;
 
-class QDBusObjectPath;
+#include <QDBusObjectPath>
 
 /**
  * \class KDEDModule kdedmodule.h <KDEDModule>
diff --git a/kdecore/util/kmacroexpander.h b/kdecore/util/kmacroexpander.h
index 31e96e20..3c761787 100644
--- a/kdecore/util/kmacroexpander.h
+++ b/kdecore/util/kmacroexpander.h
@@ -25,9 +25,9 @@
 #include <kdecore_export.h>
 #include <QtCore/QChar>
 
-class QString;
-class QStringList;
-template <typename KT, typename VT> class QHash;
+#include <QString>
+#include <QStringList>
+#include <QHash>
 class KMacroExpanderBasePrivate;
 
 /**
diff --git a/kdecore/util/kshell.h b/kdecore/util/kshell.h
index 0d6d4b13..add83662 100644
--- a/kdecore/util/kshell.h
+++ b/kdecore/util/kshell.h
@@ -24,8 +24,8 @@
 #include <kdecore_export.h>
 #include <qglobal.h>
 
-class QStringList;
-class QString;
+#include <QStringList>
+#include <QString>
 
 /**
  * \namespace KShell
diff --git a/kdecore/util/kshell_p.h b/kdecore/util/kshell_p.h
index 2ed7b19b..8d200244 100644
--- a/kdecore/util/kshell_p.h
+++ b/kdecore/util/kshell_p.h
@@ -22,7 +22,7 @@
 #ifndef KSHELL_P_H
 #define KSHELL_P_H
 
-class QString;
+#include <QString>
 
 namespace KShell {
 
diff --git a/kdecore/util/kuser.h b/kdecore/util/kuser.h
index 8f9d229c..66641f5f 100644
--- a/kdecore/util/kuser.h
+++ b/kdecore/util/kuser.h
@@ -28,9 +28,9 @@
 #include <QtCore/QVariant>
 
 class KUserGroup;
-class QString;
-class QStringList;
-template <class T> class QList;
+#include <QString>
+#include <QStringList>
+#include <QList>
 
 #include <sys/types.h>
 typedef uid_t K_UID;
diff --git a/kdecore/util/qtest_kde.cpp b/kdecore/util/qtest_kde.cpp
index 79f88800..529bc177 100644
--- a/kdecore/util/qtest_kde.cpp
+++ b/kdecore/util/qtest_kde.cpp
@@ -54,10 +54,14 @@ private:
 
 // Unit test for this code: tests/kglobaltest.cpp
 
+QT_BEGIN_NAMESPACE
+
 bool QTest::kWaitForSignal(QObject *obj, const char *signal, int timeout )
 {
     KDESignalSpy spy(obj, signal, timeout);
     return spy.signalEmitted();
 }
 
+QT_END_NAMESPACE
+
 #include "qtest_kde.moc"
diff --git a/kdecore/util/qtest_kde.h b/kdecore/util/qtest_kde.h
index 81d74416..2128e582 100644
--- a/kdecore/util/qtest_kde.h
+++ b/kdecore/util/qtest_kde.h
@@ -35,6 +35,8 @@
 #include <QtCore/qdir.h>
 #include <QtCore/qtextstream.h>
 
+QT_BEGIN_NAMESPACE
+
 namespace QTest
 {
     /**
@@ -49,6 +51,8 @@ namespace QTest
     KDECORE_EXPORT bool kWaitForSignal(QObject *obj, const char *signal, int timeout = 0);
 } // namespace QTest
 
+QT_END_NAMESPACE
+
 // By default, unit tests get no gui.
 // Pass GUI if you use any GUI classes
 enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2!
diff --git a/kded/kbuildsycoca.h b/kded/kbuildsycoca.h
index ff8b074a..28cd813f 100644
--- a/kded/kbuildsycoca.h
+++ b/kded/kbuildsycoca.h
@@ -33,7 +33,7 @@
 
 #include "vfolder_menu.h"
 
-class QDataStream;
+#include <QDataStream>
 
 // No need for this in libkio - apps only get readonly access
 class KBuildSycoca : public KSycoca, public KBuildSycocaInterface
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 79507fe7..c458b4e1 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -65,11 +65,13 @@ static bool bCheckSycoca;
 static bool bCheckUpdates;
 static bool bCheckHostname;
 
+QT_BEGIN_NAMESPACE
 #ifdef Q_DBUS_EXPORT
 extern Q_DBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
 #else
 extern QDBUS_EXPORT void qDBusAddSpyHook(void (*)(const QDBusMessage&));
 #endif
+QT_END_NAMESPACE
 
 static void runBuildSycoca(QObject *callBackObj=0, const char *callBackSlot=0, const char *callBackErrorSlot=0)
 {
diff --git a/kded/kded.h b/kded/kded.h
index fefb4f25..516b1392 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -34,7 +34,7 @@
 #include <kdedmodule.h>
 #include <kservice.h>
 
-class QDBusServiceWatcher;
+#include <QDBusServiceWatcher>
 class KDirWatch;
 
 // No need for this in libkio - apps only get readonly access
diff --git a/kdeui/actions/kactioncategory.h b/kdeui/actions/kactioncategory.h
index 8aa917c4..212665d3 100644
--- a/kdeui/actions/kactioncategory.h
+++ b/kdeui/actions/kactioncategory.h
@@ -32,7 +32,7 @@
 class KAction;
 struct KActionCategoryPrivate;
 
-class QAction;
+#include <QAction>
 
 
 
diff --git a/kdeui/actions/kactioncollection.h b/kdeui/actions/kactioncollection.h
index 3bb6841d..f25dd291 100644
--- a/kdeui/actions/kactioncollection.h
+++ b/kdeui/actions/kactioncollection.h
@@ -32,11 +32,11 @@
 
 #include <QtCore/QObject>
 
-class QAction;
+#include <QAction>
 class KXMLGUIClient;
 
-class QActionGroup;
-class QString;
+#include <QActionGroup>
+#include <QString>
 
 /**
  * \short A container for a set of QAction objects.
diff --git a/kdeui/actions/kstandardaction.h b/kdeui/actions/kstandardaction.h
index 99eb278e..29a45747 100644
--- a/kdeui/actions/kstandardaction.h
+++ b/kdeui/actions/kstandardaction.h
@@ -23,9 +23,9 @@
 #include <kstandardshortcut.h>
 #include <QtCore/QList>
 
-class QObject;
-class QStringList;
-class QWidget;
+#include <QObject>
+#include <QStringList>
+#include <QWidget>
 class KAction;
 class KRecentFilesAction;
 class KDualAction;
diff --git a/kdeui/colors/kcolorchoosermode_p.h b/kdeui/colors/kcolorchoosermode_p.h
index 8e1c739d..590ace68 100644
--- a/kdeui/colors/kcolorchoosermode_p.h
+++ b/kdeui/colors/kcolorchoosermode_p.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/qglobal.h>
 
-class QColor;
+#include <QColor>
 
 namespace KDEPrivate {
 
diff --git a/kdeui/colors/kcolorhelpers_p.h b/kdeui/colors/kcolorhelpers_p.h
index f0656a33..31e261b9 100644
--- a/kdeui/colors/kcolorhelpers_p.h
+++ b/kdeui/colors/kcolorhelpers_p.h
@@ -30,9 +30,9 @@ static inline qreal normalize(qreal a)
     return (a < 1.0 ? (a > 0.0 ? a : 0.0) : 1.0);
 }
 
-class QPainter;
-class QRect;
-class QBrush;
+#include <QPainter>
+#include <QRect>
+#include <QBrush>
 
 namespace KDEPrivate {
 
diff --git a/kdeui/colors/kcolormimedata.h b/kdeui/colors/kcolormimedata.h
index d9abeef8..03106b9c 100644
--- a/kdeui/colors/kcolormimedata.h
+++ b/kdeui/colors/kcolormimedata.h
@@ -23,10 +23,10 @@
 
 #include <kdeui_export.h>
 
-class QColor;
-class QDrag;
-class QMimeData;
-class QWidget;
+#include <QColor>
+#include <QDrag>
+#include <QMimeData>
+#include <QWidget>
 
 /**
  * Drag-and-drop and clipboard mimedata manipulation for QColor objects. The according MIME type
diff --git a/kdeui/colors/kcolorscheme.h b/kdeui/colors/kcolorscheme.h
index d5cb3d6e..3aea282d 100644
--- a/kdeui/colors/kcolorscheme.h
+++ b/kdeui/colors/kcolorscheme.h
@@ -25,8 +25,8 @@
 
 #include <QtGui/QPalette>
 
-class QColor;
-class QBrush;
+#include <QColor>
+#include <QBrush>
 
 class KColorSchemePrivate;
 
diff --git a/kdeui/colors/kcolorutils.h b/kdeui/colors/kcolorutils.h
index 9d790ac7..5a8d4158 100644
--- a/kdeui/colors/kcolorutils.h
+++ b/kdeui/colors/kcolorutils.h
@@ -25,7 +25,7 @@
 #include <kdeui_export.h>
 #include <QtGui/QPainter>
 
-class QColor;
+#include <QColor>
 
 /**
  * A set of methods used to work with colors.
diff --git a/kdeui/dialogs/kconfigdialogmanager.h b/kdeui/dialogs/kconfigdialogmanager.h
index ddac3eb0..61c687ac 100644
--- a/kdeui/dialogs/kconfigdialogmanager.h
+++ b/kdeui/dialogs/kconfigdialogmanager.h
@@ -29,7 +29,7 @@
 class KCoreConfigSkeleton;
 class KConfigSkeleton;
 class KConfigSkeletonItem;
-class QWidget;
+#include <QWidget>
 
 /**
  * @short Provides a means of automatically retrieving,
diff --git a/kdeui/dialogs/kcupsoptionsjobwidget_p.h b/kdeui/dialogs/kcupsoptionsjobwidget_p.h
index 9302f20c..53b61872 100644
--- a/kdeui/dialogs/kcupsoptionsjobwidget_p.h
+++ b/kdeui/dialogs/kcupsoptionsjobwidget_p.h
@@ -26,8 +26,8 @@
 #include "kcupsoptionswidget_p.h"
 #include "ui_kcupsoptionsjobwidget.h"
 
-class QString;
-class QTime;
+#include <QString>
+#include <QTime>
 
 /**
  * A widget to add to QPrintDialog to enable extra CUPS options
diff --git a/kdeui/dialogs/kcupsoptionswidget_p.h b/kdeui/dialogs/kcupsoptionswidget_p.h
index fc5c9e14..9ac290f7 100644
--- a/kdeui/dialogs/kcupsoptionswidget_p.h
+++ b/kdeui/dialogs/kcupsoptionswidget_p.h
@@ -23,10 +23,10 @@
 
 #include <qwidget.h>
 
-class QString;
-class QStringList;
-class QPrinter;
-class QPrintDialog;
+#include <QString>
+#include <QStringList>
+#include <QPrinter>
+#include <QPrintDialog>
 
 /**
  * A widget to add to QPrintDialog to enable extra CUPS options
diff --git a/kdeui/dialogs/kdeprintdialog.h b/kdeui/dialogs/kdeprintdialog.h
index ce39771c..5e650139 100644
--- a/kdeui/dialogs/kdeprintdialog.h
+++ b/kdeui/dialogs/kdeprintdialog.h
@@ -25,9 +25,9 @@
 
 #include <QtCore/QList>
 
-class QPrintDialog;
-class QPrinter;
-class QWidget;
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QWidget>
 
 /**
  * Namespace for the KDE printing system
diff --git a/kdeui/dialogs/kdialog.h b/kdeui/dialogs/kdialog.h
index c65f2eca..83be56e8 100644
--- a/kdeui/dialogs/kdialog.h
+++ b/kdeui/dialogs/kdialog.h
@@ -25,7 +25,7 @@
 #define KDIALOG_H
 
 class KPushButton;
-class QMenu;
+#include <QMenu>
 class KDialogPrivate;
 
 #include <kdeui_export.h>
diff --git a/kdeui/dialogs/kdialog_p.h b/kdeui/dialogs/kdialog_p.h
index 6a0eff2a..2ddb1a47 100644
--- a/kdeui/dialogs/kdialog_p.h
+++ b/kdeui/dialogs/kdialog_p.h
@@ -26,11 +26,11 @@
 #include <QtCore/QSize>
 #include <QtCore/QHash>
 
-class QBoxLayout;
+#include <QBoxLayout>
 class KPushButton;
 class KUrlLabel;
 class KSeparator;
-class QDialogButtonBox;
+#include <QDialogButtonBox>
 
 class KDialogPrivate
 {
diff --git a/kdeui/dialogs/kedittoolbar_p.h b/kdeui/dialogs/kedittoolbar_p.h
index f8f26e9b..5634c7cf 100644
--- a/kdeui/dialogs/kedittoolbar_p.h
+++ b/kdeui/dialogs/kedittoolbar_p.h
@@ -24,7 +24,7 @@
 #include <QListWidget>
 
 class KLineEdit;
-class QCheckBox;
+#include <QCheckBox>
 
 namespace KDEPrivate {
 
diff --git a/kdeui/dialogs/kinputdialog.h b/kdeui/dialogs/kinputdialog.h
index 854ef12f..5b613411 100644
--- a/kdeui/dialogs/kinputdialog.h
+++ b/kdeui/dialogs/kinputdialog.h
@@ -27,7 +27,7 @@
 #include <limits.h>
 #include <float.h>
 
-class QValidator;
+#include <QValidator>
 
 /**
  * The KInputDialog namespace provides simple dialogs to get a single value
diff --git a/kdeui/dialogs/kinputdialog_p.h b/kdeui/dialogs/kinputdialog_p.h
index b0804d0c..86e4b8bc 100644
--- a/kdeui/dialogs/kinputdialog_p.h
+++ b/kdeui/dialogs/kinputdialog_p.h
@@ -20,11 +20,11 @@
 #ifndef KINPUTDIALOG_P_H
 #define KINPUTDIALOG_P_H
 
-class QLabel;
-class QValidator;
+#include <QLabel>
+#include <QValidator>
 
 class KComboBox;
-class QDoubleSpinBox;
+#include <QDoubleSpinBox>
 class KIntSpinBox;
 class KLineEdit;
 class KListWidget;
diff --git a/kdeui/dialogs/klinkdialog.h b/kdeui/dialogs/klinkdialog.h
index b4d89c5b..4474cfd5 100644
--- a/kdeui/dialogs/klinkdialog.h
+++ b/kdeui/dialogs/klinkdialog.h
@@ -27,7 +27,7 @@
 #include <kdialog.h>
 
 class KLinkDialogPrivate;
-class QString;
+#include <QString>
 
 /**
     @short Dialog to allow user to configure a hyperlink.
diff --git a/kdeui/dialogs/kmessagebox.h b/kdeui/dialogs/kmessagebox.h
index 71e2e497..ba7cb789 100644
--- a/kdeui/dialogs/kmessagebox.h
+++ b/kdeui/dialogs/kmessagebox.h
@@ -27,8 +27,8 @@
 #include <kguiitem.h>
 #include <kstandardguiitem.h>
 
-class QWidget;
-class QStringList;
+#include <QWidget>
+#include <QStringList>
 class KConfig;
 class KDialog;
 
diff --git a/kdeui/dialogs/kmessageboxmessagehandler.h b/kdeui/dialogs/kmessageboxmessagehandler.h
index 3e495b8f..c8420028 100644
--- a/kdeui/dialogs/kmessageboxmessagehandler.h
+++ b/kdeui/dialogs/kmessageboxmessagehandler.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 class KMessageBoxMessageHandlerPrivate;
 /**
  * @brief This is a convience KMessageHandler that use KMessageBox.
diff --git a/kdeui/dialogs/knewpassworddialog.h b/kdeui/dialogs/knewpassworddialog.h
index 5bde5e83..4b8c20e4 100644
--- a/kdeui/dialogs/knewpassworddialog.h
+++ b/kdeui/dialogs/knewpassworddialog.h
@@ -27,7 +27,7 @@
 
 #include <kdialog.h>
 
-class QWidget;
+#include <QWidget>
 
 
 /**
diff --git a/kdeui/dialogs/kpixmapregionselectordialog.h b/kdeui/dialogs/kpixmapregionselectordialog.h
index 7e245f34..be9786b3 100644
--- a/kdeui/dialogs/kpixmapregionselectordialog.h
+++ b/kdeui/dialogs/kpixmapregionselectordialog.h
@@ -24,7 +24,7 @@
 
 class KPixmapRegionSelectorWidget;
 
-class QImage;
+#include <QImage>
 
 /**
  * A dialog that uses a KPixmapRegionSelectorWidget to allow the user
diff --git a/kdeui/dialogs/kshortcutsdialog_p.h b/kdeui/dialogs/kshortcutsdialog_p.h
index a0579a16..7d18b066 100644
--- a/kdeui/dialogs/kshortcutsdialog_p.h
+++ b/kdeui/dialogs/kshortcutsdialog_p.h
@@ -35,10 +35,10 @@
 #include <QtCore/QList>
 #include <QGroupBox>
 
-class QLabel;
-class QTreeWidget;
-class QTreeWidgetItem;
-class QRadioButton;
+#include <QLabel>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QRadioButton>
 class KAction;
 class KActionCollection;
 class KPushButton;
diff --git a/kdeui/dialogs/ksplashscreen.h b/kdeui/dialogs/ksplashscreen.h
index 1232756b..007887c4 100644
--- a/kdeui/dialogs/ksplashscreen.h
+++ b/kdeui/dialogs/ksplashscreen.h
@@ -24,7 +24,7 @@
 
 #include <QtGui/QSplashScreen>
 
-class QPixmap;
+#include <QPixmap>
 
 /**
  *  @short %KDE splash screen
diff --git a/kdeui/findreplace/kfinddialog_p.h b/kdeui/findreplace/kfinddialog_p.h
index 10482834..28a2cf17 100644
--- a/kdeui/findreplace/kfinddialog_p.h
+++ b/kdeui/findreplace/kfinddialog_p.h
@@ -28,11 +28,11 @@
 
 class KHistoryComboBox;
 
-class QCheckBox;
-class QGridLayout;
-class QGroupBox;
-class QMenu;
-class QPushButton;
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QMenu>
+#include <QPushButton>
 
 class KFindDialog::KFindDialogPrivate
 {
diff --git a/kdeui/fonts/kfontchooser.h b/kdeui/fonts/kfontchooser.h
index eaaaa149..1fb85c70 100644
--- a/kdeui/fonts/kfontchooser.h
+++ b/kdeui/fonts/kfontchooser.h
@@ -27,8 +27,8 @@
 #include <kdeui_export.h>
 #include <QtGui/QWidget>
 
-class QFont;
-class QStringList;
+#include <QFont>
+#include <QStringList>
 
 /**
  * @short A font selection widget.
diff --git a/kdeui/fonts/kfontdialog.h b/kdeui/fonts/kfontdialog.h
index 371345e3..84d9d7c1 100644
--- a/kdeui/fonts/kfontdialog.h
+++ b/kdeui/fonts/kfontdialog.h
@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <kfontchooser.h>
 
-class QFont;
-class QStringList;
+#include <QFont>
+#include <QStringList>
 
 /**
  * @short A font selection dialog.
diff --git a/kdeui/fonts/kfontrequester.h b/kdeui/fonts/kfontrequester.h
index edf288ff..fb8b10fc 100644
--- a/kdeui/fonts/kfontrequester.h
+++ b/kdeui/fonts/kfontrequester.h
@@ -26,8 +26,8 @@
 
 #include <kdeui_export.h>
 
-class QLabel;
-class QPushButton;
+#include <QLabel>
+#include <QPushButton>
 
 /**
  * This class provides a widget with a lineedit and a button, which invokes
diff --git a/kdeui/fonts/kfontutils.h b/kdeui/fonts/kfontutils.h
index a69c45e7..dbc4e77c 100644
--- a/kdeui/fonts/kfontutils.h
+++ b/kdeui/fonts/kfontutils.h
@@ -26,9 +26,9 @@
 #include "kdeui_export.h"
 #include <qglobal.h>
 
-class QPainter;
-class QSizeF;
-class QString;
+#include <QPainter>
+#include <QSizeF>
+#include <QString>
 
 namespace KFontUtils
 {
diff --git a/kdeui/icons/kicon.h b/kdeui/icons/kicon.h
index f2cd1327..41a47129 100644
--- a/kdeui/icons/kicon.h
+++ b/kdeui/icons/kicon.h
@@ -24,7 +24,7 @@
 #include <QtGui/QIcon>
 
 class KIconLoader;
-class QStringList;
+#include <QStringList>
 
 /**
  * \short A wrapper around QIcon that provides KDE icon features
diff --git a/kdeui/icons/kiconloader.h b/kdeui/icons/kiconloader.h
index a903652c..36b3bb04 100644
--- a/kdeui/icons/kiconloader.h
+++ b/kdeui/icons/kiconloader.h
@@ -28,9 +28,9 @@
 #include <kglobal.h>
 #include <kdeui_export.h>
 
-class QIcon;
-class QMovie;
-class QPixmap;
+#include <QIcon>
+#include <QMovie>
+#include <QPixmap>
 
 class KComponentData;
 class KIconLoaderPrivate;
diff --git a/kdeui/icons/kicontheme.h b/kdeui/icons/kicontheme.h
index 3b677665..e90e9c37 100644
--- a/kdeui/icons/kicontheme.h
+++ b/kdeui/icons/kicontheme.h
@@ -27,7 +27,7 @@
 
 #include "kiconloader.h"
 
-class QAction;
+#include <QAction>
 class KIconThemeDir;
 class K3Icon;
 
diff --git a/kdeui/itemviews/kcategorizedsortfilterproxymodel.h b/kdeui/itemviews/kcategorizedsortfilterproxymodel.h
index 4f6c4e1d..b21aee1a 100644
--- a/kdeui/itemviews/kcategorizedsortfilterproxymodel.h
+++ b/kdeui/itemviews/kcategorizedsortfilterproxymodel.h
@@ -26,7 +26,7 @@
 
 #include <kdeui_export.h>
 
-class QItemSelection;
+#include <QItemSelection>
 
 
 /**
diff --git a/kdeui/itemviews/kcategorydrawer.h b/kdeui/itemviews/kcategorydrawer.h
index 189750a5..dd3a9daa 100644
--- a/kdeui/itemviews/kcategorydrawer.h
+++ b/kdeui/itemviews/kcategorydrawer.h
@@ -26,9 +26,9 @@
 #include <QtCore/QObject>
 #include <QtGui/qevent.h>
 
-class QPainter;
-class QModelIndex;
-class QStyleOption;
+#include <QPainter>
+#include <QModelIndex>
+#include <QStyleOption>
 
 class KCategorizedView;
 
diff --git a/kdeui/itemviews/kextendableitemdelegate.h b/kdeui/itemviews/kextendableitemdelegate.h
index 9f71f061..97d70b72 100644
--- a/kdeui/itemviews/kextendableitemdelegate.h
+++ b/kdeui/itemviews/kextendableitemdelegate.h
@@ -46,7 +46,7 @@
   * @since 4.1
   */
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 class KDEUI_EXPORT KExtendableItemDelegate : public QStyledItemDelegate {
     Q_OBJECT
diff --git a/kdeui/itemviews/kfilterproxysearchline.h b/kdeui/itemviews/kfilterproxysearchline.h
index 15c246cb..9874495d 100644
--- a/kdeui/itemviews/kfilterproxysearchline.h
+++ b/kdeui/itemviews/kfilterproxysearchline.h
@@ -25,7 +25,7 @@
 #include <QtGui/QWidget>
 
 class KLineEdit;
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 /**
  * @class KFilterProxySearchLine
diff --git a/kdeui/itemviews/klistwidgetsearchline.h b/kdeui/itemviews/klistwidgetsearchline.h
index 9ab82e2b..5c760f05 100644
--- a/kdeui/itemviews/klistwidgetsearchline.h
+++ b/kdeui/itemviews/klistwidgetsearchline.h
@@ -23,9 +23,9 @@
 
 #include <klineedit.h>
 
-class QListWidget;
-class QListWidgetItem;
-class QModelIndex;
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QModelIndex>
 
 /**
  * This class makes it easy to add a search line for filtering the items in a
diff --git a/kdeui/itemviews/kmodelindexproxymapper.h b/kdeui/itemviews/kmodelindexproxymapper.h
index 8b7ed6e3..a7d4eeaf 100644
--- a/kdeui/itemviews/kmodelindexproxymapper.h
+++ b/kdeui/itemviews/kmodelindexproxymapper.h
@@ -26,9 +26,9 @@
 
 #include "kdeui_export.h"
 
-class QAbstractItemModel;
-class QModelIndex;
-class QItemSelection;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QItemSelection>
 class KModelIndexProxyMapperPrivate;
 
 /**
diff --git a/kdeui/itemviews/ktreewidgetsearchline.h b/kdeui/itemviews/ktreewidgetsearchline.h
index 02dbc00b..f83214b1 100644
--- a/kdeui/itemviews/ktreewidgetsearchline.h
+++ b/kdeui/itemviews/ktreewidgetsearchline.h
@@ -23,9 +23,9 @@
 
 #include <klineedit.h>
 
-class QModelIndex;
-class QTreeWidget;
-class QTreeWidgetItem;
+#include <QModelIndex>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 
 /**
  * This class makes it easy to add a search line for filtering the items in
diff --git a/kdeui/itemviews/kviewstatesaver.h b/kdeui/itemviews/kviewstatesaver.h
index 827fafa0..b8e49d2a 100644
--- a/kdeui/itemviews/kviewstatesaver.h
+++ b/kdeui/itemviews/kviewstatesaver.h
@@ -27,12 +27,12 @@
 
 #include "kdeui_export.h"
 
-class QAbstractItemView;
-class QItemSelectionModel;
-class QAbstractItemModel;
-class QAbstractScrollArea;
-class QModelIndex;
-class QStringList;
+#include <QAbstractItemView>
+#include <QItemSelectionModel>
+#include <QAbstractItemModel>
+#include <QAbstractScrollArea>
+#include <QModelIndex>
+#include <QStringList>
 
 class KConfigGroup;
 
diff --git a/kdeui/itemviews/kwidgetitemdelegate.h b/kdeui/itemviews/kwidgetitemdelegate.h
index 71aa158d..47393888 100644
--- a/kdeui/itemviews/kwidgetitemdelegate.h
+++ b/kdeui/itemviews/kwidgetitemdelegate.h
@@ -29,12 +29,12 @@
 
 #include <kdeui_export.h>
 
-class QObject;
-class QPainter;
-class QStyleOption;
-class QStyleOptionViewItem;
-class QAbstractItemView;
-class QItemSelection;
+#include <QObject>
+#include <QPainter>
+#include <QStyleOption>
+#include <QStyleOptionViewItem>
+#include <QAbstractItemView>
+#include <QItemSelection>
 
 class KWidgetItemDelegatePrivate;
 class KWidgetItemDelegatePool;
diff --git a/kdeui/itemviews/kwidgetitemdelegatepool_p.h b/kdeui/itemviews/kwidgetitemdelegatepool_p.h
index 1aa1f258..8546c424 100644
--- a/kdeui/itemviews/kwidgetitemdelegatepool_p.h
+++ b/kdeui/itemviews/kwidgetitemdelegatepool_p.h
@@ -26,8 +26,8 @@
 #include <QtCore/QHash>
 #include <QtCore/QList>
 
-class QWidget;
-class QStyleOptionViewItem;
+#include <QWidget>
+#include <QStyleOptionViewItem>
 class KWidgetItemDelegate;
 class KWidgetItemDelegatePoolPrivate;
 
diff --git a/kdeui/jobs/kabstractwidgetjobtracker.h b/kdeui/jobs/kabstractwidgetjobtracker.h
index 892e7879..26f82c64 100644
--- a/kdeui/jobs/kabstractwidgetjobtracker.h
+++ b/kdeui/jobs/kabstractwidgetjobtracker.h
@@ -26,7 +26,7 @@
 #include <kjobtrackerinterface.h>
 
 class KJob;
-class QWidget;
+#include <QWidget>
 
 /**
  * The base class for widget based job trackers.
diff --git a/kdeui/jobs/kstatusbarjobtracker_p.h b/kdeui/jobs/kstatusbarjobtracker_p.h
index 8d791a69..3517f9f0 100644
--- a/kdeui/jobs/kstatusbarjobtracker_p.h
+++ b/kdeui/jobs/kstatusbarjobtracker_p.h
@@ -31,10 +31,10 @@
 #include <kurl.h>
 
 class KPushButton;
-class QCheckBox;
+#include <QCheckBox>
 class KLineEdit;
-class QLabel;
-class QProgressBar;
+#include <QLabel>
+#include <QProgressBar>
 
 
 class KStatusBarJobTracker::Private
diff --git a/kdeui/jobs/kwidgetjobtracker_p.h b/kdeui/jobs/kwidgetjobtracker_p.h
index 95c47091..32a9a16f 100644
--- a/kdeui/jobs/kwidgetjobtracker_p.h
+++ b/kdeui/jobs/kwidgetjobtracker_p.h
@@ -36,8 +36,8 @@
 
 class KPushButton;
 class KSqueezedTextLabel;
-class QLabel;
-class QProgressBar;
+#include <QLabel>
+#include <QProgressBar>
 
 class KWidgetJobTracker::Private
     : public KAbstractWidgetJobTracker::Private
diff --git a/kdeui/kernel/kapplication.h b/kdeui/kernel/kapplication.h
index 0d78c098..075f7134 100644
--- a/kdeui/kernel/kapplication.h
+++ b/kdeui/kernel/kapplication.h
@@ -34,7 +34,7 @@ class KConfig;
 #endif
 
 struct _IceConn;
-class QPixmap;
+#include <QPixmap>
 
 #define kapp KApplication::kApplication()
 
diff --git a/kdeui/kernel/kclipboard.h b/kdeui/kernel/kclipboard.h
index 51aeeadf..37d57a02 100644
--- a/kdeui/kernel/kclipboard.h
+++ b/kdeui/kernel/kclipboard.h
@@ -24,7 +24,7 @@
 #include <QtCore/QObject>
 #include <QtGui/QClipboard>
 
-class QMimeData;
+#include <QMimeData>
 
 /**
  * This class is only for internal use.
diff --git a/kdeui/kernel/kglobalsettings.cpp b/kdeui/kernel/kglobalsettings.cpp
index e90b759b..9e0b5868 100644
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
@@ -739,6 +739,12 @@ int KGlobalSettings::buttonLayout()
     return g.readEntry("ButtonLayout", KDE_DEFAULT_BUTTON_LAYOUT);
 }
 
+#ifdef Q_WS_X11
+QT_BEGIN_NAMESPACE
+extern void qt_x11_apply_settings_in_all_apps();
+QT_END_NAMESPACE
+#endif
+
 void KGlobalSettings::emitChange(ChangeType changeType, int arg)
 {
     QDBusMessage message = QDBusMessage::createSignal("/KGlobalSettings", "org.kde.KGlobalSettings", "notifyChange" );
@@ -750,7 +756,6 @@ void KGlobalSettings::emitChange(ChangeType changeType, int arg)
 #ifdef Q_WS_X11
     if (qApp && qApp->type() != QApplication::Tty) {
         //notify non-kde qt applications of the change
-        extern void qt_x11_apply_settings_in_all_apps();
         qt_x11_apply_settings_in_all_apps();
     }
 #endif
diff --git a/kdeui/kernel/kstyle.h b/kdeui/kernel/kstyle.h
index a7df7a45..b6c90eda 100644
--- a/kdeui/kernel/kstyle.h
+++ b/kdeui/kernel/kstyle.h
@@ -43,8 +43,8 @@
 
 #include <typeinfo>
 
-class QStyleOptionProgressBar;
-class QStyleOptionTab;
+#include <QStyleOptionProgressBar>
+#include <QStyleOptionTab>
 
 class KStylePrivate;
 /**
diff --git a/kdeui/kernel/ksystemeventfilter.h b/kdeui/kernel/ksystemeventfilter.h
index 791ba975..17b04580 100644
--- a/kdeui/kernel/ksystemeventfilter.h
+++ b/kdeui/kernel/ksystemeventfilter.h
@@ -23,7 +23,7 @@
 
 #include <kdeui_export.h>
 
-class QWidget;
+#include <QWidget>
 
 /**
  * Members of this namespace allow installing and removing global event-filters
diff --git a/kdeui/notifications/knotification.h b/kdeui/notifications/knotification.h
index 480a3abe..8e897c88 100644
--- a/kdeui/notifications/knotification.h
+++ b/kdeui/notifications/knotification.h
@@ -27,8 +27,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QPair>
 
-class QWidget;
-class QDBusError;
+#include <QWidget>
+#include <QDBusError>
 
 /**
  * KNotification is used to notify the user of an event.
diff --git a/kdeui/notifications/knotificationmanager_p.h b/kdeui/notifications/knotificationmanager_p.h
index 2500abcd..7b7cc409 100644
--- a/kdeui/notifications/knotificationmanager_p.h
+++ b/kdeui/notifications/knotificationmanager_p.h
@@ -23,8 +23,8 @@
 #include <knotification.h>
 
 class KNotification;
-class QPixmap;
-class QStringList;
+#include <QPixmap>
+#include <QStringList>
 
 /**
  * @internal
diff --git a/kdeui/notifications/kstatusnotifieritem.h b/kdeui/notifications/kstatusnotifieritem.h
index 43a4721d..121f8063 100644
--- a/kdeui/notifications/kstatusnotifieritem.h
+++ b/kdeui/notifications/kstatusnotifieritem.h
@@ -29,7 +29,7 @@
 
 class KActionCollection;
 class KMenu;
-class QMovie;
+#include <QMovie>
 
 
 class KStatusNotifierItemPrivate;
diff --git a/kdeui/notifications/kstatusnotifieritemprivate_p.h b/kdeui/notifications/kstatusnotifieritemprivate_p.h
index 754065c1..d1fbe346 100644
--- a/kdeui/notifications/kstatusnotifieritemprivate_p.h
+++ b/kdeui/notifications/kstatusnotifieritemprivate_p.h
@@ -35,8 +35,8 @@
 class KActionCollection;
 class KSystemTrayIcon;
 class KMenu;
-class QMovie;
-class QAction;
+#include <QMovie>
+#include <QAction>
 
 
 // this class is needed because we can't just put an event filter on it:
diff --git a/kdeui/notifications/ksystemtrayicon.h b/kdeui/notifications/ksystemtrayicon.h
index 1d3ca0c8..fe937ca9 100644
--- a/kdeui/notifications/ksystemtrayicon.h
+++ b/kdeui/notifications/ksystemtrayicon.h
@@ -27,8 +27,8 @@
 
 class KActionCollection;
 class KSystemTrayIconPrivate;
-class QAction;
-class QMovie;
+#include <QAction>
+#include <QMovie>
 
 /**
  * \brief %KDE System Tray Window class
diff --git a/kdeui/paged/kpageview.h b/kdeui/paged/kpageview.h
index 8cb25169..6e52e2b4 100644
--- a/kdeui/paged/kpageview.h
+++ b/kdeui/paged/kpageview.h
@@ -28,11 +28,11 @@
 
 class KPageModel;
 
-class QAbstractItemDelegate;
-class QAbstractItemView;
-class QModelIndex;
+#include <QAbstractItemDelegate>
+#include <QAbstractItemView>
+#include <QModelIndex>
 class KPageViewPrivate;
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 /**
  * @short A base class which can handle multiple pages.
diff --git a/kdeui/paged/kpagewidgetmodel.h b/kdeui/paged/kpagewidgetmodel.h
index e0622e72..94bbf94d 100644
--- a/kdeui/paged/kpagewidgetmodel.h
+++ b/kdeui/paged/kpagewidgetmodel.h
@@ -24,7 +24,7 @@
 
 #include "kpagemodel.h"
 
-class QWidget;
+#include <QWidget>
 
 class KIcon;
 
diff --git a/kdeui/plotting/kplotobject.h b/kdeui/plotting/kplotobject.h
index b1fa79e3..328f809c 100644
--- a/kdeui/plotting/kplotobject.h
+++ b/kdeui/plotting/kplotobject.h
@@ -26,10 +26,10 @@
 #include <QtCore/qstring.h>
 #include <QtGui/qcolor.h>
 
-class QBrush;
-class QPainter;
-class QPen;
-class QPointF;
+#include <QBrush>
+#include <QPainter>
+#include <QPen>
+#include <QPointF>
 class KPlotWidget;
 class KPlotPoint;
 
diff --git a/kdeui/plotting/kplotpoint.h b/kdeui/plotting/kplotpoint.h
index 07c25ed8..953f0f9d 100644
--- a/kdeui/plotting/kplotpoint.h
+++ b/kdeui/plotting/kplotpoint.h
@@ -25,7 +25,7 @@
 
 #include <QtCore/qstring.h>
 
-class QPointF;
+#include <QPointF>
 
 /**
  * @class KPlotPoint
diff --git a/kdeui/shortcuts/kacceleratormanager.h b/kdeui/shortcuts/kacceleratormanager.h
index 68e87d2b..4fbe8cbe 100644
--- a/kdeui/shortcuts/kacceleratormanager.h
+++ b/kdeui/shortcuts/kacceleratormanager.h
@@ -23,8 +23,8 @@
 
 #include <kdeui_export.h>
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 /**
  * KDE Accelerator manager.
diff --git a/kdeui/shortcuts/kacceleratormanager_private.h b/kdeui/shortcuts/kacceleratormanager_private.h
index 769169ea..bbd8c399 100644
--- a/kdeui/shortcuts/kacceleratormanager_private.h
+++ b/kdeui/shortcuts/kacceleratormanager_private.h
@@ -24,7 +24,7 @@
 #include <QtCore/qstring.h>
 #include <QtCore/qobject.h>
 
-class QStackedWidget;
+#include <QStackedWidget>
 
 /**
  * A string class handling accelerators.
diff --git a/kdeui/shortcuts/kcheckaccelerators.h b/kdeui/shortcuts/kcheckaccelerators.h
index ca6631c5..649372ad 100644
--- a/kdeui/shortcuts/kcheckaccelerators.h
+++ b/kdeui/shortcuts/kcheckaccelerators.h
@@ -27,9 +27,8 @@
 #include <QObject>
 #include <QPointer>
 #include <QTimer>
-
-class QDialog;
-class QTextBrowser;
+#include <QDialog>
+#include <QTextBrowser>
 
 /**
  @internal
diff --git a/kdeui/shortcuts/kgesture.h b/kdeui/shortcuts/kgesture.h
index 689b270f..0f838846 100644
--- a/kdeui/shortcuts/kgesture.h
+++ b/kdeui/shortcuts/kgesture.h
@@ -22,8 +22,9 @@
 
 #include <kdeui_export.h>
 
-#include <QtCore/QString>
-#include <QtGui/QPolygon>
+#include <QString>
+#include <QHash>
+#include <QPolygon>
 
 /*
  kinds of gestures:
@@ -141,7 +142,6 @@ private:
     KShapeGesturePrivate * const d;
 };
 
-uint qHash(int);
 inline uint qHash(const KShapeGesture &key)
 {
     return qHash(key.hashable());
diff --git a/kdeui/shortcuts/kgesturemap.h b/kdeui/shortcuts/kgesturemap.h
index 103f058a..508fa6e0 100644
--- a/kdeui/shortcuts/kgesturemap.h
+++ b/kdeui/shortcuts/kgesturemap.h
@@ -20,15 +20,15 @@
 #ifndef KGESTUREMAP_H
 #define KGESTUREMAP_H
 
-#include <QtCore/QObject>
-#include <QtCore/QHash>
+#include <QObject>
+#include <QHash>
 #include <QTimer>
+#include <QEvent>
 
 #include "kgesture.h"
 
 class KApplication;
 class KAction;
-class QEvent;
 
 class KGestureMap : public QObject
 {
diff --git a/kdeui/shortcuts/kglobalaccel.h b/kdeui/shortcuts/kglobalaccel.h
index f5e0fb8c..a55f08bb 100644
--- a/kdeui/shortcuts/kglobalaccel.h
+++ b/kdeui/shortcuts/kglobalaccel.h
@@ -22,12 +22,13 @@
 #ifndef _KGLOBALACCEL_H_
 #define _KGLOBALACCEL_H_
 
+#include <QWidget>
+
 #include "kdeui_export.h"
 #include "kaction.h"
 #include "kglobal.h"
 #include "kglobalshortcutinfo.h"
 
-class QWidget;
 class KShortcut;
 class KComponentData;
 class OrgKdeKglobalaccelComponentInterface;
diff --git a/kdeui/shortcuts/kshortcut.h b/kdeui/shortcuts/kshortcut.h
index 2e74fd7c..0de1a3f6 100644
--- a/kdeui/shortcuts/kshortcut.h
+++ b/kdeui/shortcuts/kshortcut.h
@@ -30,6 +30,7 @@
 #include <kdeui_export.h>
 
 #include <QtCore/QMetaType>
+#include <QtCore/QHash>
 #include <QtGui/QKeySequence>
 
 class KShortcutPrivate;
@@ -241,7 +242,6 @@ private:
     class KShortcutPrivate *const d;
 };
 
-uint qHash(int);
 inline uint qHash(const KShortcut &key)
 {
     return qHash(key.primary()[0]) + qHash(key.primary()[1]);
diff --git a/kdeui/sonnet/dialog.h b/kdeui/sonnet/dialog.h
index 5a34f116..6d8f38ad 100644
--- a/kdeui/sonnet/dialog.h
+++ b/kdeui/sonnet/dialog.h
@@ -25,8 +25,8 @@
 
 #include <kdialog.h>
 
-class QListWidgetItem;
-class QModelIndex;
+#include <QListWidgetItem>
+#include <QModelIndex>
 
 namespace Sonnet
 {
diff --git a/kdeui/sonnet/highlighter.h b/kdeui/sonnet/highlighter.h
index ad9e5699..d156f484 100644
--- a/kdeui/sonnet/highlighter.h
+++ b/kdeui/sonnet/highlighter.h
@@ -25,7 +25,7 @@
 #include <QtCore/QStringList>
 #include <kdeui_export.h>
 
-class QTextEdit;
+#include <QTextEdit>
 
 namespace Sonnet
 {
diff --git a/kdeui/sonnet/tests/test_highlighter.h b/kdeui/sonnet/tests/test_highlighter.h
index e05cee96..bd1e188e 100644
--- a/kdeui/sonnet/tests/test_highlighter.h
+++ b/kdeui/sonnet/tests/test_highlighter.h
@@ -26,7 +26,7 @@
 #include "filter_p.h"
 #include <QTextEdit>
 
-class QContextMenuEvent;
+#include <QContextMenuEvent>
 class TestSpell : public QTextEdit
 {
     Q_OBJECT
diff --git a/kdeui/tests/kanimatedbuttontest.h b/kdeui/tests/kanimatedbuttontest.h
index 40258bdd..c5bfd05a 100644
--- a/kdeui/tests/kanimatedbuttontest.h
+++ b/kdeui/tests/kanimatedbuttontest.h
@@ -24,8 +24,8 @@
 
 #include "kmainwindow.h"
 
-class QLineEdit;
-class QSpinBox;
+#include <QLineEdit>
+#include <QSpinBox>
 class KAnimatedButton;
 
 class AnimationGroup : public QGroupBox
diff --git a/kdeui/tests/kcolorcombotest.h b/kdeui/tests/kcolorcombotest.h
index 41280f3d..30a347be 100644
--- a/kdeui/tests/kcolorcombotest.h
+++ b/kdeui/tests/kcolorcombotest.h
@@ -3,7 +3,7 @@
 
 #include <QtGui/QWidget>
 
-class QPushButton;
+#include <QPushButton>
 class KColorCombo;
 
 class KColorComboTest : public QWidget
diff --git a/kdeui/tests/kcomboboxtest.h b/kdeui/tests/kcomboboxtest.h
index 00911da3..b09ee8f7 100644
--- a/kdeui/tests/kcomboboxtest.h
+++ b/kdeui/tests/kcomboboxtest.h
@@ -3,9 +3,9 @@
 
 #include <QtGui/QWidget>
 
-class QTimer;
-class QComboBox;
-class QPushButton;
+#include <QTimer>
+#include <QComboBox>
+#include <QPushButton>
 
 class KComboBox;
 
diff --git a/kdeui/tests/kcompletionuitest.h b/kdeui/tests/kcompletionuitest.h
index 3476c311..a8cca5ef 100644
--- a/kdeui/tests/kcompletionuitest.h
+++ b/kdeui/tests/kcompletionuitest.h
@@ -4,12 +4,12 @@
 #include <QtCore/QStringList>
 #include <QtCore/QVariant>
 #include <QtGui/QWidget>
-class QVBoxLayout;
-class QHBoxLayout;
-class QGroupBox;
-class QLabel;
-class QListWidget;
-class QPushButton;
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QListWidget>
+#include <QPushButton>
 
 class KHistoryComboBox;
 class KLineEdit;
diff --git a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.h b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.h
index 1be213f5..1aa42901 100644
--- a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.h
+++ b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.h
@@ -20,7 +20,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QObject>
 
-class QString;
+#include <QString>
 
 class KConfigCompiler_Test : public QObject
 {
diff --git a/kdeui/tests/khboxtest.h b/kdeui/tests/khboxtest.h
index b3c05185..7541aacc 100644
--- a/kdeui/tests/khboxtest.h
+++ b/kdeui/tests/khboxtest.h
@@ -2,7 +2,7 @@
 #define KHBOXTEST_H
 
 #include "khbox.h"
-class QPushButton;
+#include <QPushButton>
 
 class KHBoxTest : public KHBox {
     Q_OBJECT
diff --git a/kdeui/tests/kiconeffecttest.h b/kdeui/tests/kiconeffecttest.h
index cc875731..655ee16a 100644
--- a/kdeui/tests/kiconeffecttest.h
+++ b/kdeui/tests/kiconeffecttest.h
@@ -4,7 +4,7 @@
 #include <QtGui/QScrollArea>
 #include <QtGui/QImage>
 
-class QLabel;
+#include <QLabel>
 
 class KIconEffectTestWidget : public QScrollArea
 {
diff --git a/kdeui/tests/klineedittest.h b/kdeui/tests/klineedittest.h
index 69f647ba..8e86d113 100644
--- a/kdeui/tests/klineedittest.h
+++ b/kdeui/tests/klineedittest.h
@@ -4,10 +4,10 @@
 #include <QtGui/QWidget>
 #include <QtCore/QPointer>
 
-class QLabel;
+#include <QLabel>
 class KRestrictedLine;
-class QString;
-class QPushButton;
+#include <QString>
+#include <QPushButton>
 
 class KLineEdit;
 
diff --git a/kdeui/tests/klinkitemselectionmodeltest.h b/kdeui/tests/klinkitemselectionmodeltest.h
index 6e9c178c..285b4298 100644
--- a/kdeui/tests/klinkitemselectionmodeltest.h
+++ b/kdeui/tests/klinkitemselectionmodeltest.h
@@ -21,9 +21,9 @@
 
 #include <QtCore/QObject>
 
-class QItemSelectionModel;
-class QStandardItemModel;
-class QSortFilterProxyModel;
+#include <QItemSelectionModel>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
 
 class KLinkItemSelectionModel;
 
diff --git a/kdeui/tests/kpixmapsequenceoverlaypaintertest.h b/kdeui/tests/kpixmapsequenceoverlaypaintertest.h
index beb27d6e..ed90db3a 100644
--- a/kdeui/tests/kpixmapsequenceoverlaypaintertest.h
+++ b/kdeui/tests/kpixmapsequenceoverlaypaintertest.h
@@ -4,9 +4,9 @@
 #include <QWidget>
 
 class KPixmapSequenceOverlayPainter;
-class QComboBox;
-class QSpinBox;
-class QEvent;
+#include <QComboBox>
+#include <QSpinBox>
+#include <QEvent>
 
 class TestWidget : public QWidget
 {
diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h
index 23ccffc1..c9a130a6 100644
--- a/kdeui/tests/krulertest.h
+++ b/kdeui/tests/krulertest.h
@@ -12,11 +12,11 @@
 #include <knuminput.h>
 
 class KRuler;
-class QWidget;
-class QGridLayout;
-class QCheckBox;
-class QGroupBox;
-class QLabel;
+#include <QWidget>
+#include <QGridLayout>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QLabel>
 
 class MouseWidget : public QFrame
 {
diff --git a/kdeui/tests/kstatusbartest.h b/kdeui/tests/kstatusbartest.h
index 9fdadda0..ca08876c 100644
--- a/kdeui/tests/kstatusbartest.h
+++ b/kdeui/tests/kstatusbartest.h
@@ -5,7 +5,7 @@
 #include <kxmlguiwindow.h>
 #include <QMenuBar>
 
-class QTextEdit;
+#include <QTextEdit>
 
 class testWindow  : public KXmlGuiWindow
 {
diff --git a/kdeui/tests/kwindowtest.h b/kdeui/tests/kwindowtest.h
index 039581f1..92d91c9b 100644
--- a/kdeui/tests/kwindowtest.h
+++ b/kdeui/tests/kwindowtest.h
@@ -7,7 +7,7 @@
 #include <ktoolbar.h>
 #include <kxmlguiwindow.h>
 
-class QTextEdit;
+#include <QTextEdit>
 
 class TestWindow  : public KXmlGuiWindow
 {
diff --git a/kdeui/tests/testplot_widget.h b/kdeui/tests/testplot_widget.h
index 7afa935a..474181eb 100644
--- a/kdeui/tests/testplot_widget.h
+++ b/kdeui/tests/testplot_widget.h
@@ -20,8 +20,8 @@
 
 #include <kmainwindow.h>
 
-class QComboBox;
-class QVBoxLayout;
+#include <QComboBox>
+#include <QVBoxLayout>
 class KPlotWidget;
 class KPlotObject;
 
diff --git a/kdeui/util/kcrash.h b/kdeui/util/kcrash.h
index 19537c4f..133b8164 100644
--- a/kdeui/util/kcrash.h
+++ b/kdeui/util/kcrash.h
@@ -25,7 +25,7 @@
 #include <kdeui_export.h>
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 
 /**
  * This namespace contains functions to handle crashes.
diff --git a/kdeui/util/kcursor.h b/kdeui/util/kcursor.h
index e309cb2e..cb9c4345 100644
--- a/kdeui/util/kcursor.h
+++ b/kdeui/util/kcursor.h
@@ -23,8 +23,8 @@
 #include <kdeui_export.h>
 #include <QtGui/QCursor>
 
-class QEvent;
-class QWidget;
+#include <QEvent>
+#include <QWidget>
 
 /**
  * The KCursor class extends QCursor with the ability to create an arbitrary
diff --git a/kdeui/util/kcursor_p.h b/kdeui/util/kcursor_p.h
index 6032fe19..2d85d59f 100644
--- a/kdeui/util/kcursor_p.h
+++ b/kdeui/util/kcursor_p.h
@@ -26,7 +26,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QCursor>
 
-class QWidget;
+#include <QWidget>
 
 /**
  * I don't want the eventFilter to be in KCursor, so we have another class
diff --git a/kdeui/util/knumvalidator.h b/kdeui/util/knumvalidator.h
index 0075f865..c9e4fe4f 100644
--- a/kdeui/util/knumvalidator.h
+++ b/kdeui/util/knumvalidator.h
@@ -26,8 +26,8 @@
 
 #include <QtGui/QValidator>
 
-class QWidget;
-class QString;
+#include <QWidget>
+#include <QString>
 
 /**
  * QValidator for integers.
diff --git a/kdeui/util/kpassivepopup.h b/kdeui/util/kpassivepopup.h
index 0bb52dab..9958c5c4 100644
--- a/kdeui/util/kpassivepopup.h
+++ b/kdeui/util/kpassivepopup.h
@@ -27,7 +27,7 @@
 #include <QtGui/QFrame>
 
 class KVBox;
-class QSystemTrayIcon;
+#include <QSystemTrayIcon>
 
 /**
  * @short A dialog-like popup that displays messages without interrupting the user.
diff --git a/kdeui/util/kpassivepopupmessagehandler.h b/kdeui/util/kpassivepopupmessagehandler.h
index 7a2bbb4a..f3d09c50 100644
--- a/kdeui/util/kpassivepopupmessagehandler.h
+++ b/kdeui/util/kpassivepopupmessagehandler.h
@@ -24,7 +24,7 @@
 
 #include <QtCore/QObject>
 
-class QWidget;
+#include <QWidget>
 /**
  * @brief This is a convenience KMessageHandler that uses KPassivePopup.
  *
diff --git a/kdeui/util/kpixmapsequence.h b/kdeui/util/kpixmapsequence.h
index b129095c..f28b2ca2 100644
--- a/kdeui/util/kpixmapsequence.h
+++ b/kdeui/util/kpixmapsequence.h
@@ -27,7 +27,7 @@
 #include "kdeui_export.h"
 #include <kiconloader.h>
 
-class QPixmap;
+#include <QPixmap>
 
 /**
  * \class KPixmapSequence kpixmapsequence.h KPixmapSequence
diff --git a/kdeui/util/kpixmapsequenceoverlaypainter.h b/kdeui/util/kpixmapsequenceoverlaypainter.h
index 723ac934..b600c657 100644
--- a/kdeui/util/kpixmapsequenceoverlaypainter.h
+++ b/kdeui/util/kpixmapsequenceoverlaypainter.h
@@ -26,9 +26,9 @@
 #include "kdeui_export.h"
 
 class KPixmapSequence;
-class QWidget;
-class QEvent;
-class QRect;
+#include <QWidget>
+#include <QEvent>
+#include <QRect>
 
 /**
  * \class KPixmapSequenceOverlayPainter kpixmapsequenceoverlaypainter.h KPixmapSequenceOverlayPainter
diff --git a/kdeui/util/kstandardguiitem.h b/kdeui/util/kstandardguiitem.h
index 55a95dfe..408c4ece 100644
--- a/kdeui/util/kstandardguiitem.h
+++ b/kdeui/util/kstandardguiitem.h
@@ -25,7 +25,7 @@
 
 #include <kguiitem.h>
 
-class QString;
+#include <QString>
 
 /**
  * @short Provides a set of standardized KGuiItems.
diff --git a/kdeui/util/kwallet.h b/kdeui/util/kwallet.h
index 513b27d8..82d554b9 100644
--- a/kdeui/util/kwallet.h
+++ b/kdeui/util/kwallet.h
@@ -28,7 +28,7 @@
 
 #include <kdeui_export.h>
 
-class QDBusError;
+#include <QDBusError>
 
 namespace KWallet {
 
diff --git a/kdeui/util/kwordwrap.h b/kdeui/util/kwordwrap.h
index 1f54faa2..6178dc32 100644
--- a/kdeui/util/kwordwrap.h
+++ b/kdeui/util/kwordwrap.h
@@ -22,10 +22,10 @@
 #include <kdeui_export.h>
 #include <QtCore/qnamespace.h>
 
-class QFontMetrics;
-class QRect;
-class QString;
-class QPainter;
+#include <QFontMetrics>
+#include <QRect>
+#include <QString>
+#include <QPainter>
 
 /**
  * Word-wrap algorithm that takes into account beautifulness ;)
diff --git a/kdeui/util/kxmessages.h b/kdeui/util/kxmessages.h
index 9644c0b4..04649a32 100644
--- a/kdeui/util/kxmessages.h
+++ b/kdeui/util/kxmessages.h
@@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #ifdef Q_WS_X11
 #include <X11/X.h>
 
-class QString;
+#include <QString>
 
 class KXMessagesPrivate;
 /**
diff --git a/kdeui/widgets/kactionselector.h b/kdeui/widgets/kactionselector.h
index 32dd7e6c..413e9e12 100644
--- a/kdeui/widgets/kactionselector.h
+++ b/kdeui/widgets/kactionselector.h
@@ -22,11 +22,11 @@
 #include <kdeui_export.h>
 #include <QtGui/QWidget>
 
-class QListWidget;
-class QListWidgetItem;
-class QKeyEvent;
-class QEvent;
-class QIcon;
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QIcon>
 
 class KActionSelectorPrivate;
 
diff --git a/kdeui/widgets/kbuttongroup.h b/kdeui/widgets/kbuttongroup.h
index 7373a793..3ef0ec71 100644
--- a/kdeui/widgets/kbuttongroup.h
+++ b/kdeui/widgets/kbuttongroup.h
@@ -25,7 +25,7 @@
 #include <kdeui_export.h>
 #include <QtGui/QGroupBox>
 
-class QAbstractButton;
+#include <QAbstractButton>
 
 /**
  * @short Group box with index of the selected button
diff --git a/kdeui/widgets/kcapacitybar.h b/kdeui/widgets/kcapacitybar.h
index 89ed5e86..1f273d2b 100644
--- a/kdeui/widgets/kcapacitybar.h
+++ b/kdeui/widgets/kcapacitybar.h
@@ -25,7 +25,7 @@
 
 #include <kdeui_export.h>
 
-class QPaintEvent;
+#include <QPaintEvent>
 
 /**
   * @brief This widget shows a bar which is filled to show the level of usage of
diff --git a/kdeui/widgets/kcharselect.h b/kdeui/widgets/kcharselect.h
index 04880910..af9b6568 100644
--- a/kdeui/widgets/kcharselect.h
+++ b/kdeui/widgets/kcharselect.h
@@ -29,8 +29,8 @@
 
 class KActionCollection;
 
-class QFont;
-class QUrl;
+#include <QFont>
+#include <QUrl>
 
 /**
  * @short Character selection widget
diff --git a/kdeui/widgets/kcmodule.h b/kdeui/widgets/kcmodule.h
index f8ca5cdd..9e3d5292 100644
--- a/kdeui/widgets/kcmodule.h
+++ b/kdeui/widgets/kcmodule.h
@@ -32,7 +32,7 @@
 #include <fixx11h.h>
 #endif
 
-class QStringList;
+#include <QStringList>
 class KAboutData;
 class KConfigDialogManager;
 class KCoreConfigSkeleton;
diff --git a/kdeui/widgets/kcombobox.h b/kdeui/widgets/kcombobox.h
index 01e98e4f..3a07baf5 100644
--- a/kdeui/widgets/kcombobox.h
+++ b/kdeui/widgets/kcombobox.h
@@ -26,8 +26,8 @@
 
 #include <kcompletion.h>
 
-class QLineEdit;
-class QMenu;
+#include <QLineEdit>
+#include <QMenu>
 
 class KCompletionBox;
 class KUrl;
diff --git a/kdeui/widgets/kcompletionbox.h b/kdeui/widgets/kcompletionbox.h
index 1dabb1a7..065ce16e 100644
--- a/kdeui/widgets/kcompletionbox.h
+++ b/kdeui/widgets/kcompletionbox.h
@@ -25,7 +25,7 @@
 
 #include <klistwidget.h>
 
-class QEvent;
+#include <QEvent>
 
 /**
  * @short A helper widget for "completion-widgets" (KLineEdit, KComboBox))
diff --git a/kdeui/widgets/kdatepicker.h b/kdeui/widgets/kdatepicker.h
index 8dfc8de0..2b3259d6 100644
--- a/kdeui/widgets/kdatepicker.h
+++ b/kdeui/widgets/kdatepicker.h
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 
-class QLineEdit;
+#include <QLineEdit>
 class KDateTable;
 class KCalendarSystem;
 
diff --git a/kdeui/widgets/kdatetimewidget.h b/kdeui/widgets/kdatetimewidget.h
index 2653d7c8..a2e1957e 100644
--- a/kdeui/widgets/kdatetimewidget.h
+++ b/kdeui/widgets/kdatetimewidget.h
@@ -23,7 +23,7 @@
 
 #include <QtGui/QWidget>
 
-class QDateTime;
+#include <QDateTime>
 
 /**
  * @short A combination of a date and a time selection widget.
diff --git a/kdeui/widgets/kdatewidget.h b/kdeui/widgets/kdatewidget.h
index 30d6c7a1..3aac17c7 100644
--- a/kdeui/widgets/kdatewidget.h
+++ b/kdeui/widgets/kdatewidget.h
@@ -28,7 +28,7 @@
 
 class KCalendarSystem;
 
-class QDate;
+#include <QDate>
 
 /**
  * @short A date selection widget.
diff --git a/kdeui/widgets/kdialogbuttonbox.h b/kdeui/widgets/kdialogbuttonbox.h
index 7c8356b7..0aa2c31a 100644
--- a/kdeui/widgets/kdialogbuttonbox.h
+++ b/kdeui/widgets/kdialogbuttonbox.h
@@ -25,7 +25,7 @@
 
 #include <QtGui/QDialogButtonBox>
 
-class QPushButton;
+#include <QPushButton>
 class KPushButton;
 class KGuiItem;
 
diff --git a/kdeui/widgets/keditlistwidget.h b/kdeui/widgets/keditlistwidget.h
index d5b8113c..4b7d26d5 100644
--- a/kdeui/widgets/keditlistwidget.h
+++ b/kdeui/widgets/keditlistwidget.h
@@ -28,8 +28,8 @@
 
 class KLineEdit;
 class KComboBox;
-class QListView;
-class QPushButton;
+#include <QListView>
+#include <QPushButton>
 
 class KEditListWidgetPrivate;
 /**
diff --git a/kdeui/widgets/khbox.h b/kdeui/widgets/khbox.h
index 840f4df2..fc0cbd2c 100644
--- a/kdeui/widgets/khbox.h
+++ b/kdeui/widgets/khbox.h
@@ -23,7 +23,7 @@
 
 #include <QtGui/QFrame>
 
-class QChildEvent;
+#include <QChildEvent>
 
 /**
  * A container widget which arranges its children horizontally.
diff --git a/kdeui/widgets/khelpmenu.h b/kdeui/widgets/khelpmenu.h
index 21f06b09..24047318 100644
--- a/kdeui/widgets/khelpmenu.h
+++ b/kdeui/widgets/khelpmenu.h
@@ -29,8 +29,8 @@
 
 class KActionCollection;
 class KMenu;
-class QWidget;
-class QAction;
+#include <QWidget>
+#include <QAction>
 
 class KAboutData;
 class KHelpMenuPrivate;
diff --git a/kdeui/widgets/kkeysequencewidget.h b/kdeui/widgets/kkeysequencewidget.h
index a3a62e39..dd91af2c 100644
--- a/kdeui/widgets/kkeysequencewidget.h
+++ b/kdeui/widgets/kkeysequencewidget.h
@@ -29,7 +29,7 @@
 
 
 class KKeySequenceWidgetPrivate;
-class QAction;
+#include <QAction>
 class KAction;
 class KActionCollection;
 
diff --git a/kdeui/widgets/klanguagebutton.h b/kdeui/widgets/klanguagebutton.h
index 211ff3c1..58069b1b 100644
--- a/kdeui/widgets/klanguagebutton.h
+++ b/kdeui/widgets/klanguagebutton.h
@@ -28,7 +28,7 @@
 #include <kdeui_export.h>
 #include <QtGui/QWidget>
 
-class QAction;
+#include <QAction>
 class KLocale;
 class KLanguageButtonPrivate;
 
diff --git a/kdeui/widgets/kled.h b/kdeui/widgets/kled.h
index 8f2a1b43..59b7be09 100644
--- a/kdeui/widgets/kled.h
+++ b/kdeui/widgets/kled.h
@@ -24,7 +24,7 @@
 
 #include <QtGui/QWidget>
 
-class QColor;
+#include <QColor>
 
 /**
  * @short An LED widget.
diff --git a/kdeui/widgets/klineedit.h b/kdeui/widgets/klineedit.h
index ec23532b..a8bb5ed3 100644
--- a/kdeui/widgets/klineedit.h
+++ b/kdeui/widgets/klineedit.h
@@ -34,8 +34,8 @@
 
 #include <kcompletion.h>
 
-class QAction;
-class QMenu;
+#include <QAction>
+#include <QMenu>
 class KCompletionBox;
 class KUrl;
 class KLineEditPrivate;
diff --git a/kdeui/widgets/kmainwindow_p.h b/kdeui/widgets/kmainwindow_p.h
index a7621955..47f34377 100644
--- a/kdeui/widgets/kmainwindow_p.h
+++ b/kdeui/widgets/kmainwindow_p.h
@@ -34,8 +34,8 @@
 
 #define K_D(Class) Class##Private * const d = k_func()
 
-class QObject;
-class QTimer;
+#include <QObject>
+#include <QTimer>
 class KHelpMenu;
 
 class KMainWindowPrivate
diff --git a/kdeui/widgets/kmultitabbar.h b/kdeui/widgets/kmultitabbar.h
index 52dbaa98..c29457cd 100644
--- a/kdeui/widgets/kmultitabbar.h
+++ b/kdeui/widgets/kmultitabbar.h
@@ -32,10 +32,10 @@
 
 #include <kdeui_export.h>
 
-class QPixmap;
-class QPainter;
-class QMenu;
-class QStyleOptionToolButton;
+#include <QPixmap>
+#include <QPainter>
+#include <QMenu>
+#include <QStyleOptionToolButton>
 
 class KMultiTabBarPrivate;
 class KMultiTabBarTabPrivate;
diff --git a/kdeui/widgets/knuminput.h b/kdeui/widgets/knuminput.h
index fee49836..e698f72a 100644
--- a/kdeui/widgets/knuminput.h
+++ b/kdeui/widgets/knuminput.h
@@ -27,9 +27,9 @@
 #include <QtGui/QWidget>
 #include <QtGui/QSpinBox>
 
-class QSlider;
-class QSpinBox;
-class QValidator;
+#include <QSlider>
+#include <QSpinBox>
+#include <QValidator>
 
 class KIntSpinBox;
 class KNumInputPrivate;
diff --git a/kdeui/widgets/kpushbutton.h b/kdeui/widgets/kpushbutton.h
index cb44197e..10ccbb99 100644
--- a/kdeui/widgets/kpushbutton.h
+++ b/kdeui/widgets/kpushbutton.h
@@ -24,8 +24,8 @@
 
 #include <kstandardguiitem.h>
 
-class QDrag;
-class QMenu;
+#include <QDrag>
+#include <QMenu>
 class KIcon;
 
 namespace KAuth {
diff --git a/kdeui/widgets/kratingpainter.h b/kdeui/widgets/kratingpainter.h
index 7a11f0ca..7de4018e 100644
--- a/kdeui/widgets/kratingpainter.h
+++ b/kdeui/widgets/kratingpainter.h
@@ -25,11 +25,11 @@
 
 #include <QtCore/qnamespace.h>
 
-class QIcon;
-class QPixmap;
-class QPainter;
-class QPoint;
-class QRect;
+#include <QIcon>
+#include <QPixmap>
+#include <QPainter>
+#include <QPoint>
+#include <QRect>
 
 
 /**
diff --git a/kdeui/widgets/krichtextedit.h b/kdeui/widgets/krichtextedit.h
index 3db647ee..722b9f29 100644
--- a/kdeui/widgets/krichtextedit.h
+++ b/kdeui/widgets/krichtextedit.h
@@ -26,8 +26,8 @@
 
 #include <ktextedit.h>
 
-class QMouseEvent;
-class QKeyEvent;
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 class KRichTextEditPrivate;
 
diff --git a/kdeui/widgets/kstatusbar.h b/kdeui/widgets/kstatusbar.h
index ad6d5612..1f4bd93e 100644
--- a/kdeui/widgets/kstatusbar.h
+++ b/kdeui/widgets/kstatusbar.h
@@ -25,8 +25,8 @@
 #include <kdeui_export.h>
 #include <QtGui/QStatusBar>
 
-class QObject;
-class QEvent;
+#include <QObject>
+#include <QEvent>
 class KStatusBarPrivate;
 
 /**
diff --git a/kdeui/widgets/ktoolbar.h b/kdeui/widgets/ktoolbar.h
index d3e7425e..49a8c9d3 100644
--- a/kdeui/widgets/ktoolbar.h
+++ b/kdeui/widgets/ktoolbar.h
@@ -29,7 +29,7 @@
 
 #include <QtGui/QToolBar>
 
-class QDomElement;
+#include <QDomElement>
 
 class KConfigGroup;
 class KConfig;
diff --git a/kdeui/widgets/kurllabel.h b/kdeui/widgets/kurllabel.h
index e43d6125..87825d93 100644
--- a/kdeui/widgets/kurllabel.h
+++ b/kdeui/widgets/kurllabel.h
@@ -27,7 +27,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QPixmap>
 
-class QCursor;
+#include <QCursor>
 
 /**
  * @short A drop-in replacement for QLabel that displays hyperlinks.
diff --git a/kdeui/widgets/nestedlisthelper.h b/kdeui/widgets/nestedlisthelper.h
index 4bfb2042..0cc8ed6f 100644
--- a/kdeui/widgets/nestedlisthelper.h
+++ b/kdeui/widgets/nestedlisthelper.h
@@ -24,13 +24,13 @@
 
 //@cond PRIVATE
 
-class QTextEdit;
+#include <QTextEdit>
 
-class QKeyEvent;
-class QDropEvent;
-class QTextCursor;
-class QTextList;
-class QTextBlock;
+#include <QKeyEvent>
+#include <QDropEvent>
+#include <QTextCursor>
+#include <QTextList>
+#include <QTextBlock>
 
 /**
  *
diff --git a/kdeui/xmlgui/kxmlguibuilder.h b/kdeui/xmlgui/kxmlguibuilder.h
index d21ea0a7..1d547489 100644
--- a/kdeui/xmlgui/kxmlguibuilder.h
+++ b/kdeui/xmlgui/kxmlguibuilder.h
@@ -26,10 +26,10 @@ class KComponentData;
 class KXMLGUIBuilderPrivate;
 class KXMLGUIClient;
 
-class QAction;
-class QDomElement;
-class QStringList;
-class QWidget;
+#include <QAction>
+#include <QDomElement>
+#include <QStringList>
+#include <QWidget>
 
 /**
  * Implements the creation of the GUI (menubar, menus and toolbars)
diff --git a/kdeui/xmlgui/kxmlguiclient.h b/kdeui/xmlgui/kxmlguiclient.h
index f6536429..b2c628f2 100644
--- a/kdeui/xmlgui/kxmlguiclient.h
+++ b/kdeui/xmlgui/kxmlguiclient.h
@@ -24,11 +24,11 @@
 #include <QtCore/QMap>
 #include <QtCore/QStringList>
 
-class QDomDocument;
-class QDomElement;
-class QWidget;
+#include <QDomDocument>
+#include <QDomElement>
+#include <QWidget>
 
-class QAction;
+#include <QAction>
 class KActionCollection;
 class KComponentData;
 class KXMLGUIClientPrivate;
diff --git a/kdeui/xmlgui/kxmlguifactory.h b/kdeui/xmlgui/kxmlguifactory.h
index f60e462a..8f3d3344 100644
--- a/kdeui/xmlgui/kxmlguifactory.h
+++ b/kdeui/xmlgui/kxmlguifactory.h
@@ -25,17 +25,17 @@
 
 #include <QtCore/QObject>
 
-class QAction;
+#include <QAction>
 class KXMLGUIFactoryPrivate;
 class KXMLGUIClient;
 class KXMLGUIBuilder;
 class KComponentData;
 
-class QDomAttr;
-class QDomDocument;
-class QDomElement;
-class QDomNode;
-class QDomNamedNodeMap;
+#include <QDomAttr>
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
+#include <QDomNamedNodeMap>
 
 namespace KXMLGUI
 {
diff --git a/kdeui/xmlgui/kxmlguifactory_p.h b/kdeui/xmlgui/kxmlguifactory_p.h
index edbcb5a8..829b0f06 100644
--- a/kdeui/xmlgui/kxmlguifactory_p.h
+++ b/kdeui/xmlgui/kxmlguifactory_p.h
@@ -26,7 +26,7 @@
 
 #include <kaction.h>
 
-class QWidget;
+#include <QWidget>
 class KXMLGUIClient;
 class KXMLGUIBuilder;
 
diff --git a/kdewebkit/kwebkitpart/src/kwebkitpartfactory.h b/kdewebkit/kwebkitpart/src/kwebkitpartfactory.h
index 10dccc71..8737129b 100644
--- a/kdewebkit/kwebkitpart/src/kwebkitpartfactory.h
+++ b/kdewebkit/kwebkitpart/src/kwebkitpartfactory.h
@@ -23,7 +23,7 @@
 
 #include <kpluginfactory.h>
 
-class QWidget;
+#include <QWidget>
 
 class KWebKitFactory : public KPluginFactory
 {
diff --git a/kdewebkit/kwebkitpart/src/ui/searchbar.h b/kdewebkit/kwebkitpart/src/ui/searchbar.h
index c01acd2a..41e2edde 100644
--- a/kdewebkit/kwebkitpart/src/ui/searchbar.h
+++ b/kdewebkit/kwebkitpart/src/ui/searchbar.h
@@ -29,7 +29,7 @@
 
 #include "ui_searchbar.h"
 
-class QEvent;
+#include <QEvent>
 
 /**
  * This is the widget that shows up when the search is initiated.
diff --git a/kdewebkit/kwebkitpart/src/webpluginfactory.h b/kdewebkit/kwebkitpart/src/webpluginfactory.h
index 03f64631..804e3994 100644
--- a/kdewebkit/kwebkitpart/src/webpluginfactory.h
+++ b/kdewebkit/kwebkitpart/src/webpluginfactory.h
@@ -27,7 +27,7 @@
 #include <QPointer>
 
 class KWebKitPart;
-class QPoint;
+#include <QPoint>
 
 class FakePluginWidget : public QWidget
 {
diff --git a/kdewebkit/kwebkitpart/src/webview.h b/kdewebkit/kwebkitpart/src/webview.h
index db284923..1c7aaa9a 100644
--- a/kdewebkit/kwebkitpart/src/webview.h
+++ b/kdewebkit/kwebkitpart/src/webview.h
@@ -32,7 +32,7 @@ class KUrl;
 class KWebKitPart;
 class QWebHitTestResult;
 class QWebInspector;
-class QLabel;
+#include <QLabel>
 
 class WebView : public KWebView
 {
diff --git a/kexiv2/libkexiv2/kexiv2previews.h b/kexiv2/libkexiv2/kexiv2previews.h
index 3223c06b..dbfa7246 100644
--- a/kexiv2/libkexiv2/kexiv2previews.h
+++ b/kexiv2/libkexiv2/kexiv2previews.h
@@ -38,7 +38,7 @@
 
 #include "kexiv2_export.h"
 
-class QImage;
+#include <QImage>
 
 namespace KExiv2Iface
 {
diff --git a/kfile/kdiroperator.h b/kfile/kdiroperator.h
index 3f7fb4f8..ec23fcec 100644
--- a/kfile/kdiroperator.h
+++ b/kfile/kdiroperator.h
@@ -31,9 +31,9 @@
 #include <kfile.h>
 #include <kfile_export.h>
 
-class QAbstractItemView;
-class QModelIndex;
-class QProgressBar;
+#include <QAbstractItemView>
+#include <QModelIndex>
+#include <QProgressBar>
 
 class KAction;
 class KActionCollection;
diff --git a/kfile/kdiroperatordetailview_p.h b/kfile/kdiroperatordetailview_p.h
index f58dde77..2aeb0c61 100644
--- a/kfile/kdiroperatordetailview_p.h
+++ b/kfile/kdiroperatordetailview_p.h
@@ -23,7 +23,7 @@
 
 #include <kfile.h>
 
-class QAbstractItemModel;
+#include <QAbstractItemModel>
 
 /**
  * Default detail view for KDirOperator using
diff --git a/kfile/kdirselectdialog.h b/kfile/kdirselectdialog.h
index 69b12dd3..1b889719 100644
--- a/kfile/kdirselectdialog.h
+++ b/kfile/kdirselectdialog.h
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <kurl.h>
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 /**
  * A pretty dialog for a KDirSelect control for selecting directories.
diff --git a/kfile/kfileplaceeditdialog.h b/kfile/kfileplaceeditdialog.h
index d5b030aa..e5baaa12 100644
--- a/kfile/kfileplaceeditdialog.h
+++ b/kfile/kfileplaceeditdialog.h
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <kurl.h>
 
-class QCheckBox;
+#include <QCheckBox>
 class KIconButton;
 class KLineEdit;
 class KUrlRequester;
diff --git a/kfile/kfileplacesmodel.h b/kfile/kfileplacesmodel.h
index b3dd821a..6c64e39d 100644
--- a/kfile/kfileplacesmodel.h
+++ b/kfile/kfileplacesmodel.h
@@ -29,8 +29,8 @@
 
 #include <solid/device.h>
 
-class QMimeData;
-class QAction;
+#include <QMimeData>
+#include <QAction>
 
 /**
  * This class is a list view model. Each entry represents a "place"
diff --git a/kfile/kfileplacesview.h b/kfile/kfileplacesview.h
index 88ba8dd4..e81ccb8d 100644
--- a/kfile/kfileplacesview.h
+++ b/kfile/kfileplacesview.h
@@ -25,8 +25,8 @@
 
 #include <kurl.h>
 
-class QResizeEvent;
-class QContextMenuEvent;
+#include <QResizeEvent>
+#include <QContextMenuEvent>
 
 /**
  * This class allows to display a KFilePlacesModel.
diff --git a/kfile/kfilepreviewgenerator.h b/kfile/kfilepreviewgenerator.h
index 1930319b..560678d9 100644
--- a/kfile/kfilepreviewgenerator.h
+++ b/kfile/kfilepreviewgenerator.h
@@ -26,8 +26,8 @@
 
 class KAbstractViewAdapter;
 class KDirModel;
-class QAbstractItemView;
-class QAbstractProxyModel;
+#include <QAbstractItemView>
+#include <QAbstractProxyModel>
 
 /**
  * @brief Generates previews for files of an item view.
diff --git a/kfile/kurlnavigator.h b/kfile/kurlnavigator.h
index 976f9522..ba3e721a 100644
--- a/kfile/kurlnavigator.h
+++ b/kfile/kurlnavigator.h
@@ -30,7 +30,7 @@
 
 class KFilePlacesModel;
 class KUrlComboBox;
-class QMouseEvent;
+#include <QMouseEvent>
 
 /**
  * @brief Widget that allows to navigate through the paths of an URL.
diff --git a/kfile/kurlnavigatorbutton_p.h b/kfile/kurlnavigatorbutton_p.h
index 4aac4bb2..ed06dbbd 100644
--- a/kfile/kurlnavigatorbutton_p.h
+++ b/kfile/kurlnavigatorbutton_p.h
@@ -30,8 +30,8 @@
 #include <kurl.h>
 
 class KJob;
-class QDropEvent;
-class QPaintEvent;
+#include <QDropEvent>
+#include <QPaintEvent>
 
 namespace KIO
 {
diff --git a/kfile/kurlnavigatorbuttonbase_p.h b/kfile/kurlnavigatorbuttonbase_p.h
index 3f4d1d48..fea39a49 100644
--- a/kfile/kurlnavigatorbuttonbase_p.h
+++ b/kfile/kurlnavigatorbuttonbase_p.h
@@ -25,7 +25,7 @@
 #include <QtGui/qpushbutton.h>
 
 class KUrl;
-class QEvent;
+#include <QEvent>
 
 namespace KDEPrivate
 {
diff --git a/kfile/kurlnavigatorprotocolcombo_p.h b/kfile/kurlnavigatorprotocolcombo_p.h
index 075491cc..0ccad6c0 100644
--- a/kfile/kurlnavigatorprotocolcombo_p.h
+++ b/kfile/kurlnavigatorprotocolcombo_p.h
@@ -25,7 +25,7 @@
 
 #include <QtCore/QHash>
 
-class QMenu;
+#include <QMenu>
 
 namespace KDEPrivate
 {
diff --git a/kinit/klauncher_adaptor.h b/kinit/klauncher_adaptor.h
index 36ed3ebf..71949b52 100644
--- a/kinit/klauncher_adaptor.h
+++ b/kinit/klauncher_adaptor.h
@@ -27,10 +27,10 @@
 #include <QtDBus/QDBusAbstractAdaptor>
 #include <QtDBus/QDBusMessage>
 
-template<class T> class QList;
-template<class Key, class Value> class QMap;
-class QString;
-class QStringList;
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
 
 /*
  * Adaptor class for interface org.kde.KLauncher
diff --git a/kio/bookmarks/kbookmarkdialog.h b/kio/bookmarks/kbookmarkdialog.h
index 60258587..3169da00 100644
--- a/kio/bookmarks/kbookmarkdialog.h
+++ b/kio/bookmarks/kbookmarkdialog.h
@@ -25,12 +25,12 @@
 #include <kurl.h>
 
 class KBookmarkManager;
-class QWidget;
-class QLabel;
-class QTreeWidget;
+#include <QWidget>
+#include <QLabel>
+#include <QTreeWidget>
 class KLineEdit;
-class QTreeWidgetItem;
-class QGridLayout;
+#include <QTreeWidgetItem>
+#include <QGridLayout>
 
 /**
  * This class provides a Dialog for editing properties, adding Bookmarks and creating new folders.
diff --git a/kio/bookmarks/kbookmarkmanager.h b/kio/bookmarks/kbookmarkmanager.h
index ea2bb09a..95d7aade 100644
--- a/kio/bookmarks/kbookmarkmanager.h
+++ b/kio/bookmarks/kbookmarkmanager.h
@@ -31,11 +31,11 @@
 #include "kbookmark.h"
 
 class KBookmarkGroup;
-class QDBusMessage;
+#include <QDBusMessage>
 
-class QTreeWidgetItem;
-class QLabel;
-class QTreeWidget;
+#include <QTreeWidgetItem>
+#include <QLabel>
+#include <QTreeWidget>
 class KLineEdit;
 class KMenu;
 class KBookmarkDialog;
diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h
index e1cda9e8..0fc05798 100644
--- a/kio/bookmarks/kbookmarkmenu.h
+++ b/kio/bookmarks/kbookmarkmenu.h
@@ -38,11 +38,11 @@
 #include "kbookmark.h"
 #include "kbookmarkmanager.h"
 
-class QString;
-class QMenu;
+#include <QString>
+#include <QMenu>
 class KBookmark;
 class KAction;
-class QAction;
+#include <QAction>
 class KActionMenu;
 class KActionCollection;
 class KBookmarkOwner;
diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/kio/bookmarks/kbookmarkmenu_p.h
index 4357f8ae..1db4bad6 100644
--- a/kio/bookmarks/kbookmarkmenu_p.h
+++ b/kio/bookmarks/kbookmarkmenu_p.h
@@ -37,8 +37,8 @@
 #include "kbookmarkimporter.h"
 #include "kbookmarkmanager.h"
 
-class QString;
-class QPushButton;
+#include <QString>
+#include <QPushButton>
 class KLineEdit;
 class KBookmark;
 class KBookmarkGroup;
diff --git a/kio/kfile/kabstractfilemodule.h b/kio/kfile/kabstractfilemodule.h
index d2fe96f9..10a2d3a6 100644
--- a/kio/kfile/kabstractfilemodule.h
+++ b/kio/kfile/kabstractfilemodule.h
@@ -23,7 +23,7 @@
 #include <kio/kio_export.h>
 #include <QtCore/QObject>
 #include <kurl.h>
-class QWidget;
+#include <QWidget>
 
 /**
  * Interface to the module that contains the file widget.
diff --git a/kio/kfile/kacleditwidget_p.h b/kio/kfile/kacleditwidget_p.h
index e5993c71..cb705b59 100644
--- a/kio/kfile/kacleditwidget_p.h
+++ b/kio/kfile/kacleditwidget_p.h
@@ -35,11 +35,11 @@
 #include <kfileitem.h>
 
 class KACLListViewItem;
-class QButtonGroup;
+#include <QButtonGroup>
 class KACLListView;
-class QStackedWidget;
-class QCheckBox;
-class QAbstractButton;
+#include <QStackedWidget>
+#include <QCheckBox>
+#include <QAbstractButton>
 class QColorGroup;
 
 /**
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 178580a9..1023c8ee 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -921,30 +921,30 @@ KAbstractFileWidget* KFileDialog::fileWidget()
 }
 
 
-#define KF_EXTERN extern
-
+QT_BEGIN_NAMESPACE
 typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption,
                                                           const QString &dir,
                                                           QFileDialog::Options options);
-KF_EXTERN _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
+extern _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
 
 typedef QString (*_qt_filedialog_open_filename_hook)(QWidget * parent, const QString &caption,
                                                      const QString &dir, const QString &filter,
                                                      QString *selectedFilter,
                                                      QFileDialog::Options options);
-KF_EXTERN _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
+extern _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook;
 
 typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption,
                                                           const QString &dir, const QString &filter,
                                                           QString *selectedFilter,
                                                           QFileDialog::Options options);
-KF_EXTERN _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
+extern _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook;
 
 typedef QString (*_qt_filedialog_save_filename_hook)(QWidget * parent, const QString &caption,
                                                      const QString &dir, const QString &filter,
                                                      QString *selectedFilter,
                                                      QFileDialog::Options options);
-KF_EXTERN _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
+extern _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook;
+QT_END_NAMESPACE
 
 /*
  * This class is used to override Qt's QFileDialog calls with KFileDialog ones.
diff --git a/kio/kfile/kfilemetadataprovider_p.h b/kio/kfile/kfilemetadataprovider_p.h
index 50522e12..d3e3dba5 100644
--- a/kio/kfile/kfilemetadataprovider_p.h
+++ b/kio/kfile/kfilemetadataprovider_p.h
@@ -30,7 +30,7 @@
 
 class KFileItemList;
 class KUrl;
-class QWidget;
+#include <QWidget>
 
 /**
  * @brief Provides the data for the KMetaDataWidget.
diff --git a/kio/kfile/kfilesharedialog.h b/kio/kfile/kfilesharedialog.h
index 2f31a7c9..ef1a3717 100644
--- a/kio/kfile/kfilesharedialog.h
+++ b/kio/kfile/kfilesharedialog.h
@@ -22,8 +22,8 @@
 
 #include <kpropertiesdialog.h>
 #include <QProcess>
-class QRadioButton;
-class QPushButton;
+#include <QRadioButton>
+#include <QPushButton>
 
 /**
  * This plugin provides a page to KProperiessDialog, showing the "file sharing" options
diff --git a/kio/kfile/kpropertiesdialog_p.h b/kio/kfile/kpropertiesdialog_p.h
index f7e416a3..0d08d68c 100644
--- a/kio/kfile/kpropertiesdialog_p.h
+++ b/kio/kfile/kpropertiesdialog_p.h
@@ -32,10 +32,9 @@
 
 #include "kpropertiesdialog.h"
 
-class KComboBox;
-class QComboBox;
+#include <QComboBox>
 
-class Ui_KPropertiesDesktopBase;
+class KComboBox;
 
 namespace KDEPrivate
 {
diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h
index 5f3802ca..771d23ce 100644
--- a/kio/kfile/kurlrequester.h
+++ b/kio/kfile/kurlrequester.h
@@ -31,8 +31,8 @@ class KFileDialog;
 class KLineEdit;
 class KUrlCompletion;
 
-class QString;
-class QEvent;
+#include <QString>
+#include <QEvent>
 
 /**
  * This class is a widget showing a lineedit and a button, which invokes a
diff --git a/kio/kio/accessmanager.h b/kio/kio/accessmanager.h
index 5bb599a0..8fe07805 100644
--- a/kio/kio/accessmanager.h
+++ b/kio/kio/accessmanager.h
@@ -30,7 +30,7 @@
 #include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QNetworkCookieJar>
 
-class QWidget;
+#include <QWidget>
 
 namespace KIO {
 
diff --git a/kio/kio/authinfo.h b/kio/kio/authinfo.h
index c8a89f7e..2221dc40 100644
--- a/kio/kio/authinfo.h
+++ b/kio/kio/authinfo.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 
-class QDBusArgument;
+#include <QDBusArgument>
 
 namespace KIO {
 
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index 9e31aef7..863ca035 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -207,7 +207,7 @@ void ChmodJobPrivate::chmodNextFile()
         if ( info.url.isLocalFile() && ( m_newOwner != -1 || m_newGroup != -1 ) )
         {
             QString path = info.url.toLocalFile();
-            if ( chown( QFile::encodeName(path), m_newOwner, m_newGroup ) != 0 )
+            if ( chown( KUrl(QFile::encodeName(path)), QString::number(m_newOwner), QString::number(m_newGroup) ) != 0 )
             {
                 int answer = KMessageBox::warningContinueCancel( 0, i18n( "<qt>Could not modify the ownership of file <b>%1</b>. You have insufficient access to the file to perform the change.</qt>" , path), QString(), KGuiItem(i18n("&Skip File")) );
                 if (answer == KMessageBox::Cancel)
diff --git a/kio/kio/copyjob.h b/kio/kio/copyjob.h
index 1b44e729..bd434e0c 100644
--- a/kio/kio/copyjob.h
+++ b/kio/kio/copyjob.h
@@ -28,7 +28,7 @@
 
 #include "jobclasses.h"
 
-class QTimer;
+#include <QTimer>
 
 namespace KIO {
 
diff --git a/kio/kio/dataprotocol.h b/kio/kio/dataprotocol.h
index f7264477..11741421 100644
--- a/kio/kio/dataprotocol.h
+++ b/kio/kio/dataprotocol.h
@@ -34,7 +34,7 @@
  * in-process on the client side.
  */
 
-class QByteArray;
+#include <QByteArray>
 
 class KUrl;
 
diff --git a/kio/kio/dataslave.h b/kio/kio/dataslave.h
index 73d25c45..2e464951 100644
--- a/kio/kio/dataslave.h
+++ b/kio/kio/dataslave.h
@@ -25,7 +25,7 @@
 #include "global.h"
 #include "slave.h"
 
-class QTimer;
+#include <QTimer>
 
 // don't forget to sync DISPATCH_IMPL in dataslave.h
 #define DISPATCH_DECL(type) \
diff --git a/kio/kio/defaultviewadapter_p.h b/kio/kio/defaultviewadapter_p.h
index 139dd738..d6fcdf8f 100644
--- a/kio/kio/defaultviewadapter_p.h
+++ b/kio/kio/defaultviewadapter_p.h
@@ -23,7 +23,7 @@
 #include <kio/global.h>
 #include "kabstractviewadapter_p.h"
 
-class QAbstractItemView;
+#include <QAbstractItemView>
 
 namespace KIO
 {
diff --git a/kio/kio/deletejob.h b/kio/kio/deletejob.h
index 9c6b9fe0..62673ac7 100644
--- a/kio/kio/deletejob.h
+++ b/kio/kio/deletejob.h
@@ -27,7 +27,7 @@
 
 #include "jobclasses.h"
 
-class QTimer;
+#include <QTimer>
 
 namespace KIO {
 
diff --git a/kio/kio/fileundomanager.cpp b/kio/kio/fileundomanager.cpp
index f0a8831a..e2a8dd61 100644
--- a/kio/kio/fileundomanager.cpp
+++ b/kio/kio/fileundomanager.cpp
@@ -45,6 +45,7 @@ static const char* undoStateToString(UndoState state) {
     return s_undoStateToString[state];
 }
 
+QT_BEGIN_NAMESPACE
 static QDataStream &operator<<(QDataStream &stream, const KIO::BasicOperation &op)
 {
     stream << op.m_valid << (qint8)op.m_type << op.m_renamed
@@ -75,6 +76,7 @@ static QDataStream &operator>>(QDataStream &stream, UndoCommand &cmd)
     cmd.m_type = static_cast<FileUndoManager::CommandType>(type);
     return stream;
 }
+QT_END_NAMESPACE
 
 /**
  * checklist:
diff --git a/kio/kio/global.h b/kio/kio/global.h
index 532caa15..6b7dc17b 100644
--- a/kio/kio/global.h
+++ b/kio/kio/global.h
@@ -35,7 +35,7 @@
 class KUrl;
 class KJobTrackerInterface;
 
-class QTime;
+#include <QTime>
 
 /**
  * @short A namespace for KIO globals
diff --git a/kio/kio/hostinfo_p.h b/kio/kio/hostinfo_p.h
index eb6dfc8b..929919a3 100644
--- a/kio/kio/hostinfo_p.h
+++ b/kio/kio/hostinfo_p.h
@@ -25,7 +25,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <QtCore/QObject>
 #include "kio_export.h"
 
-class QHostInfo;
+#include <QHostInfo>
 
 namespace KIO
 {
diff --git a/kio/kio/imagefilter_p.h b/kio/kio/imagefilter_p.h
index c5d709af..efe2f9ad 100644
--- a/kio/kio/imagefilter_p.h
+++ b/kio/kio/imagefilter_p.h
@@ -37,8 +37,8 @@
 
 #include <kio/global.h>
 
-class QImage;
-class QColor;
+#include <QImage>
+#include <QColor>
 namespace KIO {
 
 class KIO_EXPORT ImageFilter
diff --git a/kio/kio/kabstractfileitemactionplugin.h b/kio/kio/kabstractfileitemactionplugin.h
index 6af73969..421b6732 100644
--- a/kio/kio/kabstractfileitemactionplugin.h
+++ b/kio/kio/kabstractfileitemactionplugin.h
@@ -25,9 +25,9 @@
 #include <kio/kio_export.h>
 #include <QtCore/QObject>
 
-class QAction;
-class QMenu;
-class QWidget;
+#include <QAction>
+#include <QMenu>
+#include <QWidget>
 class KFileItemListProperties;
 
 /**
diff --git a/kio/kio/kabstractviewadapter_p.h b/kio/kio/kabstractviewadapter_p.h
index dd466677..40ad01f2 100644
--- a/kio/kio/kabstractviewadapter_p.h
+++ b/kio/kio/kabstractviewadapter_p.h
@@ -22,11 +22,11 @@
 
 #include <QObject>
 
-class QAbstractItemModel;
-class QModelIndex;
-class QPalette;
-class QRect;
-class QSize;
+#include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QPalette>
+#include <QRect>
+#include <QSize>
 
 /*
  * Interface used by KFilePreviewGenerator to generate previews
diff --git a/kio/kio/kdatatool.h b/kio/kio/kdatatool.h
index 60550786..b4f122c5 100644
--- a/kio/kio/kdatatool.h
+++ b/kio/kio/kdatatool.h
@@ -28,8 +28,8 @@
 #include <kcomponentdata.h>
 
 class KDataTool;
-class QPixmap;
-class QStringList;
+#include <QPixmap>
+#include <QStringList>
 class KActionCollection;
 
 // If you're only looking at implementing a data-tool, skip directly to the last
diff --git a/kio/kio/kfileitem.h b/kio/kio/kfileitem.h
index a0fbf2ff..624ec7eb 100644
--- a/kio/kio/kfileitem.h
+++ b/kio/kio/kfileitem.h
@@ -524,7 +524,6 @@ private:
 
 Q_DECLARE_METATYPE(KFileItem)
 
-Q_CORE_EXPORT uint qHash(const QString &key);
 inline uint qHash(const KFileItem& item){ return qHash(item.url().url()); }
 
 /**
diff --git a/kio/kio/kfileitemactions.h b/kio/kio/kfileitemactions.h
index 27ab4e33..b3b76052 100644
--- a/kio/kio/kfileitemactions.h
+++ b/kio/kio/kfileitemactions.h
@@ -27,7 +27,7 @@
 
 class KFileItemListProperties;
 class KAction;
-class QMenu;
+#include <QMenu>
 class KFileItemActionsPrivate;
 
 /**
diff --git a/kio/kio/kfileitemdelegate.h b/kio/kio/kfileitemdelegate.h
index 1b2e2397..9006a688 100644
--- a/kio/kio/kfileitemdelegate.h
+++ b/kio/kio/kfileitemdelegate.h
@@ -26,11 +26,11 @@
 #include <QtGui/QTextOption>
 #include <kio/global.h>
 
-class QAbstractItemModel;
-class QAbstractItemView;
-class QHelpEvent;
-class QModelIndex;
-class QPainter;
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
+#include <QHelpEvent>
+#include <QModelIndex>
+#include <QPainter>
 
 
 /**
diff --git a/kio/kio/kfilemetainfoitem.h b/kio/kio/kfilemetainfoitem.h
index 6576880e..3ea15622 100644
--- a/kio/kio/kfilemetainfoitem.h
+++ b/kio/kio/kfilemetainfoitem.h
@@ -26,7 +26,7 @@
 #include <QtCore/QSharedData>
 
 class KFileWritePlugin;
-class QVariant;
+#include <QVariant>
 class PredicateProperties;
 class KUrl;
 
diff --git a/kio/kio/kfileshare.h b/kio/kio/kfileshare.h
index 2f60c0b2..20c77a00 100644
--- a/kio/kio/kfileshare.h
+++ b/kio/kio/kfileshare.h
@@ -22,7 +22,7 @@
 
 #include <kio/kio_export.h>
 
-class QString;
+#include <QString>
 
 /**
  * Common functionality for the file sharing
diff --git a/kio/kio/kmimetypechooser.h b/kio/kio/kmimetypechooser.h
index 0b2f844f..31b3a14b 100644
--- a/kio/kio/kmimetypechooser.h
+++ b/kio/kio/kmimetypechooser.h
@@ -23,7 +23,7 @@
 #include <kdialog.h>
 #include <kvbox.h>
 
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 /**
  * This widget provides a checkable list of all available mimetypes,
diff --git a/kio/kio/kpasswdserver_p.h b/kio/kio/kpasswdserver_p.h
index 7c0d4604..fc885bcd 100644
--- a/kio/kio/kpasswdserver_p.h
+++ b/kio/kio/kpasswdserver_p.h
@@ -24,7 +24,7 @@
 
 #include <qglobal.h>
 
-class QString;
+#include <QString>
 class OrgKdeKPasswdServerInterface;
 
 namespace KIO
diff --git a/kio/kio/ksambashare_p.h b/kio/kio/ksambashare_p.h
index 066f91c6..4625debe 100644
--- a/kio/kio/ksambashare_p.h
+++ b/kio/kio/ksambashare_p.h
@@ -24,7 +24,7 @@
 #include <QtCore/qmap.h>
 #include "ksambasharedata.h"
 
-class QString;
+#include <QString>
 class KSambaShare;
 
 class KSambaSharePrivate
diff --git a/kio/kio/ksambasharedata.h b/kio/kio/ksambasharedata.h
index 434f13c4..6aa8dde4 100644
--- a/kio/kio/ksambasharedata.h
+++ b/kio/kio/ksambasharedata.h
@@ -24,7 +24,7 @@
 #include <QtCore/qsharedpointer.h>
 #include <kio/kio_export.h>
 
-class QString;
+#include <QString>
 class KSambaShare;
 class KSambaSharePrivate;
 class KSambaShareDataPrivate;
diff --git a/kio/kio/ksambasharedata_p.h b/kio/kio/ksambasharedata_p.h
index 1de23f8d..18197a61 100644
--- a/kio/kio/ksambasharedata_p.h
+++ b/kio/kio/ksambasharedata_p.h
@@ -23,7 +23,7 @@
 
 #include <QtCore/QSharedData>
 
-class QString;
+#include <QString>
 
 class KSambaShareDataPrivate : public QSharedData
 {
diff --git a/kio/kio/kscan.h b/kio/kio/kscan.h
index 7e8934e7..8a384ffb 100644
--- a/kio/kio/kscan.h
+++ b/kio/kio/kscan.h
@@ -23,8 +23,8 @@
 #include <kio/kio_export.h>
 #include <kpagedialog.h>
 
-class QByteArray;
-class QImage;
+#include <QByteArray>
+#include <QImage>
 
 /**
  * This is a base class for scanning dialogs. You can derive from this class
diff --git a/kio/kio/kurifilter.h b/kio/kio/kurifilter.h
index fa96c3fc..8150e0a7 100644
--- a/kio/kio/kurifilter.h
+++ b/kio/kio/kurifilter.h
@@ -35,7 +35,7 @@
 class KUriFilterPrivate;
 class KUriFilterDataPrivate;
 class KCModule;
-class QHostInfo;
+#include <QHostInfo>
 
 /**
  * Class that holds information about a search provider.
diff --git a/kio/kio/kurlcompletion.h b/kio/kio/kurlcompletion.h
index 7746c394..6cabc569 100644
--- a/kio/kio/kurlcompletion.h
+++ b/kio/kio/kurlcompletion.h
@@ -26,7 +26,7 @@
 #include <kcompletion.h>
 #include <kio/jobclasses.h>
 
-class QStringList;
+#include <QStringList>
 class KUrl;
 class KUrlCompletionPrivate;
 
diff --git a/kio/kio/netaccess.h b/kio/kio/netaccess.h
index 930eeb51..ff7013f3 100644
--- a/kio/kio/netaccess.h
+++ b/kio/kio/netaccess.h
@@ -29,10 +29,10 @@
 #include <kurl.h>
 #include <kio/jobclasses.h> // for KIO::JobFlags
 
-class QStringList;
-class QWidget;
+#include <QStringList>
+#include <QWidget>
 
-template<typename T, typename K> class QMap;
+#include <QMap>
 
 class KJob;
 namespace KIO {
diff --git a/kio/kio/paste.h b/kio/kio/paste.h
index 580fe934..da960675 100644
--- a/kio/kio/paste.h
+++ b/kio/kio/paste.h
@@ -22,7 +22,7 @@
 #include <kio/kio_export.h>
 #include <kurl.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace KIO {
     class Job;
diff --git a/kio/kio/pastedialog.h b/kio/kio/pastedialog.h
index ab5ee9c8..441b7842 100644
--- a/kio/kio/pastedialog.h
+++ b/kio/kio/pastedialog.h
@@ -23,7 +23,7 @@
 
 class KComboBox;
 class KLineEdit;
-class QLabel;
+#include <QLabel>
 
 namespace KIO {
 
diff --git a/kio/kio/predicateproperties.h b/kio/kio/predicateproperties.h
index f472a3d5..565f1a83 100644
--- a/kio/kio/predicateproperties.h
+++ b/kio/kio/predicateproperties.h
@@ -24,7 +24,7 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QVariant>
 
-class QValidator;
+#include <QValidator>
 
 /**
  * A predicate is part of the RDF trinity: subject, predicate, object.
diff --git a/kio/kio/previewjob.h b/kio/kio/previewjob.h
index 4555508c..a86c8a60 100644
--- a/kio/kio/previewjob.h
+++ b/kio/kio/previewjob.h
@@ -27,7 +27,7 @@
 #include <kfileitem.h>
 #include <kio/job.h>
 
-class QPixmap;
+#include <QPixmap>
 
 namespace KIO {
     class PreviewJobPrivate;
diff --git a/kio/kio/renamedialog.h b/kio/kio/renamedialog.h
index 34c6d2ba..a5deef62 100644
--- a/kio/kio/renamedialog.h
+++ b/kio/kio/renamedialog.h
@@ -29,9 +29,9 @@
 
 #include <kio/global.h>
 
-class QScrollArea;
-class QLabel;
-class QPixmap;
+#include <QScrollArea>
+#include <QLabel>
+#include <QPixmap>
 class KFileItem;
 
 namespace KIO
diff --git a/kio/kio/skipdialog.h b/kio/kio/skipdialog.h
index 366544bc..df23b37c 100644
--- a/kio/kio/skipdialog.h
+++ b/kio/kio/skipdialog.h
@@ -22,7 +22,7 @@
 #include <kio/kio_export.h>
 #include <kdialog.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace KIO {
 
diff --git a/kio/kio/tcpslavebase.h b/kio/kio/tcpslavebase.h
index 15d3b055..220541c2 100644
--- a/kio/kio/tcpslavebase.h
+++ b/kio/kio/tcpslavebase.h
@@ -30,7 +30,7 @@
 
 #include <kio/slavebase.h>
 
-class QIODevice;
+#include <QIODevice>
 
 namespace KIO {
 
diff --git a/kio/kio/thumbcreator.h b/kio/kio/thumbcreator.h
index a5149d05..ba3eebc3 100644
--- a/kio/kio/thumbcreator.h
+++ b/kio/kio/thumbcreator.h
@@ -22,9 +22,9 @@
 
 #include <kio/kio_export.h>
 
-class QString;
-class QImage;
-class QWidget;
+#include <QString>
+#include <QImage>
+#include <QWidget>
 
 /**
  * This is the baseclass for "thumbnail-plugins" in KDE. Using the class
diff --git a/kio/kio/udsentry.cpp b/kio/kio/udsentry.cpp
index 794fc45c..2e99ffee 100644
--- a/kio/kio/udsentry.cpp
+++ b/kio/kio/udsentry.cpp
@@ -48,7 +48,9 @@ public:
     static void save(QDataStream &, const UDSEntry &);
     static void load(QDataStream &, UDSEntry &);
 };
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(KIO::UDSEntryPrivate::Field, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 UDSEntry::UDSEntry()
     : d(new UDSEntryPrivate())
@@ -130,6 +132,7 @@ void UDSEntry::clear()
     d->fields.clear();
 }
 
+QT_BEGIN_NAMESPACE
 QDataStream & operator<<(QDataStream &s, const UDSEntry &a)
 {
     UDSEntryPrivate::save(s, a);
@@ -141,6 +144,7 @@ QDataStream & operator>>(QDataStream &s, UDSEntry &a)
     UDSEntryPrivate::load(s, a);
     return s;
 }
+QT_END_NAMESPACE
 
 void UDSEntryPrivate::save(QDataStream &s, const UDSEntry &a)
 {
diff --git a/kio/kio/udsentry.h b/kio/kio/udsentry.h
index 1aadec2d..866bb5d9 100644
--- a/kio/kio/udsentry.h
+++ b/kio/kio/udsentry.h
@@ -273,7 +273,9 @@ namespace KIO
     typedef QList<UDSEntry> UDSEntryList;
 } // end namespace
 
+QT_BEGIN_NAMESPACE
 KIO_EXPORT QDataStream & operator<< ( QDataStream & s, const KIO::UDSEntry & a );
 KIO_EXPORT QDataStream & operator>> ( QDataStream & s, KIO::UDSEntry & a );
+QT_END_NAMESPACE
 
 #endif /*UDSENTRY_H*/
diff --git a/kio/kssl/kcm/cacertificatespage.h b/kio/kssl/kcm/cacertificatespage.h
index eb7b9408..62663b81 100644
--- a/kio/kssl/kcm/cacertificatespage.h
+++ b/kio/kssl/kcm/cacertificatespage.h
@@ -23,7 +23,7 @@
 #include "ui_cacertificates.h"
 
 #include <QWidget>
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 class KSslCaCertificate;
 
 class CaCertificatesPage : public QWidget
diff --git a/kio/kssl/ksslcertificatebox.h b/kio/kssl/ksslcertificatebox.h
index 8e4691bf..298c303f 100644
--- a/kio/kssl/ksslcertificatebox.h
+++ b/kio/kssl/ksslcertificatebox.h
@@ -25,7 +25,7 @@
 
 #include <QtGui/QWidget>
 
-class QSslCertificate;
+#include <QSslCertificate>
 
 class KSslCertificateBoxPrivate;
 
diff --git a/kio/misc/kpac/discovery.h b/kio/misc/kpac/discovery.h
index 208c1bac..33f6b67d 100644
--- a/kio/misc/kpac/discovery.h
+++ b/kio/misc/kpac/discovery.h
@@ -23,7 +23,7 @@
 
 #include "downloader.h"
 
-class QProcess;
+#include <QProcess>
 
 namespace KPAC
 {
diff --git a/kio/misc/kpac/proxyscout.h b/kio/misc/kpac/proxyscout.h
index 8f2b20fb..3ebb7820 100644
--- a/kio/misc/kpac/proxyscout.h
+++ b/kio/misc/kpac/proxyscout.h
@@ -28,7 +28,7 @@
 #include <QtCore/QMap>
 #include <QtDBus/QDBusMessage>
 
-class QFileSystemWatcher;
+#include <QFileSystemWatcher>
 
 namespace KPAC
 {
diff --git a/kio/misc/kpac/script.h b/kio/misc/kpac/script.h
index 9b6fd1e2..b2c56ee5 100644
--- a/kio/misc/kpac/script.h
+++ b/kio/misc/kpac/script.h
@@ -25,7 +25,7 @@
 #include <QtCore/QString>
 
 class KUrl;
-class QScriptEngine;
+#include <QScriptEngine>
 
 namespace KPAC
 {
diff --git a/kio/tests/kruntest.h b/kio/tests/kruntest.h
index 0475ce8c..55c547a7 100644
--- a/kio/tests/kruntest.h
+++ b/kio/tests/kruntest.h
@@ -39,7 +39,7 @@ public:
 };
 
 
-class QPushButton;
+#include <QPushButton>
 class Receiver : public QWidget
 {
     Q_OBJECT
diff --git a/kio/tests/previewtest.h b/kio/tests/previewtest.h
index 43133338..3db76f60 100644
--- a/kio/tests/previewtest.h
+++ b/kio/tests/previewtest.h
@@ -3,7 +3,7 @@
 #include <kio/job.h>
 
 class KLineEdit;
-class QLabel;
+#include <QLabel>
 class KFileItem;
 
 class PreviewTest : public QWidget
diff --git a/kioslave/ftp/ftp.h b/kioslave/ftp/ftp.h
index 8f70829d..fceaf751 100644
--- a/kioslave/ftp/ftp.h
+++ b/kioslave/ftp/ftp.h
@@ -29,10 +29,10 @@
 #include <kurl.h>
 #include <kio/slavebase.h>
 
-class QTcpServer;
-class QTcpSocket;
-class QNetworkProxy;
-class QAuthenticator;
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QNetworkProxy>
+#include <QAuthenticator>
 
 struct FtpEntry
 {
diff --git a/kioslave/http/http.h b/kioslave/http/http.h
index 6f2103ed..2a581d13 100644
--- a/kioslave/http/http.h
+++ b/kioslave/http/http.h
@@ -42,9 +42,9 @@
 #include "kio/http.h"
 
 
-class QDomNodeList;
-class QFile;
-class QIODevice;
+#include <QDomNodeList>
+#include <QFile>
+#include <QIODevice>
 
 namespace KIO {
     class AuthInfo;
diff --git a/kioslave/http/kcookiejar/kcookieserver.h b/kioslave/http/kcookiejar/kcookieserver.h
index 6fb4ee75..a187d30b 100644
--- a/kioslave/http/kcookiejar/kcookieserver.h
+++ b/kioslave/http/kcookiejar/kcookieserver.h
@@ -32,7 +32,7 @@
 class KHttpCookieList;
 class KCookieJar;
 class KHttpCookie;
-class QTimer;
+#include <QTimer>
 class RequestList;
 class KConfig;
 
diff --git a/kioslave/http/kcookiejar/kcookiewin.h b/kioslave/http/kcookiejar/kcookiewin.h
index 3409a2e4..dd1be96b 100644
--- a/kioslave/http/kcookiejar/kcookiewin.h
+++ b/kioslave/http/kcookiejar/kcookiewin.h
@@ -32,7 +32,7 @@
 #include "kcookiejar.h"
 
 class KLineEdit;
-class QPushButton;
+#include <QPushButton>
 
 class KCookieDetail : public QGroupBox
 {
diff --git a/kparts/browserextension.h b/kparts/browserextension.h
index 5d3e0bc6..263a2324 100644
--- a/kparts/browserextension.h
+++ b/kparts/browserextension.h
@@ -28,17 +28,17 @@
 
 #include <QtCore/qshareddata.h>
 
-template <class T1, class T2> struct QPair;
+#include <QPair>
 template<typename T> class Q3PtrList;
-template <class Key, class T> class QMap;
-template<typename T> class QList;
+#include <QMap>
+#include <QList>
 
 class KFileItem;
 class KFileItemList;
-class QDataStream;
-class QPoint;
-class QString;
-class QStringList;
+#include <QDataStream>
+#include <QPoint>
+#include <QString>
+#include <QStringList>
 
 namespace KParts {
 
diff --git a/kparts/event.h b/kparts/event.h
index 2536b016..1561ed4b 100644
--- a/kparts/event.h
+++ b/kparts/event.h
@@ -24,7 +24,7 @@
 
 #include <kparts/kparts_export.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace KParts
 {
diff --git a/kparts/factory.h b/kparts/factory.h
index 8860faf0..ce203395 100644
--- a/kparts/factory.h
+++ b/kparts/factory.h
@@ -23,7 +23,7 @@
 #include <kpluginfactory.h>
 #include <kparts/kparts_export.h>
 
-class QWidget;
+#include <QWidget>
 
 namespace KParts
 {
diff --git a/kparts/htmlextension.h b/kparts/htmlextension.h
index e118818e..1cb785e2 100644
--- a/kparts/htmlextension.h
+++ b/kparts/htmlextension.h
@@ -385,7 +385,9 @@ inline void qSwap( KParts::SelectorInterface::Element & lhs, KParts::SelectorInt
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(KParts::SelectorInterface::QueryMethods)
 
+QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(KParts::SelectorInterface::Element, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
 
 Q_DECLARE_INTERFACE(KParts::SelectorInterface,
                     "org.kde.KParts.SelectorInterface")
diff --git a/kparts/mainwindow.h b/kparts/mainwindow.h
index e0da0c46..dc63b466 100644
--- a/kparts/mainwindow.h
+++ b/kparts/mainwindow.h
@@ -26,7 +26,7 @@
 
 #include <kparts/part.h>
 
-class QString;
+#include <QString>
 
 namespace KParts
 {
diff --git a/kparts/part.h b/kparts/part.h
index 8db12144..1b5882be 100644
--- a/kparts/part.h
+++ b/kparts/part.h
@@ -37,9 +37,9 @@
 
 class KIconLoader;
 class KComponentData;
-class QWidget;
-class QEvent;
-class QPoint;
+#include <QWidget>
+#include <QEvent>
+#include <QPoint>
 struct QUnknownInterface;
 
 class KJob;
diff --git a/kparts/statusbarextension.h b/kparts/statusbarextension.h
index 9239696f..4925a0d5 100644
--- a/kparts/statusbarextension.h
+++ b/kparts/statusbarextension.h
@@ -28,7 +28,7 @@
 
 class KStatusBar;
 class KMainWindow;
-class QEvent;
+#include <QEvent>
 
 namespace KParts
 {
diff --git a/kparts/tests/normalktm.h b/kparts/tests/normalktm.h
index 7eb0f6b7..b9957940 100644
--- a/kparts/tests/normalktm.h
+++ b/kparts/tests/normalktm.h
@@ -26,7 +26,7 @@
 #include <kxmlguiwindow.h>
 
 class KAction;
-class QWidget;
+#include <QWidget>
 
 class TestMainWindow : public KXmlGuiWindow
 {
diff --git a/kparts/tests/notepad.h b/kparts/tests/notepad.h
index 3dbd3056..46dc9029 100644
--- a/kparts/tests/notepad.h
+++ b/kparts/tests/notepad.h
@@ -26,7 +26,7 @@
 #include <kparts/part.h>
 
 class KAboutData;
-class QTextEdit;
+#include <QTextEdit>
 
 /**
  * Who said writing a part should be complex ? :-)
diff --git a/kparts/tests/parts.h b/kparts/tests/parts.h
index 070dce88..b722f231 100644
--- a/kparts/tests/parts.h
+++ b/kparts/tests/parts.h
@@ -25,7 +25,7 @@
 #include <kparts/part.h>
 #include <kcomponentdata.h>
 
-class QTextEdit;
+#include <QTextEdit>
 namespace KParts {
 class GUIActivateEvent;
 }
diff --git a/kparts/tests/testmainwindow.h b/kparts/tests/testmainwindow.h
index 9b8426d5..f9dd655f 100644
--- a/kparts/tests/testmainwindow.h
+++ b/kparts/tests/testmainwindow.h
@@ -26,7 +26,7 @@
 
 namespace KParts { class PartManager; }
 class KAction;
-class QWidget;
+#include <QWidget>
 
 class TestMainWindow : public KParts::MainWindow
 {
diff --git a/kross/core/actioncollection.h b/kross/core/actioncollection.h
index 4876b375..71371b6f 100644
--- a/kross/core/actioncollection.h
+++ b/kross/core/actioncollection.h
@@ -26,8 +26,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QDir>
 
-class QDomElement;
-class QIODevice;
+#include <QDomElement>
+#include <QIODevice>
 
 namespace Kross {
 
diff --git a/kross/modules/translation.h b/kross/modules/translation.h
index d7430308..7f8125d1 100644
--- a/kross/modules/translation.h
+++ b/kross/modules/translation.h
@@ -23,7 +23,7 @@
 #include <QObject>
 #include <QtCore/qvariant.h>
 
-class QString;
+#include <QString>
 
 class KLocalizedString;
 
diff --git a/kross/test/testobject.h b/kross/test/testobject.h
index f7fc7f04..9d8cb449 100644
--- a/kross/test/testobject.h
+++ b/kross/test/testobject.h
@@ -28,19 +28,19 @@
 #include <QtCore/QUrl>
 #include <QtCore/QThread>
 
-class QSize;
-class QSizeF;
-class QPoint;
-class QPointF;
-class QRect;
-class QRectF;
+#include <QSize>
+#include <QSizeF>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
 
-class QColor;
-class QFont;
-class QBrush;
-class QDate;
-class QTime;
-class QDateTime;
+#include <QColor>
+#include <QFont>
+#include <QBrush>
+#include <QDate>
+#include <QTime>
+#include <QDateTime>
 
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/kross/ui/plugin.h b/kross/ui/plugin.h
index 5ce1cc46..b1552581 100644
--- a/kross/ui/plugin.h
+++ b/kross/ui/plugin.h
@@ -29,7 +29,7 @@ namespace Kross {
     class ActionCollection;
 }
 
-class QWidget;
+#include <QWidget>
 
 namespace Kross
 {
diff --git a/kross/ui/view.h b/kross/ui/view.h
index 88b89f86..9a134df8 100644
--- a/kross/ui/view.h
+++ b/kross/ui/view.h
@@ -32,8 +32,8 @@
 #include <kdialog.h>
 
 class KLineEdit;
-class QComboBox;
-class QItemSelection;
+#include <QComboBox>
+#include <QItemSelection>
 class KActionCollection;
 class KUrlRequester;
 
diff --git a/kunitconversion/value.h b/kunitconversion/value.h
index 3fabeaaf..0658f93e 100644
--- a/kunitconversion/value.h
+++ b/kunitconversion/value.h
@@ -24,7 +24,7 @@
 #include "unit.h"
 #include "kunitconversion_export.h"
 
-class QVariant;
+#include <QVariant>
 
 namespace KUnitConversion
 {
diff --git a/kutils/kcmodulecontainer.h b/kutils/kcmodulecontainer.h
index ff1ca37d..d18f3406 100644
--- a/kutils/kcmodulecontainer.h
+++ b/kutils/kcmodulecontainer.h
@@ -23,7 +23,7 @@
 #include <kcmodule.h>
 #include <kcmoduleloader.h>
 
-class QWidget;
+#include <QWidget>
 
 class KCModuleProxy;
 
diff --git a/kutils/kcmoduleinfo.h b/kutils/kcmoduleinfo.h
index c41cefaa..5ad953bd 100644
--- a/kutils/kcmoduleinfo.h
+++ b/kutils/kcmoduleinfo.h
@@ -27,8 +27,8 @@
 #include <kcmutils_export.h>
 #include <kservice.h>
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 /**
  * A class that provides information about a KCModule
diff --git a/kutils/kcmoduleloader.h b/kutils/kcmoduleloader.h
index a8bd5b45..65c813a2 100644
--- a/kutils/kcmoduleloader.h
+++ b/kutils/kcmoduleloader.h
@@ -25,7 +25,7 @@
 #include <kcmodule.h>
 #include <kcmoduleinfo.h>
 
-class QWidget;
+#include <QWidget>
 
 /**
  * @short Loads a KControl Module.
diff --git a/kutils/kcmoduleproxy_p.h b/kutils/kcmoduleproxy_p.h
index 4b103927..f2fa4424 100644
--- a/kutils/kcmoduleproxy_p.h
+++ b/kutils/kcmoduleproxy_p.h
@@ -23,7 +23,7 @@
 #include "kcmoduleinfo.h"
 #include "kcmoduleproxy.h"
 #include <QtGui/QLabel>
-class QVBoxLayout;
+#include <QVBoxLayout>
 
 class KCModuleProxyPrivate
 {
diff --git a/kutils/kemoticons/kemoticonsprovider.h b/kutils/kemoticons/kemoticonsprovider.h
index 7bcdae9b..de78a6eb 100644
--- a/kutils/kemoticons/kemoticonsprovider.h
+++ b/kutils/kemoticons/kemoticonsprovider.h
@@ -25,7 +25,7 @@
 #include <QtCore/QStringList>
 #include <QtCore/QPair>
 
-class QString;
+#include <QString>
 class KEmoticonsProviderPrivate;
 struct Emoticon;
 
diff --git a/kutils/kemoticons/kemoticonstheme.h b/kutils/kemoticons/kemoticonstheme.h
index 3512610e..d06dd6f7 100644
--- a/kutils/kemoticons/kemoticonstheme.h
+++ b/kutils/kemoticons/kemoticonstheme.h
@@ -26,7 +26,7 @@
 
 #include <QtCore/qshareddata.h>
 
-class QString;
+#include <QString>
 
 /**
  * This class contains the emoticons theme
diff --git a/kutils/kidletime/widgetbasedpoller.h b/kutils/kidletime/widgetbasedpoller.h
index 55fe8b08..1b410b4a 100644
--- a/kutils/kidletime/widgetbasedpoller.h
+++ b/kutils/kidletime/widgetbasedpoller.h
@@ -21,8 +21,8 @@
 
 #include "abstractsystempoller.h"
 
-class QTimer;
-class QEvent;
+#include <QTimer>
+#include <QEvent>
 
 class WidgetBasedPoller : public AbstractSystemPoller
 {
diff --git a/kutils/kpluginselector_p.h b/kutils/kpluginselector_p.h
index f686c2d8..12ff5723 100644
--- a/kutils/kpluginselector_p.h
+++ b/kutils/kpluginselector_p.h
@@ -26,10 +26,10 @@
 #include <kwidgetitemdelegate.h>
 #include <kcategorizedsortfilterproxymodel.h>
 
-class QLabel;
-class QCheckBox;
-class QPushButton;
-class QAbstractItemView;
+#include <QLabel>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QAbstractItemView>
 
 class KLineEdit;
 class KCategorizedView;
diff --git a/kutils/ksettings/componentsdialog_p.h b/kutils/ksettings/componentsdialog_p.h
index bd02d88e..e8da3910 100644
--- a/kutils/ksettings/componentsdialog_p.h
+++ b/kutils/ksettings/componentsdialog_p.h
@@ -25,9 +25,9 @@
 
 #include <QtCore/QList>
 
-class QString;
+#include <QString>
 class KPluginInfo;
-class QTreeWidgetItem;
+#include <QTreeWidgetItem>
 
 namespace KSettings
 {
diff --git a/kutils/ksettings/dialog.h b/kutils/ksettings/dialog.h
index 587fbddf..0765cc2a 100644
--- a/kutils/ksettings/dialog.h
+++ b/kutils/ksettings/dialog.h
@@ -26,7 +26,7 @@
 #include <kservice.h>
 #include <kplugininfo.h>
 
-template<class T> class QList;
+#include <QList>
 class KPluginInfo;
 class KCModuleInfo;
 
diff --git a/kutils/ksettings/dialog_p.h b/kutils/ksettings/dialog_p.h
index 77bc62eb..9a9bc86f 100644
--- a/kutils/ksettings/dialog_p.h
+++ b/kutils/ksettings/dialog_p.h
@@ -35,7 +35,7 @@
 #include <kservice.h>
 #include <kplugininfo.h>
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace KSettings
 {
diff --git a/kutils/ksettingswidgetadaptor.h b/kutils/ksettingswidgetadaptor.h
index 3faad489..93cfbdbb 100644
--- a/kutils/ksettingswidgetadaptor.h
+++ b/kutils/ksettingswidgetadaptor.h
@@ -21,7 +21,7 @@
 #define KSETTINGSWIDGETADAPTOR_H
 
 #include <QtCore/QObject>
-class QString;
+#include <QString>
 
 /*
  * Simple D-Bus object to return the KGlobal::caption()
diff --git a/plasma/abstractrunner.h b/plasma/abstractrunner.h
index 483189dd..834f9d00 100644
--- a/plasma/abstractrunner.h
+++ b/plasma/abstractrunner.h
@@ -33,8 +33,8 @@
 #include <plasma/runnercontext.h>
 #include <plasma/runnersyntax.h>
 
-class QAction;
-class QMimeData;
+#include <QAction>
+#include <QMimeData>
 
 class KCompletion;
 
diff --git a/plasma/abstracttoolbox.h b/plasma/abstracttoolbox.h
index b49447b1..9d37018f 100644
--- a/plasma/abstracttoolbox.h
+++ b/plasma/abstracttoolbox.h
@@ -27,7 +27,7 @@
 
 #include "plasma/plasma_export.h"
 
-class QAction;
+#include <QAction>
 
 class KConfigGroup;
 
diff --git a/plasma/animations/javascriptanimation_p.h b/plasma/animations/javascriptanimation_p.h
index 8797e3e5..0cb4d69f 100644
--- a/plasma/animations/javascriptanimation_p.h
+++ b/plasma/animations/javascriptanimation_p.h
@@ -26,8 +26,8 @@
 #include "easinganimation_p.h"
 #include "plasma_export.h"
 
-class QString;
-class QScriptEngine;
+#include <QString>
+#include <QScriptEngine>
 
 //#define PLASMA_JSANIM_FPS
 
diff --git a/plasma/animations/rotation_p.h b/plasma/animations/rotation_p.h
index 30d3d793..01edf4b9 100644
--- a/plasma/animations/rotation_p.h
+++ b/plasma/animations/rotation_p.h
@@ -25,7 +25,7 @@
 
 #include <plasma/animations/easinganimation_p.h>
 
-class QGraphicsRotation;
+#include <QGraphicsRotation>
 
 namespace Plasma {
 /**
diff --git a/plasma/animations/rotationstacked_p.h b/plasma/animations/rotationstacked_p.h
index 9ebefde7..eb79dde1 100644
--- a/plasma/animations/rotationstacked_p.h
+++ b/plasma/animations/rotationstacked_p.h
@@ -27,7 +27,7 @@
 
 #include <QGraphicsLayoutItem>
 
-class QGraphicsRotation;
+#include <QGraphicsRotation>
 class StackedLayout;
 
 namespace Plasma {
diff --git a/plasma/animator.h b/plasma/animator.h
index 4fb963f9..cd361ac8 100644
--- a/plasma/animator.h
+++ b/plasma/animator.h
@@ -28,9 +28,9 @@
 
 #include <plasma/plasma_export.h>
 
-class QGraphicsItem;
-class QGraphicsWidget;
-class QTimeLine;
+#include <QGraphicsItem>
+#include <QGraphicsWidget>
+#include <QTimeLine>
 
 namespace Plasma
 {
diff --git a/plasma/applet.h b/plasma/applet.h
index c99d1b3d..7947fde8 100644
--- a/plasma/applet.h
+++ b/plasma/applet.h
@@ -37,10 +37,10 @@
 #include <plasma/animator.h>
 #include <plasma/framesvg.h>
 
-class QWidget;
+#include <QWidget>
 
 class KConfigDialog;
-class QGraphicsView;
+#include <QGraphicsView>
 class KActionCollection;
 
 namespace Plasma
diff --git a/plasma/containmentactions.h b/plasma/containmentactions.h
index 5b4c9238..2e02484f 100644
--- a/plasma/containmentactions.h
+++ b/plasma/containmentactions.h
@@ -28,7 +28,7 @@
 #include <plasma/plasma.h>
 #include <plasma/packagestructure.h>
 
-class QAction;
+#include <QAction>
 
 namespace Plasma
 {
diff --git a/plasma/containmentactionspluginsconfig.h b/plasma/containmentactionspluginsconfig.h
index 3c4a1687..70ef0983 100644
--- a/plasma/containmentactionspluginsconfig.h
+++ b/plasma/containmentactionspluginsconfig.h
@@ -24,8 +24,8 @@
 
 #include <QtCore/qnamespace.h>
 
-class QString;
-class QEvent;
+#include <QString>
+#include <QEvent>
 
 namespace Plasma
 {
diff --git a/plasma/corona.h b/plasma/corona.h
index b9b44ce9..a781f76f 100644
--- a/plasma/corona.h
+++ b/plasma/corona.h
@@ -28,8 +28,8 @@
 #include <plasma/plasma.h>
 #include <plasma/plasma_export.h>
 
-class QGraphicsGridLayout;
-class QAction;
+#include <QGraphicsGridLayout>
+#include <QAction>
 
 class KAction;
 
diff --git a/plasma/framesvg.h b/plasma/framesvg.h
index ebf001a4..050c2d0f 100644
--- a/plasma/framesvg.h
+++ b/plasma/framesvg.h
@@ -29,14 +29,14 @@
 #include <plasma/plasma.h>
 #include <plasma/svg.h>
 
-class QPainter;
-class QPoint;
-class QPointF;
-class QRect;
-class QRectF;
-class QSize;
-class QSizeF;
-class QMatrix;
+#include <QPainter>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QMatrix>
 
 namespace Plasma
 {
diff --git a/plasma/plasma.h b/plasma/plasma.h
index 0bd6a807..7a5f4bef 100644
--- a/plasma/plasma.h
+++ b/plasma/plasma.h
@@ -27,9 +27,9 @@
 
 #include <plasma/plasma_export.h>
 
-class QAction;
-class QMenu;
-class QGraphicsView;
+#include <QAction>
+#include <QMenu>
+#include <QGraphicsView>
 
 /**
  * Namespace for everything in libplasma
diff --git a/plasma/popupapplet.h b/plasma/popupapplet.h
index 7b8191ad..fda9dfb2 100644
--- a/plasma/popupapplet.h
+++ b/plasma/popupapplet.h
@@ -24,8 +24,8 @@
 #include <plasma/plasma_export.h>
 #include <plasma/plasma.h>
 
-class QGraphicsProxyWidget;
-class QGraphicsLinearLayout;
+#include <QGraphicsProxyWidget>
+#include <QGraphicsLinearLayout>
 
 namespace Plasma
 {
diff --git a/plasma/private/abstractanimationprivate_p.h b/plasma/private/abstractanimationprivate_p.h
index b9ed354e..a1ded167 100644
--- a/plasma/private/abstractanimationprivate_p.h
+++ b/plasma/private/abstractanimationprivate_p.h
@@ -20,7 +20,7 @@
 
 #include <QEasingCurve>
 #include <QtCore/qsharedpointer.h>
-class QAbstractAnimation;
+#include <QAbstractAnimation>
 
 namespace Plasma
 {
diff --git a/plasma/private/animationprivate_p.h b/plasma/private/animationprivate_p.h
index d56a07ab..4aa0a6bd 100644
--- a/plasma/private/animationprivate_p.h
+++ b/plasma/private/animationprivate_p.h
@@ -20,7 +20,7 @@
 
 #include <QEasingCurve>
 #include <QtCore/qsharedpointer.h>
-class QAbstractAnimation;
+#include <QAbstractAnimation>
 
 namespace Plasma
 {
diff --git a/plasma/private/animator_p.h b/plasma/private/animator_p.h
index 36c66717..7789dbf6 100644
--- a/plasma/private/animator_p.h
+++ b/plasma/private/animator_p.h
@@ -27,7 +27,7 @@
 #include <QtCore/qdatetime.h>
 #include <QTimeLine>
 
-class QGraphicsItem;
+#include <QGraphicsItem>
 
 namespace Plasma
 {
diff --git a/plasma/private/applethandle_p.h b/plasma/private/applethandle_p.h
index f249a193..a5f4ec91 100644
--- a/plasma/private/applethandle_p.h
+++ b/plasma/private/applethandle_p.h
@@ -31,7 +31,7 @@
 #include "animator.h"
 #include "svg.h"
 
-class QGraphicsView;
+#include <QGraphicsView>
 
 namespace Plasma
 {
diff --git a/plasma/private/datacontainer_p.h b/plasma/private/datacontainer_p.h
index d9607860..8fa8679e 100644
--- a/plasma/private/datacontainer_p.h
+++ b/plasma/private/datacontainer_p.h
@@ -27,7 +27,7 @@
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QBasicTimer>
 
-class QTimer;
+#include <QTimer>
 
 namespace Plasma
 {
diff --git a/plasma/private/effects/halopainter_p.h b/plasma/private/effects/halopainter_p.h
index e117a699..366912d7 100644
--- a/plasma/private/effects/halopainter_p.h
+++ b/plasma/private/effects/halopainter_p.h
@@ -23,8 +23,8 @@
 #include <QCache>
 #include <QPixmap>
 
-class QRect;
-class QPainter;
+#include <QRect>
+#include <QPainter>
 
 namespace Plasma {
 
diff --git a/plasma/private/effects/ripple_p.h b/plasma/private/effects/ripple_p.h
index 967d4006..493df6fd 100644
--- a/plasma/private/effects/ripple_p.h
+++ b/plasma/private/effects/ripple_p.h
@@ -20,8 +20,8 @@
 
 #include <QtGui/QGraphicsEffect>
 
-class QObject;
-class QPainter;
+#include <QObject>
+#include <QPainter>
 
 namespace Plasma
 {
diff --git a/plasma/private/extender_p.h b/plasma/private/extender_p.h
index e540d8f0..18104b97 100644
--- a/plasma/private/extender_p.h
+++ b/plasma/private/extender_p.h
@@ -25,9 +25,9 @@
 #include <QtCore/qpoint.h>
 #include "plasma/extenders/extender.h"
 
-class QGraphicsGridLayout;
-class QGraphicsLinearLayout;
-class QGraphicsWidget;
+#include <QGraphicsGridLayout>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsWidget>
 
 namespace Plasma
 {
diff --git a/plasma/private/extendergroup_p.h b/plasma/private/extendergroup_p.h
index ad67961f..b17bdd5c 100644
--- a/plasma/private/extendergroup_p.h
+++ b/plasma/private/extendergroup_p.h
@@ -20,7 +20,7 @@
 #ifndef PLASMA_EXTENDERGROUPPRIVATE_H
 #define PLASMA_EXTENDERGROUPPRIVATE_H
 
-class QTimer;
+#include <QTimer>
 
 namespace Plasma 
 {
diff --git a/plasma/private/extenderitem_p.h b/plasma/private/extenderitem_p.h
index 662ded3a..68cf0f17 100644
--- a/plasma/private/extenderitem_p.h
+++ b/plasma/private/extenderitem_p.h
@@ -25,11 +25,11 @@
 #include <QRect>
 #include <QString>
 
-class QGraphicsItem;
-class QGraphicsWidget;
-class QGraphicsLinearLayout;
-class QGraphicsView;
-class QTimer;
+#include <QGraphicsItem>
+#include <QGraphicsWidget>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsView>
+#include <QTimer>
 
 namespace Plasma
 {
diff --git a/plasma/private/kineticscroll_p.h b/plasma/private/kineticscroll_p.h
index 387cd8a2..fef76e73 100644
--- a/plasma/private/kineticscroll_p.h
+++ b/plasma/private/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/plasma/private/meter_p.h b/plasma/private/meter_p.h
index a674f23a..2ca782dd 100644
--- a/plasma/private/meter_p.h
+++ b/plasma/private/meter_p.h
@@ -22,10 +22,10 @@
 
 #include <QObject>
 
-class QRectF;
-class QString;
-class QPainter;
-class QPropertyAnimation;
+#include <QRectF>
+#include <QString>
+#include <QPainter>
+#include <QPropertyAnimation>
 
 namespace Plasma {
 
diff --git a/plasma/querymatch.h b/plasma/querymatch.h
index 3f2d5c4f..acf7855a 100644
--- a/plasma/querymatch.h
+++ b/plasma/querymatch.h
@@ -25,11 +25,11 @@
 
 #include <plasma/plasma_export.h>
 
-class QAction;
-class QIcon;
-class QString;
-class QVariant;
-class QWidget;
+#include <QAction>
+#include <QIcon>
+#include <QString>
+#include <QVariant>
+#include <QWidget>
 
 namespace Plasma
 {
diff --git a/plasma/runnermanager.h b/plasma/runnermanager.h
index 8d2354ab..92c56c98 100644
--- a/plasma/runnermanager.h
+++ b/plasma/runnermanager.h
@@ -30,7 +30,7 @@
 #include <plasma/plasma_export.h>
 #include "abstractrunner.h"
 
-class QAction;
+#include <QAction>
 class KConfigGroup;
 
 namespace Plasma
diff --git a/plasma/scripting/appletscript.h b/plasma/scripting/appletscript.h
index 8572f3ae..12615d60 100644
--- a/plasma/scripting/appletscript.h
+++ b/plasma/scripting/appletscript.h
@@ -30,9 +30,9 @@
 #include <plasma/plasma_export.h>
 #include <plasma/scripting/scriptengine.h>
 
-class QAction;
-class QPainter;
-class QStyleOptionGraphicsItem;
+#include <QAction>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 class KConfigDialog;
 
 namespace Plasma
diff --git a/plasma/scripting/scriptengine.h b/plasma/scripting/scriptengine.h
index 471e0b12..053dd052 100644
--- a/plasma/scripting/scriptengine.h
+++ b/plasma/scripting/scriptengine.h
@@ -28,8 +28,8 @@
 #include <QtCore/QRect>
 #include <QtCore/qsize.h>
 
-class QPainter;
-class QStyleOptionGraphicsItem;
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 
 namespace Plasma
 {
diff --git a/plasma/service.h b/plasma/service.h
index 15356055..b858ec5a 100644
--- a/plasma/service.h
+++ b/plasma/service.h
@@ -30,9 +30,9 @@
 #include <plasma/plasma.h>
 #include "packagemetadata.h"
 
-class QGraphicsObject;
-class QIODevice;
-class QWidget;
+#include <QGraphicsObject>
+#include <QIODevice>
+#include <QWidget>
 
 namespace Plasma
 {
diff --git a/plasma/svg.h b/plasma/svg.h
index 8f2e095e..05e4f543 100644
--- a/plasma/svg.h
+++ b/plasma/svg.h
@@ -25,14 +25,14 @@
 
 #include <plasma/plasma_export.h>
 
-class QPainter;
-class QPoint;
-class QPointF;
-class QRect;
-class QRectF;
-class QSize;
-class QSizeF;
-class QMatrix;
+#include <QPainter>
+#include <QPoint>
+#include <QPointF>
+#include <QRect>
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <QMatrix>
 
 namespace Plasma
 {
diff --git a/plasma/tests/configloadertest.h b/plasma/tests/configloadertest.h
index 5bb5af68..20a67f04 100644
--- a/plasma/tests/configloadertest.h
+++ b/plasma/tests/configloadertest.h
@@ -27,7 +27,7 @@ namespace Plasma
     class ConfigLoader;
 }
 
-class QFile;
+#include <QFile>
 
 class ConfigLoaderTest : public QObject
 {
diff --git a/plasma/tooltipcontent.h b/plasma/tooltipcontent.h
index bd75adda..3eac36dd 100644
--- a/plasma/tooltipcontent.h
+++ b/plasma/tooltipcontent.h
@@ -29,8 +29,8 @@
 
 #include <plasma/plasma_export.h>
 
-class QTextDocument;
-class QGraphicsWidget;
+#include <QTextDocument>
+#include <QGraphicsWidget>
 
 /**
  * This provides the content for a tooltip.
diff --git a/plasma/widgets/busywidget.h b/plasma/widgets/busywidget.h
index 66bd0e9c..613c9c20 100644
--- a/plasma/widgets/busywidget.h
+++ b/plasma/widgets/busywidget.h
@@ -24,7 +24,7 @@
 
 #include <plasma/plasma_export.h>
 
-class QFrame;
+#include <QFrame>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/checkbox.h b/plasma/widgets/checkbox.h
index 915e4a9f..c7d58d74 100644
--- a/plasma/widgets/checkbox.h
+++ b/plasma/widgets/checkbox.h
@@ -24,7 +24,7 @@
 
 #include <plasma/plasma_export.h>
 
-class QCheckBox;
+#include <QCheckBox>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/declarativewidget.h b/plasma/widgets/declarativewidget.h
index abfcde20..2f8901bd 100644
--- a/plasma/widgets/declarativewidget.h
+++ b/plasma/widgets/declarativewidget.h
@@ -24,9 +24,9 @@
 
 #include <plasma/plasma_export.h>
 
-class QDeclarativeEngine;
-class QDeclarativeComponent;
-class QScriptEngine;
+#include <QDeclarativeEngine>
+#include <QDeclarativeComponent>
+#include <QScriptEngine>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/frame.h b/plasma/widgets/frame.h
index 03f6da7e..b0f5e226 100644
--- a/plasma/widgets/frame.h
+++ b/plasma/widgets/frame.h
@@ -25,7 +25,7 @@
 #include <plasma/plasma_export.h>
 #include <plasma/framesvg.h>
 
-class QFrame;
+#include <QFrame>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/groupbox.h b/plasma/widgets/groupbox.h
index bc551c1f..8ab986c6 100644
--- a/plasma/widgets/groupbox.h
+++ b/plasma/widgets/groupbox.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QGraphicsProxyWidget>
 
-class QGroupBox;
+#include <QGroupBox>
 
 #include <plasma/plasma_export.h>
 
diff --git a/plasma/widgets/iconwidget.h b/plasma/widgets/iconwidget.h
index f9cd5a65..de7c52e6 100644
--- a/plasma/widgets/iconwidget.h
+++ b/plasma/widgets/iconwidget.h
@@ -33,8 +33,8 @@
 #include <plasma/animator.h>
 #include <plasma/plasma_export.h>
 
-class QAction;
-class QPropertyAnimation;
+#include <QAction>
+#include <QPropertyAnimation>
 
 /**
  * @class IconWidget plasma/widgets/iconwidget.h <Plasma/Widgets/IconWidget>
diff --git a/plasma/widgets/iconwidget_p.h b/plasma/widgets/iconwidget_p.h
index dc89560f..b1a12811 100644
--- a/plasma/widgets/iconwidget_p.h
+++ b/plasma/widgets/iconwidget_p.h
@@ -35,10 +35,10 @@
 #include "private/actionwidgetinterface_p.h"
 #include "theme.h"
 
-class QAction;
-class QPainter;
-class QTextLayout;
-class QPropertyAnimation;
+#include <QAction>
+#include <QPainter>
+#include <QTextLayout>
+#include <QPropertyAnimation>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/label.h b/plasma/widgets/label.h
index 408eba8e..b8a481ef 100644
--- a/plasma/widgets/label.h
+++ b/plasma/widgets/label.h
@@ -25,7 +25,7 @@
 #include <plasma/plasma_export.h>
 #include <plasma/dataengine.h>
 
-class QLabel;
+#include <QLabel>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/radiobutton.h b/plasma/widgets/radiobutton.h
index 35054d11..0bd7f70b 100644
--- a/plasma/widgets/radiobutton.h
+++ b/plasma/widgets/radiobutton.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QGraphicsProxyWidget>
 
-class QRadioButton;
+#include <QRadioButton>
 
 #include <plasma/plasma_export.h>
 
diff --git a/plasma/widgets/slider.h b/plasma/widgets/slider.h
index 5a80d9e3..4b5f6a86 100644
--- a/plasma/widgets/slider.h
+++ b/plasma/widgets/slider.h
@@ -24,7 +24,7 @@
 
 #include <plasma/plasma_export.h>
 
-class QSlider;
+#include <QSlider>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/tabbar.h b/plasma/widgets/tabbar.h
index d9633420..e03d0663 100644
--- a/plasma/widgets/tabbar.h
+++ b/plasma/widgets/tabbar.h
@@ -26,8 +26,8 @@
 
 #include <plasma/plasma_export.h>
 
-class QString;
-class QIcon;
+#include <QString>
+#include <QIcon>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/toolbutton.h b/plasma/widgets/toolbutton.h
index 89bbbb06..1d6a228b 100644
--- a/plasma/widgets/toolbutton.h
+++ b/plasma/widgets/toolbutton.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QGraphicsProxyWidget>
 
-class QToolButton;
+#include <QToolButton>
 
 #include <plasma/plasma_export.h>
 
diff --git a/plasma/widgets/treeview.h b/plasma/widgets/treeview.h
index 58224eb8..44526c3d 100644
--- a/plasma/widgets/treeview.h
+++ b/plasma/widgets/treeview.h
@@ -24,8 +24,8 @@
 
 #include <plasma/plasma_export.h>
 
-class QTreeView;
-class QAbstractItemModel;
+#include <QTreeView>
+#include <QAbstractItemModel>
 
 namespace Plasma
 {
diff --git a/plasma/widgets/webview.h b/plasma/widgets/webview.h
index 8217f1d1..49244b82 100644
--- a/plasma/widgets/webview.h
+++ b/plasma/widgets/webview.h
@@ -27,11 +27,11 @@
 
 class QWebPage;
 class QWebFrame;
-class QKeyEvent;
-class QGraphicsSceneDragDropEvent;
-class QGraphicsSceneMouseEvent;
-class QGraphicsSceneWheelEvent;
-class QRect;
+#include <QKeyEvent>
+#include <QGraphicsSceneDragDropEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneWheelEvent>
+#include <QRect>
 
 namespace Plasma
 {
diff --git a/security/crypto/certexport.h b/security/crypto/certexport.h
index 9c6ec01b..ea3f6e29 100644
--- a/security/crypto/certexport.h
+++ b/security/crypto/certexport.h
@@ -24,8 +24,8 @@
 #include <kdialog.h>
 
 class KLineEdit;
-class QRadioButton;
-class QPushButton;
+#include <QRadioButton>
+#include <QPushButton>
 class KSSLCertificate;
 
 
diff --git a/security/crypto/crypto.h b/security/crypto/crypto.h
index cd7fc3ee..bf75a4b3 100644
--- a/security/crypto/crypto.h
+++ b/security/crypto/crypto.h
@@ -31,10 +31,10 @@
 #include <kcmodule.h>
 #include <kconfig.h>
 
-class QGridLayout;
-class QRadioButton;
-class QGroupBox;
-class QButtonGroup;
+#include <QGridLayout>
+#include <QRadioButton>
+#include <QGroupBox>
+#include <QButtonGroup>
 
 class KComboBox;
 class KCryptoConfig;
diff --git a/security/crypto/kdatetimedlg.h b/security/crypto/kdatetimedlg.h
index f473c874..09ad93ec 100644
--- a/security/crypto/kdatetimedlg.h
+++ b/security/crypto/kdatetimedlg.h
@@ -26,9 +26,9 @@
 class KDatePicker;
 class KIntNumInput;
 class KPushButton;
-class QDate;
-class QTime;
-class QDateTime;
+#include <QDate>
+#include <QTime>
+#include <QDateTime>
 
 class KDateTimeDlgPrivate;
 
diff --git a/security/kcert/kcertpart.h b/security/kcert/kcertpart.h
index 8831eacc..baa86501 100644
--- a/security/kcert/kcertpart.h
+++ b/security/kcert/kcertpart.h
@@ -27,8 +27,8 @@
 #include <QtCore/qvariant.h>
 
 class KSslCertificateBox;
-class QFrame;
-class QLabel;
+#include <QFrame>
+#include <QLabel>
 class KCertPartPrivate;
 class KComboBox;
 class KSSLSigners;
@@ -37,8 +37,8 @@ class KSSLCertificate;
 class KTabWidget;
 class KTextEdit;
 class KAboutData;
-class QGridLayout;
-class QPushButton;
+#include <QGridLayout>
+#include <QPushButton>
 
 
 class KX509Item : public QTreeWidgetItem {
diff --git a/solid/solid/audiointerface.h b/solid/solid/audiointerface.h
index 43ba9547..433c79e3 100644
--- a/solid/solid/audiointerface.h
+++ b/solid/solid/audiointerface.h
@@ -25,7 +25,7 @@
 
 #include <solid/deviceinterface.h>
 
-class QVariant;
+#include <QVariant>
 namespace Solid
 {
     class AudioInterfacePrivate;
diff --git a/solid/solid/backends/fakehw/fakemanager.h b/solid/solid/backends/fakehw/fakemanager.h
index 758a0a71..1590c10f 100644
--- a/solid/solid/backends/fakehw/fakemanager.h
+++ b/solid/solid/backends/fakehw/fakemanager.h
@@ -23,7 +23,7 @@
 
 #include <solid/ifaces/devicemanager.h>
 
-class QDomElement;
+#include <QDomElement>
 
 using namespace Solid::Ifaces;
 
diff --git a/solid/solid/backends/fstab/fstabhandling.h b/solid/solid/backends/fstab/fstabhandling.h
index 4780a675..22304a66 100644
--- a/solid/solid/backends/fstab/fstabhandling.h
+++ b/solid/solid/backends/fstab/fstabhandling.h
@@ -25,8 +25,8 @@
 #include <QtCore/QString>
 #include <QtCore/QMultiHash>
 
-class QProcess;
-class QObject;
+#include <QProcess>
+#include <QObject>
 
 namespace Solid
 {
diff --git a/solid/solid/backends/fstab/fstabwatcher.h b/solid/solid/backends/fstab/fstabwatcher.h
index 18df9bab..f8079e92 100644
--- a/solid/solid/backends/fstab/fstabwatcher.h
+++ b/solid/solid/backends/fstab/fstabwatcher.h
@@ -23,9 +23,9 @@
 
 #include <QObject>
 
-class QFileSystemWatcher;
-class QFile;
-class QSocketNotifier;
+#include <QFileSystemWatcher>
+#include <QFile>
+#include <QSocketNotifier>
 
 namespace Solid
 {
diff --git a/solid/solid/backends/kupnp/cagibidbuscodec.h b/solid/solid/backends/kupnp/cagibidbuscodec.h
index 9cdbb9c4..7771d26a 100644
--- a/solid/solid/backends/kupnp/cagibidbuscodec.h
+++ b/solid/solid/backends/kupnp/cagibidbuscodec.h
@@ -27,7 +27,7 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QVector>
 
-class QDBusArgument;
+#include <QDBusArgument>
 QDBusArgument& operator<<( QDBusArgument& argument,
                            const Cagibi::Device& device );
 const QDBusArgument& operator>>( const QDBusArgument& argument,
diff --git a/solid/solid/backends/kupnp/cagibidevice.h b/solid/solid/backends/kupnp/cagibidevice.h
index 9d10b9ea..87792e5a 100644
--- a/solid/solid/backends/kupnp/cagibidevice.h
+++ b/solid/solid/backends/kupnp/cagibidevice.h
@@ -25,8 +25,8 @@
 #include <QtCore/qsharedpointer.h>
 
 namespace Cagibi { class Device; }
-class QString;
-class QDBusArgument;
+#include <QString>
+#include <QDBusArgument>
 extern QDBusArgument& operator<<( QDBusArgument& argument,
                                   const Cagibi::Device& device );
 extern const QDBusArgument& operator>>( const QDBusArgument& argument,
diff --git a/solid/solid/backends/kupnp/kupnpmanager.h b/solid/solid/backends/kupnp/kupnpmanager.h
index eb171ed4..7ca97b0f 100644
--- a/solid/solid/backends/kupnp/kupnpmanager.h
+++ b/solid/solid/backends/kupnp/kupnpmanager.h
@@ -31,7 +31,7 @@
 #include <QtCore/QVector>
 #include <QtCore/QHash>
 
-class QDBusInterface;
+#include <QDBusInterface>
 
 typedef QHash<QString,QString> DeviceTypeMap;
 Q_DECLARE_METATYPE( DeviceTypeMap )
diff --git a/solid/solid/backends/shared/udevqt_p.h b/solid/solid/backends/shared/udevqt_p.h
index 189a5ff8..f98a466e 100644
--- a/solid/solid/backends/shared/udevqt_p.h
+++ b/solid/solid/backends/shared/udevqt_p.h
@@ -27,8 +27,8 @@ extern "C"
 #include <libudev.h>
 }
 
-class QByteArray;
-class QSocketNotifier;
+#include <QByteArray>
+#include <QSocketNotifier>
 
 namespace UdevQt
 {
diff --git a/solid/solid/networking_p.h b/solid/solid/networking_p.h
index be626ed2..f5a7f326 100644
--- a/solid/solid/networking_p.h
+++ b/solid/solid/networking_p.h
@@ -27,8 +27,8 @@
 #include "networking.h"
 
 class OrgKdeSolidNetworkingClientInterface;
-class QAbstractSocket;
-class QTimer;
+#include <QAbstractSocket>
+#include <QTimer>
 
 
 namespace Solid
diff --git a/solid/solid/xdgbasedirs_p.h b/solid/solid/xdgbasedirs_p.h
index 369d12f6..6a90592c 100644
--- a/solid/solid/xdgbasedirs_p.h
+++ b/solid/solid/xdgbasedirs_p.h
@@ -26,8 +26,8 @@
 #ifndef SOLID_XDGBASEDIRS_H
 #define SOLID_XDGBASEDIRS_H
 
-class QString;
-class QStringList;
+#include <QString>
+#include <QStringList>
 
 namespace Solid
 {
diff --git a/solid/tests/solidnettestdbusservice.h b/solid/tests/solidnettestdbusservice.h
index bb25e566..80b26f7e 100644
--- a/solid/tests/solidnettestdbusservice.h
+++ b/solid/tests/solidnettestdbusservice.h
@@ -24,7 +24,7 @@
 //#include <solid/networking.h>
 #include <QtCore/QObject>
 
-class QTimer;
+#include <QTimer>
 
 class TestNetworkingService;
 
diff --git a/threadweaver/Weaver/DependencyPolicy.h b/threadweaver/Weaver/DependencyPolicy.h
index 144441df..dce2e3c8 100644
--- a/threadweaver/Weaver/DependencyPolicy.h
+++ b/threadweaver/Weaver/DependencyPolicy.h
@@ -29,7 +29,7 @@
 #ifndef DEPENDENCYPOLICY_H
 #define DEPENDENCYPOLICY_H
 
-template <typename T> class QList;
+#include <QList>
 
 #include "QueuePolicy.h"
 
diff --git a/threadweaver/Weaver/Job.h b/threadweaver/Weaver/Job.h
index edc0280f..bf2e54b9 100644
--- a/threadweaver/Weaver/Job.h
+++ b/threadweaver/Weaver/Job.h
@@ -33,8 +33,8 @@ $Id: Job.h 32 2005-08-17 08:38:01Z mirko $
 
 #include <threadweaver/threadweaver_export.h>
 
-class QMutex;
-class QWaitCondition;
+#include <QMutex>
+#include <QWaitCondition>
 
 namespace ThreadWeaver {
 
diff --git a/threadweaver/Weaver/State.h b/threadweaver/Weaver/State.h
index f770911a..172307dd 100644
--- a/threadweaver/Weaver/State.h
+++ b/threadweaver/Weaver/State.h
@@ -31,7 +31,7 @@
 
 #include <threadweaver/threadweaver_export.h>
 
-class QString;
+#include <QString>
 
 namespace ThreadWeaver {