diff --git a/atoms.h b/atoms.h
index 95e1bde9ee..967190a6e5 100644
--- a/atoms.h
+++ b/atoms.h
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QApplication>
 #include <X11/Xlib.h>
+#include <fixx11h.h>
 
 namespace KWin
 {
diff --git a/group.h b/group.h
index 3103d9c343..5df70a63fe 100644
--- a/group.h
+++ b/group.h
@@ -24,6 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "utils.h"
 #include <X11/X.h>
+#include <fixx11h.h>
 #include <netwm.h>
 
 namespace KWin
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index c906372481..c4cdc543c3 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -18,10 +18,6 @@ set(kwineffects_KDE_LIBS
     KF5::XmlGui # needed for KShortcutEditor
 )
 
-set(kwineffects_XLIB_LIBS
-    ${X11_X11_LIB}
-)
-
 set(kwineffects_XCB_LIBS
     ${XCB_XCB_LIBRARIES}
     ${XCB_XFIXES_LIBRARIES}
@@ -32,7 +28,6 @@ kde4_add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
 target_link_libraries(kwineffects
     ${kwineffects_QT_LIBS}
     ${kwineffects_KDE_LIBS}
-    ${kwineffects_XLIB_LIBS}
     ${kwineffects_XCB_LIBS}
 )
 set_target_properties(kwineffects PROPERTIES VERSION 1.0.0 SOVERSION 1 )
@@ -55,7 +50,7 @@ macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
         include_directories(${OPENGLES_EGL_INCLUDE_DIR})
     endif()
     kde4_add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
-    target_link_libraries(${name} ${kwineffects_QT_LIBS} ${kwineffects_XLIB_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
+    target_link_libraries(${name} ${kwineffects_QT_LIBS} ${kwineffects_XCB_LIBS} kwineffects)
     if(OPENGL_EGL_FOUND)
         target_link_libraries(${name} ${OPENGLES_EGL_LIBRARY})
     endif()
diff --git a/libkwineffects/kwinglobals.h b/libkwineffects/kwinglobals.h
index b16b10eb7b..01c69c52f7 100644
--- a/libkwineffects/kwinglobals.h
+++ b/libkwineffects/kwinglobals.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kdemacros.h>
 
-#include <X11/Xlib.h>
-#include <fixx11h.h>
 #include <xcb/xcb.h>
 
 #include <kwinconfig.h>