diff --git a/client.cpp b/client.cpp
index 44674e15fa..550fd66311 100644
--- a/client.cpp
+++ b/client.cpp
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <qapplication.h>
 #include <qpainter.h>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <kprocess.h>
 #include <unistd.h>
 #include <kstandarddirs.h>
diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index 83a3e4933b..f4367235d7 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -14,7 +14,7 @@
 
 #include "b2client.h"
 #include <qapplication.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qdrawutil.h>
 #include <QPixmap>
 #include <QPaintEvent>
@@ -34,8 +34,8 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <qbitmap.h>
-#include <qlabel.h>
-#include <qtooltip.h>
+#include <QLabel>
+#include <QToolTip>
 #include <QPixmap>
 
 #include <X11/Xlib.h>
diff --git a/clients/b2/b2client.h b/clients/b2/b2client.h
index 187c2534b0..ff45c59376 100644
--- a/clients/b2/b2client.h
+++ b/clients/b2/b2client.h
@@ -9,8 +9,8 @@
 #ifndef __B2CLIENT_H
 #define __B2CLIENT_H
 
-#include <qvariant.h>
-#include <qdatetime.h>
+#include <QVariant>
+#include <QDateTime>
 #include <q3button.h>
 #include <qbitmap.h>
 //Added by qt3to4:
diff --git a/clients/b2/config/config.h b/clients/b2/config/config.h
index dac46c7ea0..f5253454e8 100644
--- a/clients/b2/config/config.h
+++ b/clients/b2/config/config.h
@@ -9,10 +9,10 @@
 #ifndef _KDE_B2CONFIG_H
 #define _KDE_B2CONFIG_H
 
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <q3groupbox.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <QLabel>
+#include <QComboBox>
 #include <kconfig.h>
 
 class B2Config: public QObject
diff --git a/clients/default/config/config.h b/clients/default/config/config.h
index 4cda567fe3..06846c5aa9 100644
--- a/clients/default/config/config.h
+++ b/clients/default/config/config.h
@@ -10,10 +10,10 @@
 #ifndef _KDE_DEFAULT_CONFIG_H
 #define _KDE_DEFAULT_CONFIG_H
 
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <qgroupbox.h>
 #include <kconfig.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <kvbox.h>
 
 class KDEDefaultConfig: public QObject
diff --git a/clients/default/kdedefault.cpp b/clients/default/kdedefault.cpp
index fd13f95cf6..87943feed3 100644
--- a/clients/default/kdedefault.cpp
+++ b/clients/default/kdedefault.cpp
@@ -18,13 +18,13 @@
 #include <kimageeffect.h>
 #include <kdrawutil.h>
 #include <klocale.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qdrawutil.h>
 #include <qbitmap.h>
 #include <qimage.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <qapplication.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <kdebug.h>
 #include <QPixmap>
 #include <QPolygon>
diff --git a/clients/default/kdedefault.h b/clients/default/kdedefault.h
index 946aca8605..2bb36d2b34 100644
--- a/clients/default/kdedefault.h
+++ b/clients/default/kdedefault.h
@@ -14,7 +14,7 @@
 #define _KDE_DEFAULT_H
 
 #include <qbitmap.h>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <kcommondecoration.h>
 #include <kdecorationfactory.h>
 
diff --git a/clients/keramik/config/config.cpp b/clients/keramik/config/config.cpp
index 290c2ae113..f70adad70c 100644
--- a/clients/keramik/config/config.cpp
+++ b/clients/keramik/config/config.cpp
@@ -26,7 +26,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-#include <qcheckbox.h>
+#include <QCheckBox>
 
 #include "config.h"
 #include "config.moc"
diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index d0b701a51b..5706996b67 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -25,12 +25,12 @@
 #include <kiconeffect.h>
 
 #include <qpainter.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qbitmap.h>
 #include <qstyle.h>
-#include <qtooltip.h>
-#include <qwidget.h>
-#include <qlabel.h>
+#include <QToolTip>
+#include <QWidget>
+#include <QLabel>
 #include <QEvent>
 #include <QApplication>
 #include <QStyle>
