diff --git a/client.cpp b/client.cpp
index 7bcbf183f4..c5fa1eca37 100644
--- a/client.cpp
+++ b/client.cpp
@@ -20,13 +20,13 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <qdatetime.h>
 #include <qtimer.h>
 #include <kwin.h>
-#include <netwm.h>
 #include <kiconloader.h>
 #include "workspace.h"
 #include "client.h"
 #include "events.h"
 #include "atoms.h"
 #include <kaccel.h> // Needed in x11Event() below
+#include <netwm.h>
 #include <X11/X.h>
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/client.h b/client.h
index 7d4651a306..8d8bdb4d4b 100644
--- a/client.h
+++ b/client.h
@@ -11,6 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <qvbox.h>
 #include <qpixmap.h>
 #include <qtimer.h>
+#include <qvariant.h> // it's not Bool safe, so include it here first
 #include <netwm_def.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
diff --git a/clients/icewm/icewm.cpp b/clients/icewm/icewm.cpp
index 0b92a20a72..7a94b9ce77 100644
--- a/clients/icewm/icewm.cpp
+++ b/clients/icewm/icewm.cpp
@@ -50,6 +50,7 @@
 #include <qdatetime.h>
 #include <qbitmap.h>
 #include <qstring.h>
+#include <qregexp.h>
 #include "../../workspace.h"
 #include "../../options.h"
 #include "icewm.h"
diff --git a/clients/kstep/nextclient.cpp b/clients/kstep/nextclient.cpp
index 87df964105..b4aa8ca893 100644
--- a/clients/kstep/nextclient.cpp
+++ b/clients/kstep/nextclient.cpp
@@ -2,6 +2,7 @@
 #include <qabstractlayout.h>
 #include <qlayout.h>
 #include <qdrawutil.h>
+#include <qpainter.h>
 #include <kpixmapeffect.h>
 #include <klocale.h>
 #include <qbitmap.h>
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index f40a3246d3..9ce6de25b5 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -3,11 +3,13 @@
 #include <kglobal.h>
 #include <qlayout.h>
 #include <qdrawutil.h>
+#include <qpainter.h>
 #include <kpixmapeffect.h>
 #include <kstddirs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <qbitmap.h>
+#include <qstyle.h>
 #include "../../workspace.h"
 #include "../../options.h"
 
@@ -231,9 +233,15 @@ void MyButton::drawButtonLabel(QPainter *p)
 	// some visual notification of button presses. i.e. for MGBriezh
 	int offset = (isDown() && ((pixmap()->width() >= width()) || 
                          (pixmap()->height() >= height()))) ? 1 : 0;
+#if QT_VERSION < 300
         style().drawItem(p, offset, offset, width(), height(), 
                          AlignCenter, colorGroup(),
                          true, pixmap(), QString::null);
+#else
+        style().drawItem(p, QRect( offset, offset, width(), height() ), 
+                         AlignCenter, colorGroup(),
+                         true, pixmap(), QString::null);
+#endif
     }
 }
 
diff --git a/clients/mwm/mwmclient.cpp b/clients/mwm/mwmclient.cpp
index 066e51a975..057d7ecebc 100644
--- a/clients/mwm/mwmclient.cpp
+++ b/clients/mwm/mwmclient.cpp
@@ -2,6 +2,7 @@
 #include <qlayout.h>
 #include <qbutton.h>
 #include <qdrawutil.h>
+#include <qpainter.h>
 #include <klocale.h>
 #include "../../workspace.h"
 #include "../../options.h"
diff --git a/clients/riscos/Manager.cpp b/clients/riscos/Manager.cpp
index 5c2950caec..0b194728e6 100644
--- a/clients/riscos/Manager.cpp
+++ b/clients/riscos/Manager.cpp
@@ -29,11 +29,12 @@
 #include <qlayout.h>
 
 #include <kapp.h>
-#include <netwm.h>
 
 #include "../../options.h"
 #include "../../workspace.h"
 
+#include <netwm.h>
+
 #include "Manager.h"
 #include "Static.h"
 #include "LowerButton.h"
diff --git a/clients/web/Web.cpp b/clients/web/Web.cpp
index 4b908df8a0..08e5383926 100644
--- a/clients/web/Web.cpp
+++ b/clients/web/Web.cpp
@@ -25,8 +25,8 @@
 #include <qlayout.h>
 #include <qpainter.h>
 
-#include <netwm.h>
 #include <kwin/workspace.h>
+#include <netwm.h>
 #undef Bool
 
 #include <kconfig.h>
diff --git a/killwindow.cpp b/killwindow.cpp
index bde98e981c..5529fdc7d7 100644
--- a/killwindow.cpp
+++ b/killwindow.cpp
@@ -8,6 +8,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 //#define QT_CLEAN_NAMESPACE
 //#endif
 #include "killwindow.h"
+#include <qcursor.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #include <X11/keysymdef.h>
diff --git a/tabbox.cpp b/tabbox.cpp
index 996c437a05..9ff6609dab 100644
--- a/tabbox.cpp
+++ b/tabbox.cpp
@@ -10,6 +10,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <qpainter.h>
 #include <qlabel.h>
 #include <qdrawutil.h>
+#include <qstyle.h>
 #undef Bool // f**king X11
 #include <kglobal.h>
 #include <kconfig.h>
@@ -201,8 +202,15 @@ void TabBox::paintEvent( QPaintEvent* )
 {
     {
 	QPainter p( this );
+#if QT_VERSION < 300
 	style().drawPanel( &p, 0, 0, width(), height(), colorGroup(), FALSE );
 	style().drawPanel( &p, 4, 4, width()-8, height()-8, colorGroup(), TRUE );
+#else
+	style().drawPrimitive( QStyle::PE_Panel, &p, QRect( 0, 0, width(), height() ),
+                               colorGroup(), QStyle::Style_Default );
+	style().drawPrimitive( QStyle::PE_Panel, &p, QRect( 4, 4, width()-8, height()-8 ),
+                               colorGroup(), QStyle::Style_Sunken );
+#endif
     }
     paintContents();
 }
diff --git a/tabbox.h b/tabbox.h
index 9ffe390bbf..2e59734b70 100644
--- a/tabbox.h
+++ b/tabbox.h
@@ -7,6 +7,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #define TABBOX_H
 #include <qwidget.h>
 #include <qtimer.h>
+#include <qvaluelist.h>
 
 class QLabel;
 
diff --git a/workspace.cpp b/workspace.cpp
index bc8141a0fc..dc33266341 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -24,8 +24,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <kstartupinfo.h>
 #include <kdesktopwidget.h>
 
-#include <netwm.h>
-
 #include "workspace.h"
 #include "client.h"
 #include "tabbox.h"
@@ -33,6 +31,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include "plugins.h"
 #include "events.h"
 #include "killwindow.h"
+#include <netwm.h>
 #include <X11/X.h>
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
@@ -3901,7 +3900,11 @@ void Workspace::updateClientArea()
 QRect Workspace::clientArea(clientAreaOption opt)
 {
     QRect rect = QApplication::desktop()->geometry();
+#if QT_VERSION < 300
     KDesktopWidget *desktop = KApplication::desktop();
+#else
+    QDesktopWidget *desktop = KApplication::desktop();
+#endif
 
     switch (opt) {
 	case MaximizeArea: