diff --git a/kcontrol/kfontinst/dbus/Folder.cpp b/kcontrol/kfontinst/dbus/Folder.cpp
index 3a87ac1b..b6036738 100644
--- a/kcontrol/kfontinst/dbus/Folder.cpp
+++ b/kcontrol/kfontinst/dbus/Folder.cpp
@@ -87,7 +87,7 @@ void Folder::init(bool system, bool systemBus)
     itsDisabledCfg.dirty=false;
     if(itsDisabledCfg.name.isEmpty())
     {
-        QString fileName("/"DISABLED_FONTS".xml");
+        QString fileName("/" DISABLED_FONTS ".xml");
 
         if(system)
             itsDisabledCfg.name=QString::fromLatin1(KFI_ROOT_CFG_DIR)+fileName;
@@ -213,14 +213,14 @@ void Folder::saveDisabled()
 
             QTextStream str(&file);
 
-            str << "<"DISABLED_FONTS">" << endl;
+            str << "<" DISABLED_FONTS ">" << endl;
 
             FamilyCont::ConstIterator it(itsFonts.begin()),
                                       end(itsFonts.end());
 
             for(; it!=end; ++it)
                 (*it).toXml(true, str);
-            str << "</"DISABLED_FONTS">" << endl;
+            str << "</" DISABLED_FONTS ">" << endl;
             str.flush();
 
             if(!file.finalize())
@@ -248,11 +248,11 @@ QStringList Folder::toXml(int max)
         {
             if(i)
             {
-                str << "</"FONTLIST_TAG">" << endl;
+                str << "</" FONTLIST_TAG ">" << endl;
                 rv.append(string);
                 string=QString();
             }
-            str << "<"FONTLIST_TAG" " << SYSTEM_ATTR"=\"" << (itsIsSystem ? "true" : "false") << "\">" << endl;
+            str << "<" FONTLIST_TAG " " << SYSTEM_ATTR "=\"" << (itsIsSystem ? "true" : "false") << "\">" << endl;
         }
 
         (*it).toXml(false, str);
@@ -260,7 +260,7 @@ QStringList Folder::toXml(int max)
 
     if(!string.isEmpty())
     {
-        str << "</"FONTLIST_TAG">" << endl;
+        str << "</" FONTLIST_TAG ">" << endl;
         rv.append(string);
     }
     return rv;
diff --git a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
index 4865bbe3..98551297 100644
--- a/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/GroupList.cpp
@@ -178,16 +178,16 @@ bool CGroupListItem::addFamilies(QDomElement &elem)
 
 void CGroupListItem::save(QTextStream &str)
 {
-    str << " <"GROUP_TAG" "NAME_ATTR"=\"" << Misc::encodeText(itsName, str) << "\">" << endl;
+    str << " <" GROUP_TAG " " NAME_ATTR "=\"" << Misc::encodeText(itsName, str) << "\">" << endl;
     if(itsFamilies.count())
     {
         QSet<QString>::ConstIterator it(itsFamilies.begin()),
                                      end(itsFamilies.end());
 
         for(; it!=end; ++it)
-            str << "  <"FAMILY_TAG">" << Misc::encodeText(*it, str) << "</"FAMILY_TAG">" << endl;
+            str << "  <" FAMILY_TAG ">" << Misc::encodeText(*it, str) << "</" FAMILY_TAG ">" << endl;
     }
-    str << " </"GROUP_TAG">" << endl;
+    str << " </" GROUP_TAG ">" << endl;
 }
 
 CGroupList::CGroupList(QWidget *parent)
@@ -494,7 +494,7 @@ bool CGroupList::save(const QString &fileName, CGroupListItem *grp)
     {
         QTextStream str(&file);
 
-        str << "<"GROUPS_DOC">" << endl;
+        str << "<" GROUPS_DOC ">" << endl;
 
         if(grp)
             grp->save(str);
@@ -507,7 +507,7 @@ bool CGroupList::save(const QString &fileName, CGroupListItem *grp)
                 if((*it)->isCustom())
                     (*it)->save(str);
         }
-        str << "</"GROUPS_DOC">" << endl;
+        str << "</" GROUPS_DOC ">" << endl;
         itsModified=false;
         return file.finalize();
     }
diff --git a/kscreensaver/libkscreensaver/kscreensaver.h b/kscreensaver/libkscreensaver/kscreensaver.h
index d4d7f384..1c7e0507 100644
--- a/kscreensaver/libkscreensaver/kscreensaver.h
+++ b/kscreensaver/libkscreensaver/kscreensaver.h
@@ -23,6 +23,7 @@
 #define KSCREENSAVER_H
 
 #include <QtGui/QWidget>
+#include <QtGui/QDialog>
 
 #include <kscreensaver_export.h>
 #include <kaboutdata.h> // needed by all users of this header, so no point in a forward declaration
diff --git a/ksmserver/screenlocker/greeter/greeterapp.h b/ksmserver/screenlocker/greeter/greeterapp.h
index 2b276bbe..29d01f50 100644
--- a/ksmserver/screenlocker/greeter/greeterapp.h
+++ b/ksmserver/screenlocker/greeter/greeterapp.h
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Plasma/PackageStructure>
 
