Drop no longer needed XLib includes from KWin

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

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);) {

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>
 

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
 

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>

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

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

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>
 

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>