diff --git a/clients/kwmtheme/cli_installer/main.cpp b/clients/kwmtheme/cli_installer/main.cpp
index e228f58b7a..b4f7859687 100644
--- a/clients/kwmtheme/cli_installer/main.cpp
+++ b/clients/kwmtheme/cli_installer/main.cpp
@@ -1,5 +1,5 @@
-#include <qfile.h>
-#include <qdir.h>
+#include <QFile>
+#include <QDir>
 #include <kapplication.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 3aea8f3526..089fb0642c 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,7 +1,7 @@
 #include <kconfig.h>
 #include "kwmthemeclient.h"
 #include <kglobal.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qdrawutil.h>
 #include <qpainter.h>
 #include <kpixmapeffect.h>
@@ -10,8 +10,8 @@
 #include <klocale.h>
 #include <qbitmap.h>
 #include <qstyle.h>
-#include <qlabel.h>
-#include <qtooltip.h>
+#include <QLabel>
+#include <QToolTip>
 
 namespace KWMTheme {
 
diff --git a/clients/modernsystem/config/config.cpp b/clients/modernsystem/config/config.cpp
index a8cb0fded2..ed95ba27bb 100644
--- a/clients/modernsystem/config/config.cpp
+++ b/clients/modernsystem/config/config.cpp
@@ -5,7 +5,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <qlayout.h>
+#include <QLayout>
 
 //Added by qt3to4:
 #include <QLabel>
diff --git a/clients/modernsystem/config/config.h b/clients/modernsystem/config/config.h
index 34962a2137..d96ef5e33d 100644
--- a/clients/modernsystem/config/config.h
+++ b/clients/modernsystem/config/config.h
@@ -1,11 +1,11 @@
 #ifndef __KDE_MODSYSTEMCONFIG_H
 #define __KDE_MODSYSTEMCONFIG_H
 
-#include <qcheckbox.h>
-#include <qlayout.h>
+#include <QCheckBox>
+#include <QLayout>
 
 #include <qslider.h>
-#include <qlabel.h>
+#include <QLabel>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <kvbox.h>
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index ee0741aa26..eecedb9e09 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -4,7 +4,7 @@
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <qdrawutil.h>
 //Added by qt3to4:
 #include <QPixmap>
@@ -13,9 +13,9 @@
 #include <QPixmap>
 #include <kdrawutil.h>
 #include <qbitmap.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <qapplication.h>
-#include <qlabel.h>
+#include <QLabel>
 #include "modernsys.h"
 
 #include "buttondata.h"
diff --git a/clients/plastik/config/config.cpp b/clients/plastik/config/config.cpp
index 3f3ea620e2..e800ad80d8 100644
--- a/clients/plastik/config/config.cpp
+++ b/clients/plastik/config/config.cpp
@@ -21,10 +21,10 @@
  */
 
 #include <qbuttongroup.h>
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <qradiobutton.h>
 #include <qslider.h>
-#include <qspinbox.h>
+#include <QSpinBox>
 #include <qwhatsthis.h>
 
 #include <kconfig.h>
diff --git a/clients/plastik/config/config.h b/clients/plastik/config/config.h
index 540a27cda4..b75198aaeb 100644
--- a/clients/plastik/config/config.h
+++ b/clients/plastik/config/config.h
@@ -23,7 +23,7 @@
 #ifndef KNIFTYCONFIG_H
 #define KNIFTYCONFIG_H
 
-#include <qobject.h>
+#include <QObject>
 
 class QButtonGroup;
 class QGroupBox;
diff --git a/clients/plastik/misc.cpp b/clients/plastik/misc.cpp
index 109f3c4981..20be7598d9 100644
--- a/clients/plastik/misc.cpp
+++ b/clients/plastik/misc.cpp
@@ -22,7 +22,7 @@
 
 #include <kpixmapeffect.h>
 
-#include <qcolor.h>
+#include <QColor>
 #include <qimage.h>
 #include <qpainter.h>
 
diff --git a/clients/plastik/plastik.h b/clients/plastik/plastik.h
index 11a84a5b5d..1a5e37629f 100644
--- a/clients/plastik/plastik.h
+++ b/clients/plastik/plastik.h
@@ -23,7 +23,7 @@
 #ifndef PLASTIK_H
 #define PLASTIK_H
 
-#include <qfont.h>
+#include <QFont>
 
 #include <kdecoration.h>
 #include <kdecorationfactory.h>
diff --git a/clients/plastik/plastikbutton.cpp b/clients/plastik/plastikbutton.cpp
index a8a5fed40d..3687ebc4fd 100644
--- a/clients/plastik/plastikbutton.cpp
+++ b/clients/plastik/plastikbutton.cpp
@@ -29,7 +29,7 @@
 #include <qpixmap.h>
 #include <kpixmapeffect.h>
 #include <QPixmap>
-#include <qtimer.h>
+#include <QTimer>
 
 #include "plastikbutton.h"
 #include "plastikbutton.moc"
diff --git a/clients/plastik/plastikclient.cpp b/clients/plastik/plastikclient.cpp
index d7d743bb4b..ac31bdb457 100644
--- a/clients/plastik/plastikclient.cpp
+++ b/clients/plastik/plastikclient.cpp
@@ -23,11 +23,11 @@
 #include <klocale.h>
 
 #include <qbitmap.h>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <qfontmetrics.h>
 #include <qimage.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <QLabel>
+#include <QLayout>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qdesktopwidget.h>
diff --git a/clients/quartz/config/config.h b/clients/quartz/config/config.h
index fc5f83a062..aee43002d2 100644
--- a/clients/quartz/config/config.h
+++ b/clients/quartz/config/config.h
@@ -10,7 +10,7 @@
 #ifndef __KDE_QUARTZCONFIG_H
 #define __KDE_QUARTZCONFIG_H
 
-#include <qcheckbox.h>
+#include <QCheckBox>
 
 #include <kconfig.h>
 #include <kvbox.h>
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index 4b518a92f5..91b83007eb 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -15,7 +15,7 @@
 #include "redmond.h"
 
 #include <qdrawutil.h>
-#include <qdatetime.h>
+#include <QDateTime>
 //Added by qt3to4:
 #include <QPixmap>
 #include <QPaintEvent>
diff --git a/clients/test/test.cpp b/clients/test/test.cpp
index 5143944435..dce0e33b09 100644
--- a/clients/test/test.cpp
+++ b/clients/test/test.cpp
@@ -1,6 +1,6 @@
 #include "test.h"
 
-#include <qtooltip.h>
+#include <QToolTip>
 #include <kglobal.h>
 #include <kdebug.h>
 
diff --git a/clients/test/test.h b/clients/test/test.h
index 56e21dbc0d..952cfa6003 100644
--- a/clients/test/test.h
+++ b/clients/test/test.h
@@ -3,7 +3,7 @@
 
 #include <kdecoration.h>
 #include <kdecorationfactory.h>
-#include <qpushbutton.h>
+#include <QPushButton>
 
 namespace KWinTest
 {
diff --git a/clients/web/WebButton.h b/clients/web/WebButton.h
index 92723559c3..d31916965c 100644
--- a/clients/web/WebButton.h
+++ b/clients/web/WebButton.h
@@ -22,7 +22,7 @@
 #ifndef KWIN_WEB_BUTTON_H
 #define KWIN_WEB_BUTTON_H
 
-#include <qwidget.h>
+#include <QWidget>
 #include <qbitmap.h>
 #include <klocale.h>
 
diff --git a/geometrytip.h b/geometrytip.h
index 6fdd2599d6..37abeb5661 100644
--- a/geometrytip.h
+++ b/geometrytip.h
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_GEOMETRY_TIP_H
 #define KWIN_GEOMETRY_TIP_H
 
-#include <qlabel.h>
+#include <QLabel>
 #include "client.h"
 
 namespace KWinInternal
diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index 41df34d6a1..34eef634c5 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -30,8 +30,8 @@
 
 #include <q3header.h>
 #include <qpainter.h>
-#include <qlabel.h>
-#include <qlayout.h>
+#include <QLabel>
+#include <QLayout>
 #include <qstyle.h>
 //Added by qt3to4:
 #include <QPixmap>
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index 2c47e663f5..cb5228cbe7 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -28,16 +28,16 @@
 */
 
 #include <assert.h>
-#include <qdir.h>
+#include <QDir>
 #include <qfileinfo.h>
-#include <qlayout.h>
+#include <QLayout>
 
 #include <q3groupbox.h>
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <qtabwidget.h>
 
-#include <qlabel.h>
-#include <qfile.h>
+#include <QLabel>
+#include <QFile>
 #include <qslider.h>
 //Added by qt3to4:
 #include <QPixmap>
diff --git a/kcmkwin/kwindecoration/preview.cpp b/kcmkwin/kwindecoration/preview.cpp
index 3c54b857ca..971161e85d 100644
--- a/kcmkwin/kwindecoration/preview.cpp
+++ b/kcmkwin/kwindecoration/preview.cpp
@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <qstyle.h>
 //Added by qt3to4:
 #include <QMouseEvent>
diff --git a/kcmkwin/kwindecoration/preview.h b/kcmkwin/kwindecoration/preview.h
index ce3442d64e..1212791601 100644
--- a/kcmkwin/kwindecoration/preview.h
+++ b/kcmkwin/kwindecoration/preview.h
@@ -20,7 +20,7 @@
 #ifndef KWINDECORATION_PREVIEW_H
 #define KWINDECORATION_PREVIEW_H
 
-#include <qwidget.h>
+#include <QWidget>
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <QLabel>
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index 63f106b860..4aab4d8641 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qlayout.h>
+#include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
 
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index 622086f4e8..eea8855004 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -17,14 +17,14 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <QLabel>
+#include <QComboBox>
 
-#include <qlayout.h>
+#include <QLayout>
 #include <q3grid.h>
 #include <qsizepolicy.h>
 #include <qbitmap.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <Q3GroupBox>
 //Added by qt3to4:
 #include <QPixmap>
diff --git a/kcmkwin/kwinoptions/mouse.h b/kcmkwin/kwinoptions/mouse.h
index af3cbfcb28..19004350be 100644
--- a/kcmkwin/kwinoptions/mouse.h
+++ b/kcmkwin/kwinoptions/mouse.h
@@ -24,10 +24,10 @@
 
 class KConfig;
 
-#include <qwidget.h>
+#include <QWidget>
 #include <kcmodule.h>
-#include <qcombobox.h>
-#include <qtooltip.h>
+#include <QComboBox>
+#include <QToolTip>
 
 
 class ToolTipComboBox: public QComboBox
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 5d4c0d44a8..eb34e74ca2 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -23,15 +23,15 @@
 
 #include <config.h>
 
-#include <qdir.h>
-#include <qlayout.h>
+#include <QDir>
+#include <QLayout>
 #include <qslider.h>
 
 #include <Q3ButtonGroup>
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <qradiobutton.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <QLabel>
+#include <QComboBox>
 //Added by qt3to4:
 #include <QGridLayout>
 #include <QHBoxLayout>
diff --git a/kcmkwin/kwinoptions/windows.h b/kcmkwin/kwinoptions/windows.h
index 181980c0f5..66150af0a7 100644
--- a/kcmkwin/kwinoptions/windows.h
+++ b/kcmkwin/kwinoptions/windows.h
@@ -22,7 +22,7 @@
 #ifndef __KWINDOWCONFIG_H__
 #define __KWINDOWCONFIG_H__
 
-#include <qwidget.h>
+#include <QWidget>
 #include <kcmodule.h>
 #include <config.h>
 
diff --git a/kcmkwin/kwinrules/detectwidget.cpp b/kcmkwin/kwinrules/detectwidget.cpp
index badca957dd..36b3161033 100644
--- a/kcmkwin/kwinrules/detectwidget.cpp
+++ b/kcmkwin/kwinrules/detectwidget.cpp
@@ -23,9 +23,9 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kwin.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <qradiobutton.h>
-#include <qcheckbox.h>
+#include <QCheckBox>
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <QEvent>
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index 4339a5394d..85c41314e4 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -19,7 +19,7 @@
 #include "kcm.h"
 
 #include <kglobal.h>
-#include <qlayout.h>
+#include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
 #include <klocale.h>
diff --git a/kcmkwin/kwinrules/ruleswidget.cpp b/kcmkwin/kwinrules/ruleswidget.cpp
index 3de3ac5aad..46ad20ea66 100644
--- a/kcmkwin/kwinrules/ruleswidget.cpp
+++ b/kcmkwin/kwinrules/ruleswidget.cpp
@@ -21,17 +21,17 @@
 #include <klineedit.h>
 #include <krestrictedline.h>
 #include <kcombobox.h>
-#include <qcheckbox.h>
+#include <QCheckBox>
 #include <kpushbutton.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <kwinmodule.h>
 #include <klocale.h>
-#include <qregexp.h>
+#include <QRegExp>
 
 #include <assert.h>
 #include <kmessagebox.h>
 #include <qtabwidget.h>
-#include <qtimer.h>
+#include <QTimer>
 
 #include "../../rules.h"
 
diff --git a/lib/kcommondecoration.cpp b/lib/kcommondecoration.cpp
index 8eb4db496d..66e9fde27b 100644
--- a/lib/kcommondecoration.cpp
+++ b/lib/kcommondecoration.cpp
@@ -24,10 +24,10 @@
 
 #include <qapplication.h>
 #include <qcursor.h>
-#include <qdatetime.h>
-#include <qlabel.h>
-#include <qtooltip.h>
-#include <qwidget.h>
+#include <QDateTime>
+#include <QLabel>
+#include <QToolTip>
+#include <QWidget>
 
 #include <kdebug.h>
 
diff --git a/lib/kdecoration.h b/lib/kdecoration.h
index 6424bb8e91..1f92350a76 100644
--- a/lib/kdecoration.h
+++ b/lib/kdecoration.h
@@ -25,9 +25,9 @@ DEALINGS IN THE SOFTWARE.
 #ifndef KDECORATION_H
 #define KDECORATION_H
 
-#include <qcolor.h>
-#include <qfont.h>
-#include <qobject.h>
+#include <QColor>
+#include <QFont>
+#include <QObject>
 #include <qiconset.h>
 #include <netwm_def.h>
 #include <kdeversion.h>
diff --git a/lib/kdecoration_p.h b/lib/kdecoration_p.h
index 4d5ab6f711..2eb475eb24 100644
--- a/lib/kdecoration_p.h
+++ b/lib/kdecoration_p.h
@@ -30,7 +30,7 @@ DEALINGS IN THE SOFTWARE.
 // 
 
 #include "kdecoration.h"
-#include <qwidget.h>
+#include <QWidget>
 
 class KConfig;
 
diff --git a/lib/kdecoration_plugins_p.cpp b/lib/kdecoration_plugins_p.cpp
index 9aec49f32b..6ef95cb65d 100644
--- a/lib/kdecoration_plugins_p.cpp
+++ b/lib/kdecoration_plugins_p.cpp
@@ -31,8 +31,8 @@ DEALINGS IN THE SOFTWARE.
 #include <klibloader.h>
 #include <assert.h>
 
-#include <qdir.h>
-#include <qfile.h>
+#include <QDir>
+#include <QFile>
 
 #include "kdecorationfactory.h"
 
diff --git a/lib/kdecoration_plugins_p.h b/lib/kdecoration_plugins_p.h
index cc3b4f9ece..1af90e4d8c 100644
--- a/lib/kdecoration_plugins_p.h
+++ b/lib/kdecoration_plugins_p.h
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
 // This header file is internal. I mean it.
 // 
 
-#include <qstring.h>
-#include <qwidget.h>
+#include <QString>
+#include <QWidget>
 
 #include "kdecoration.h"
 
diff --git a/notifications.h b/notifications.h
index ad892ecd7b..c20751d3d2 100644
--- a/notifications.h
+++ b/notifications.h
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #define KWIN_NOTIFICATIONS_H
 
 #include <stdlib.h>
-#include <qstring.h>
+#include <QString>
 #include <qlist.h>
 
 namespace KWinInternal
diff --git a/options.cpp b/options.cpp
index 47980f06a8..be636c6d44 100644
--- a/options.cpp
+++ b/options.cpp
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <QDesktopWidget>
 
 #include "client.h"
diff --git a/options.h b/options.h
index e31e4784c0..ffa040d969 100644
--- a/options.h
+++ b/options.h
@@ -12,8 +12,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_OPTIONS_H
 #define KWIN_OPTIONS_H
 
-#include <qobject.h>
-#include <qfont.h>
+#include <QObject>
+#include <QFont>
 #include <qpalette.h>
 #include <qstringlist.h>
 #include <kdecoration_p.h>
diff --git a/placement.h b/placement.h
index 8f3803ecaa..c75b6e2b2a 100644
--- a/placement.h
+++ b/placement.h
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_PLACEMENT_H
 #define KWIN_PLACEMENT_H
 
-#include <qpoint.h>
+#include <QPoint>
 #include <QRect>
 #include <QList>
 
diff --git a/popupinfo.cpp b/popupinfo.cpp
index 05e4786d28..1b4a521480 100644
--- a/popupinfo.cpp
+++ b/popupinfo.cpp
@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 #include "client.h"
 #include <qpainter.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <qdrawutil.h>
 #include <qstyle.h>
 #include <kglobal.h>
diff --git a/popupinfo.h b/popupinfo.h
index 82998a4ae2..d053866766 100644
--- a/popupinfo.h
+++ b/popupinfo.h
@@ -11,8 +11,8 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #ifndef KWIN_POPUPINFO_H
 #define KWIN_POPUPINFO_H
-#include <qwidget.h>
-#include <qtimer.h>
+#include <QWidget>
+#include <QTimer>
 
 namespace KWinInternal
 {
diff --git a/rules.cpp b/rules.cpp
index 995b402e03..041d7dcb22 100644
--- a/rules.cpp
+++ b/rules.cpp
@@ -12,10 +12,10 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <fixx11h.h>
 #include <kconfig.h>
-#include <qregexp.h>
+#include <QRegExp>
 #include <ktempfile.h>
 #include <ksimpleconfig.h>
-#include <qfile.h>
+#include <QFile>
 #include <ktoolinvocation.h>
 
 #ifndef KCMRULES
diff --git a/rules.h b/rules.h
index 78a1faee53..7adc42fa44 100644
--- a/rules.h
+++ b/rules.h
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_RULES_H
 #define KWIN_RULES_H
 
-#include <qstring.h>
+#include <QString>
 #include <netwm_def.h>
 #include <qrect.h>
 #include <kdebug.h>
diff --git a/tabbox.cpp b/tabbox.cpp
index f1812c184f..2ba0a7cf84 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -14,7 +14,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 #include "client.h"
 #include <qpainter.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <qdrawutil.h>
 #include <qstyle.h>
 #include <kglobal.h>
diff --git a/tabbox.h b/tabbox.h
index d9eaa74376..5a8dd2e715 100644
--- a/tabbox.h
+++ b/tabbox.h
@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #define KWIN_TABBOX_H
 
 #include <Q3Frame>
-#include <qtimer.h>
+#include <QTimer>
 #include "utils.h"
 
 class QLabel;
diff --git a/tools/decobenchmark/main.cpp b/tools/decobenchmark/main.cpp
index 79e05e372c..42f50cd350 100644
--- a/tools/decobenchmark/main.cpp
+++ b/tools/decobenchmark/main.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <qtimer.h>
+#include <QTimer>
 
 #include <kdebug.h>
 #include <kconfig.h>
diff --git a/tools/decobenchmark/preview.cpp b/tools/decobenchmark/preview.cpp
index 6413f962b9..2470ca9d5b 100644
--- a/tools/decobenchmark/preview.cpp
+++ b/tools/decobenchmark/preview.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <qlabel.h>
+#include <QLabel>
 #include <qstyle.h>
 #include <QMouseEvent>
 #include <QResizeEvent>
diff --git a/tools/decobenchmark/preview.h b/tools/decobenchmark/preview.h
index 7289a96c98..805462ada3 100644
--- a/tools/decobenchmark/preview.h
+++ b/tools/decobenchmark/preview.h
@@ -20,7 +20,7 @@
 #ifndef KWINDECORATION_PREVIEW_H
 #define KWINDECORATION_PREVIEW_H
 
-#include <qwidget.h>
+#include <QWidget>
 #include <kdecoration_p.h>
 #include <kdecoration_plugins_p.h>
 
diff --git a/useractions.cpp b/useractions.cpp
index 0895946310..532f3145b8 100644
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -21,16 +21,16 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "workspace.h"
 
 #include <fixx11h.h>
-#include <qpushbutton.h>
+#include <QPushButton>
 #include <qslider.h>
-#include <qtooltip.h>
+#include <QToolTip>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobalaccel.h>
 #include <kapplication.h>
-#include <qregexp.h>
+#include <QRegExp>
 #include <QMenu>
 #include <QVBoxLayout>
 #include <kauthorized.h>
diff --git a/utils.h b/utils.h
index 265e3637e8..8706621d7b 100644
--- a/utils.h
+++ b/utils.h
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_UTILS_H
 #define KWIN_UTILS_H
 
-#include <qwidget.h>
+#include <QWidget>
 #include <kmanagerselection.h>
 #include <netwm_def.h>
 #include <kshortcutdialog.h>
diff --git a/workspace.cpp b/workspace.cpp
index 078767f58d..224784bb59 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <qregexp.h>
+#include <QRegExp>
 #include <qpainter.h>
 #include <qbitmap.h>
 #include <qclipboard.h>
diff --git a/workspace.h b/workspace.h
index 5361bb368a..f74fb5c485 100644
--- a/workspace.h
+++ b/workspace.h
@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_WORKSPACE_H
 #define KWIN_WORKSPACE_H
 
-#include <qtimer.h>
+#include <QTimer>
 #include <qvector.h>
 #include <kshortcut.h>
 #include <qcursor.h>