diff --git a/client.h b/client.h
index 05cf1f00e7..9f9adc07ed 100644
--- a/client.h
+++ b/client.h
@@ -35,6 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QWindow>
 // X
 #include <xcb/sync.h>
+#include <X11/Xutil.h>
+#include <fixx11h.h>
 
 // TODO: Cleanup the order of things in this .h file
 
diff --git a/effects/glide/glide.cpp b/effects/glide/glide.cpp
index 40d06577e3..18c1e376e3 100644
--- a/effects/glide/glide.cpp
+++ b/effects/glide/glide.cpp
@@ -26,6 +26,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTimeLine>
 
+#include <X11/Xlib.h>
+#include <fixx11h.h>
+
 // Effect is based on fade effect by Philip Falkner
 
 namespace KWin
diff --git a/toplevel.h b/toplevel.h
index 662800c636..6e5650d127 100644
--- a/toplevel.h
+++ b/toplevel.h
@@ -34,6 +34,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // xcb
 #include <xcb/damage.h>
 #include <xcb/xfixes.h>
+// XLib
+#include <X11/Xlib.h>
+#include <fixx11h.h>
 // system
 #include <assert.h>