+#include <QTimer>
 #include <QDeclarativeView>
 
 namespace Plasma {
diff --git a/kwin/clients/aurorae/themes/plastik/code/plastikbutton.h b/kwin/clients/aurorae/themes/plastik/code/plastikbutton.h
index 96e8d7bf..6a646863 100644
--- a/kwin/clients/aurorae/themes/plastik/code/plastikbutton.h
+++ b/kwin/clients/aurorae/themes/plastik/code/plastikbutton.h
@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_PLASTIK_BUTTON_H
 #define KWIN_PLASTIK_BUTTON_H
 
+#include <QPainter>
 #include <QDeclarativeImageProvider>
 
 namespace KWin
diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h
index 940be737..377ab20e 100644
--- a/kwin/kcmkwin/kwindecoration/kwindecoration.h
+++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h
@@ -39,6 +39,8 @@
 #include "ui_decoration.h"
 
 #include <QSortFilterProxyModel>
+#include <QTimer>
+
 namespace KWin
 {
 
diff --git a/kwin/rules.h b/kwin/rules.h
index 2a635535..7b42a422 100644
--- a/kwin/rules.h
+++ b/kwin/rules.h
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <netwm_def.h>
 #include <QRect>
+#include <QTimer>
 #include <kconfiggroup.h>
 #include <kdebug.h>
 
diff --git a/libs/oxygen/oxygentileset.h b/libs/oxygen/oxygentileset.h
index a5cd3c32..ac8b823d 100644
--- a/libs/oxygen/oxygentileset.h
+++ b/libs/oxygen/oxygentileset.h
@@ -24,6 +24,7 @@
 #include "oxygen_export.h"
 
 #include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 #include <QtCore/QRect>
 #include <QtCore/QVector>
 
diff --git a/plasma/applets/calendar/calendar.h b/plasma/applets/calendar/calendar.h
index a653f751..e4d84f97 100644
--- a/plasma/applets/calendar/calendar.h
+++ b/plasma/applets/calendar/calendar.h
@@ -24,6 +24,8 @@
 #include <Plasma/PopupApplet>
 #include <Plasma/Label>
 
+#include <QTimer>
+
 #include "plasmaclock/calendar.h"
 
 namespace Plasma
diff --git a/plasma/applets/pager/pager.h b/plasma/applets/pager/pager.h
index 316c30c1..d0e28cfb 100644
--- a/plasma/applets/pager/pager.h
+++ b/plasma/applets/pager/pager.h
@@ -23,14 +23,14 @@
 
 #include <QtGui/qgraphicssceneevent.h>
 #include <QList>
+#include <QTimer>
+#include <QDesktopWidget>
 
 #include <Plasma/Applet>
 
 #include "model.h"
 #include "ui_pagerConfig.h"
 
-#include <QDesktopWidget>
-
 class KColorScheme;
 class KWindowInfo;
 class KCModuleProxy;
diff --git a/plasma/containments/newspaper/newspaper.h b/plasma/containments/newspaper/newspaper.h
index 95cb4d43..44184838 100644
--- a/plasma/containments/newspaper/newspaper.h
+++ b/plasma/containments/newspaper/newspaper.h
@@ -23,9 +23,10 @@
 #define PLASMA_NEWSPAPER_H
 
 #include <Plasma/Containment>
+#include <QTimer>
+#include <QGraphicsLinearLayout>
 
 class AppletOverlay;
-#include <QGraphicsLinearLayout>
 class AppletsContainer;
 class AppletsView;
 
diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.h b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.h
index 05e0275f..633fa6d6 100644
--- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.h
+++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.h
@@ -20,6 +20,7 @@
 #ifndef MOUSEEVENTLISTENER_H
 #define MOUSEEVENTLISTENER_H
 
+#include <QTimer>
 #include <QDeclarativeItem>
 
 class KDeclarativeMouseEvent : public QObject
diff --git a/plasma/shells/plasma-desktop/controllerwindow.h b/plasma/shells/plasma-desktop/controllerwindow.h
index 67ef4b72..982ff642 100644
--- a/plasma/shells/plasma-desktop/controllerwindow.h
+++ b/plasma/shells/plasma-desktop/controllerwindow.h
@@ -25,6 +25,7 @@
 
 #include <QBoxLayout>
 #include <QGraphicsWidget>
+#include <QTimer>
 
 namespace Plasma
 {
diff --git a/plasma/shells/plasma-desktop/desktopcorona.h b/plasma/shells/plasma-desktop/desktopcorona.h
index c3804707..6a75f2e7 100644
--- a/plasma/shells/plasma-desktop/desktopcorona.h
+++ b/plasma/shells/plasma-desktop/desktopcorona.h
@@ -22,6 +22,7 @@
 
 #include <Plasma/Corona>
 
+#include <QTimer>
 #include <QMenu>
 #include <QAction>