diff --git a/clients/oxygen/config/oxygenanimationconfigwidget.cpp b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
index 5139d91594..60b743b5f7 100644
--- a/clients/oxygen/config/oxygenanimationconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenanimationconfigwidget.cpp
@@ -30,7 +30,7 @@
 #include "oxygengenericanimationconfigitem.h"
 
 #include <QButtonGroup>
-#include <QtGui/QHoverEvent>
+#include <QHoverEvent>
 #include <QTextStream>
 #include <KDE/KLocalizedString>
 
diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp
index 35bb488f5c..da9e117286 100644
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@@ -36,8 +36,8 @@
 #include "../oxygenexceptionlist.h"
 
 #include <QTextStream>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusMessage>
+#include <QDBusConnection>
+#include <QDBusMessage>
 
 #include <KConfigGroup>
 #include <KLocalizedString>
diff --git a/clients/oxygen/config/oxygenconfig.h b/clients/oxygen/config/oxygenconfig.h
index c445b700a7..c8500c705f 100644
--- a/clients/oxygen/config/oxygenconfig.h
+++ b/clients/oxygen/config/oxygenconfig.h
@@ -35,7 +35,7 @@
 #include "../oxygendecorationdefines.h"
 
 #include <KSharedConfig>
-#include <QtGui/QPalette>
+#include <QPalette>
 
 namespace Oxygen {
 
diff --git a/clients/oxygen/demo/oxygenshadowdemodialog.cpp b/clients/oxygen/demo/oxygenshadowdemodialog.cpp
index c5f2e4ea05..f930a0b7f8 100644
--- a/clients/oxygen/demo/oxygenshadowdemodialog.cpp
+++ b/clients/oxygen/demo/oxygenshadowdemodialog.cpp
@@ -28,7 +28,7 @@
 #include "oxygenshadowdemodialog.moc"
 
 #include <QDialogButtonBox>
-#include <QtDBus/QDBusConnection>
+#include <QDBusConnection>
 
 #include <KPushButton>
 #include <KFileDialog>
diff --git a/clients/oxygen/demo/oxygenshadowdemowidget.cpp b/clients/oxygen/demo/oxygenshadowdemowidget.cpp
index f47acde71f..974944d3a1 100644
--- a/clients/oxygen/demo/oxygenshadowdemowidget.cpp
+++ b/clients/oxygen/demo/oxygenshadowdemowidget.cpp
@@ -27,7 +27,7 @@
 #include "oxygenshadowdemowidget.h"
 #include "oxygenshadowdemowidget.moc"
 
-#include <QtGui/QPainter>
+#include <QPainter>
 namespace Oxygen
 {
 
diff --git a/clients/oxygen/demo/oxygenshadowdemowidget.h b/clients/oxygen/demo/oxygenshadowdemowidget.h
index 6ebc55afc2..9a578bf6ac 100644
--- a/clients/oxygen/demo/oxygenshadowdemowidget.h
+++ b/clients/oxygen/demo/oxygenshadowdemowidget.h
@@ -31,8 +31,8 @@
 #include "oxygenhelper.h"
 
 #include <QWidget>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QPixmap>
+#include <QPaintEvent>
+#include <QPixmap>
 #include <cassert>
 
 namespace Oxygen
diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index 46ea170df1..ed08f707f5 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -31,8 +31,8 @@
 
 #include <cmath>
 
-#include <QtGui/QPainter>
-#include <QtGui/QPen>
+#include <QPainter>
+#include <QPen>
 
 #include <KColorUtils>
 #include <KColorScheme>
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index a0a8b87619..2d4cec4bca 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -41,9 +41,9 @@
 #include <QApplication>
 #include <QDrag>
 #include <QLabel>
-#include <QtGui/QPainter>
-#include <QtGui/QBitmap>
-#include <QtX11Extras/QX11Info>
+#include <QPainter>
+#include <QBitmap>
+#include <QX11Info>
 #include <QObjectList>
 #include <QMimeData>
 
diff --git a/clients/oxygen/oxygendecohelper.cpp b/clients/oxygen/oxygendecohelper.cpp
index f4122c2567..4c33f19f61 100644
--- a/clients/oxygen/oxygendecohelper.cpp
+++ b/clients/oxygen/oxygendecohelper.cpp
@@ -20,7 +20,7 @@
 
 #include "oxygendecohelper.h"
 
-#include <QtGui/QPainter>
+#include <QPainter>
 #include <KColorUtils>
 
 #include <cmath>
diff --git a/clients/oxygen/oxygensizegrip.cpp b/clients/oxygen/oxygensizegrip.cpp
index 8de09aba8b..463e731d58 100644
--- a/clients/oxygen/oxygensizegrip.cpp
+++ b/clients/oxygen/oxygensizegrip.cpp
@@ -30,11 +30,11 @@
 #include "oxygenclient.h"
 
 #include <cassert>
-#include <QtGui/QPainter>
-#include <QtGui/QPolygon>
+#include <QPainter>
+#include <QPolygon>
 #include <QTimer>
 
-#include <QtX11Extras/QX11Info>
+#include <QX11Info>
 #include <X11/Xlib.h>
 
 namespace Oxygen
diff --git a/clients/oxygen/oxygensizegrip.h b/clients/oxygen/oxygensizegrip.h
index 153df6f380..d2ff51d83f 100644
--- a/clients/oxygen/oxygensizegrip.h
+++ b/clients/oxygen/oxygensizegrip.h
@@ -28,8 +28,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <QWidget>
-#include <QtGui/QPaintEvent>
-#include <QtGui/QMouseEvent>
+#include <QPaintEvent>
+#include <QMouseEvent>
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/oxygentitleanimationdata.cpp b/clients/oxygen/oxygentitleanimationdata.cpp
index 923500a398..d754139033 100644
--- a/clients/oxygen/oxygentitleanimationdata.cpp
+++ b/clients/oxygen/oxygentitleanimationdata.cpp
@@ -27,7 +27,7 @@
 #include "oxygentitleanimationdata.h"
 #include "oxygentitleanimationdata.moc"
 
-#include <QtGui/QPainter>
+#include <QPainter>
 
 namespace Oxygen
 {
diff --git a/clients/oxygen/oxygentitleanimationdata.h b/clients/oxygen/oxygentitleanimationdata.h
index 24e13733ce..cc96dc61ba 100644
--- a/clients/oxygen/oxygentitleanimationdata.h
+++ b/clients/oxygen/oxygentitleanimationdata.h
@@ -34,7 +34,7 @@
 #include <QWeakPointer>
 #include <QBasicTimer>
 #include <QTimerEvent>
-#include <QtGui/QPixmap>
+#include <QPixmap>
 
 
 namespace Oxygen