diff --git a/include/X11/xcl.h b/include/X11/xcl.h
index 59efad6f..aa0cefc6 100644
--- a/include/X11/xcl.h
+++ b/include/X11/xcl.h
@@ -5,7 +5,7 @@
 #define XCL_H
 
 #include <X11/Xmd.h>
-#include <X11/XCB/xcb.h>
+#include <xcb/xcb.h>
 #include <X11/Xlib.h>
 
 /* Coercions from Xlib XID types to XCB XID types.
diff --git a/src/xcl/display.c b/src/xcl/display.c
index 93fd15c9..81139886 100644
--- a/src/xcl/display.c
+++ b/src/xcl/display.c
@@ -3,7 +3,7 @@
 
 #include "Xlibint.h"
 #include "xclint.h"
-#include <X11/XCB/xcbext.h>
+#include <xcb/xcbext.h>
 #include <X11/Xatom.h>
 #include <X11/Xresource.h>
 #include <stdio.h>
diff --git a/src/xcl/io.c b/src/xcl/io.c
index 9c3b3f4e..0e8e75fc 100644
--- a/src/xcl/io.c
+++ b/src/xcl/io.c
@@ -3,8 +3,8 @@
 
 #include "Xlibint.h"
 #include "xclint.h"
-#include <X11/XCB/xcbext.h>
-#include <X11/XCB/xcbxlib.h>
+#include <xcb/xcbext.h>
+#include <xcb/xcbxlib.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/xcl/xcblock.c b/src/xcl/xcblock.c
index 68ca3c88..9eb410c3 100644
--- a/src/xcl/xcblock.c
+++ b/src/xcl/xcblock.c
@@ -13,8 +13,8 @@
 #include "Xlibint.h"
 #include "locking.h"
 #include "xclint.h"
-#include <X11/XCB/xcbext.h>
-#include <X11/XCB/xcbxlib.h>
+#include <xcb/xcbext.h>
+#include <xcb/xcbxlib.h>
 
 #include <pthread.h>