diff --git a/client.h b/client.h
index f4a3ac08f0..ba387b2762 100644
--- a/client.h
+++ b/client.h
@@ -34,8 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 #include <QPixmap>
 // X
-#include <X11/Xutil.h>
-#include <fixx11h.h>
 #include <xcb/sync.h>
 
 // TODO: Cleanup the order of things in this .h file
diff --git a/effects/blur/blur.cpp b/effects/blur/blur.cpp
index 985493077d..40ba103505 100644
--- a/effects/blur/blur.cpp
+++ b/effects/blur/blur.cpp
@@ -23,8 +23,6 @@
 // KConfigSkeleton
 #include "blurconfig.h"
 
-#include <X11/Xatom.h>
-
 #include <QMatrix4x4>
 #include <QLinkedList>
 #include <KDebug>
@@ -102,7 +100,7 @@ void BlurEffect::updateBlurRegion(EffectWindow *w) const
 {
     QRegion region;
 
-    const QByteArray value = w->readProperty(net_wm_blur_region, XA_CARDINAL, 32);
+    const QByteArray value = w->readProperty(net_wm_blur_region, XCB_ATOM_CARDINAL, 32);
     if (value.size() > 0 && !(value.size() % (4 * sizeof(unsigned long)))) {
         const unsigned long *cardinals = reinterpret_cast<const unsigned long*>(value.constData());
         for (unsigned int i = 0; i < value.size() / sizeof(unsigned long);) {
diff --git a/events.cpp b/events.cpp
index bcb1931d5f..15fe94a642 100644
--- a/events.cpp
+++ b/events.cpp
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <config-X11.h>
-
 #include "client.h"
 #include "cursor.h"
 #include "decorations.h"
@@ -53,10 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kkeyserver.h>
 
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/Xatom.h>
-#include <QX11Info>
 #include <xcb/sync.h>
 #include <xcb/xcb_icccm.h>
 
diff --git a/libkwineffects/kwineffects.cpp b/libkwineffects/kwineffects.cpp
index 937a8eb8f9..6cb46efb57 100644
--- a/libkwineffects/kwineffects.cpp
+++ b/libkwineffects/kwineffects.cpp
@@ -42,8 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <assert.h>
 
 #ifdef KWIN_HAVE_XRENDER_COMPOSITING
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/Xfixes.h>
 #include <xcb/xfixes.h>
 #endif
 
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index c3d36bb40a..340a1e5fb1 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -56,8 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // normally only few of them are enabled
 //#define CHECK_GL_ERROR
 
-#include <X11/extensions/Xcomposite.h>
-
 #include <qpainter.h>
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
diff --git a/useractions.cpp b/useractions.cpp
index 30ac429533..28b6b3d3a1 100755
--- a/useractions.cpp
+++ b/useractions.cpp
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDE/KProcess>
 #include <KDE/KToolInvocation>
 
-#include <X11/extensions/Xrandr.h>
 #ifndef KWIN_NO_XF86VM
 #include <X11/extensions/xf86vmode.h>
 #endif
diff --git a/utils.cpp b/utils.cpp
index 0f2a475e91..3beb9d8243 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils.h"
 
-#include <X11/Xatom.h>
 #include <QWidget>
 
 #ifndef KCMRULES
diff --git a/utils.h b/utils.h
index 8512565024..750d2256d3 100644
--- a/utils.h
+++ b/utils.h
@@ -35,9 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QPoint>
 #include <QRect>
 #include <QScopedPointer>
-// X
-#include <X11/Xlib.h>
-#include <fixx11h.h>
 // system
 #include <limits.h>
 
diff --git a/workspace.h b/workspace.h
index b4d4a098c1..c4206ca269 100644
--- a/workspace.h
+++ b/workspace.h
@@ -30,8 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Qt
 #include <QTimer>
 #include <QVector>
-// X
-#include <X11/Xlib.h>
 // std
 #include <functional>