diff --git a/effects.cpp b/effects.cpp
index 58c8eebe50..13a30abc0b 100644
--- a/effects.cpp
+++ b/effects.cpp
@@ -75,7 +75,7 @@ static QByteArray readWindowProperty(xcb_window_t win, xcb_atom_t atom, xcb_atom
     }
 }
 
-static void deleteWindowProperty(Window win, long int atom)
+static void deleteWindowProperty(xcb_window_t win, long int atom)
 {
     if (win == XCB_WINDOW_NONE) {
         return;
diff --git a/plugins/platforms/x11/common/eglonxbackend.h b/plugins/platforms/x11/common/eglonxbackend.h
index f114f0b741..16036d3dd9 100644
--- a/plugins/platforms/x11/common/eglonxbackend.h
+++ b/plugins/platforms/x11/common/eglonxbackend.h
@@ -13,6 +13,9 @@
 
 #include <xcb/xcb.h>
 
+#include <X11/Xlib-xcb.h>
+#include <fixx11h.h>
+
 namespace KWin
 {
 
diff --git a/plugins/platforms/x11/standalone/x11_platform.h b/plugins/platforms/x11/standalone/x11_platform.h
index e35568c479..0151fbc03e 100644
--- a/plugins/platforms/x11/standalone/x11_platform.h
+++ b/plugins/platforms/x11/standalone/x11_platform.h
@@ -16,6 +16,9 @@
 
 #include <memory>
 
+#include <X11/Xlib-xcb.h>
+#include <fixx11h.h>
+
 namespace KWin
 {
 class XInputIntegration;
diff --git a/plugins/platforms/x11/windowed/x11windowed_backend.cpp b/plugins/platforms/x11/windowed/x11windowed_backend.cpp
index 1395829746..208bdb5784 100644
--- a/plugins/platforms/x11/windowed/x11windowed_backend.cpp
+++ b/plugins/platforms/x11/windowed/x11windowed_backend.cpp
@@ -36,6 +36,7 @@
 // system
 #include <linux/input.h>
 #include <X11/Xlib-xcb.h>
+#include <X11/keysym.h>
 
 namespace KWin
 {
diff --git a/workspace.cpp b/workspace.cpp
index 223a570d44..992536a448 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -368,7 +368,7 @@ void Workspace::initializeX11()
     }
 
     // TODO: better value
-    rootInfo->setActiveWindow(None);
+    rootInfo->setActiveWindow(XCB_WINDOW_NONE);
     focusToNull();
 
     if (!qApp->isSessionRestored())