diff --git a/meson.build b/meson.build
index 265b3074..37a7f309 100644
--- a/meson.build
+++ b/meson.build
@@ -51,10 +51,11 @@ deps = [
 ]
 
 
-gwxcb = subproject('xcb')
+libgwater = subproject('libgwater')
 # XCB stuff
 deps += [
-    gwxcb.get_variable('libgwater_xcb'),
+    libgwater.get_variable('libgwater_xcb'),
+    dependency('xcb'),
     dependency('xcb-aux'),
     dependency('xcb-xkb'),
     dependency('xkbcommon-x11'),
diff --git a/subprojects/libgwater b/subprojects/libgwater
index e6faf482..555fa6df 160000
--- a/subprojects/libgwater
+++ b/subprojects/libgwater
@@ -1 +1 @@
-Subproject commit e6faf48267ae40547cb86c125f265f54f382df1c
+Subproject commit 555fa6df92434c1c3c7548b5a583b1d8ec3fabb3
diff --git a/subprojects/xcb b/subprojects/xcb
deleted file mode 120000
index b916db37..00000000
--- a/subprojects/xcb
+++ /dev/null
@@ -1 +0,0 @@
-libgwater/xcb
\ No newline at end of file