diff --git a/x11-libs/libxcomposite/libxcomposite-0.4.5.recipe b/x11-libs/libxcomposite/libxcomposite-0.4.5.recipe
index 0f698f328..582bb0c75 100644
--- a/x11-libs/libxcomposite/libxcomposite-0.4.5.recipe
+++ b/x11-libs/libxcomposite/libxcomposite-0.4.5.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2001, 2003 Keith Packard
 	2003 Noah Levitt
 	2006, 2007 Oracle and/or its affiliates"
 LICENSE="libXcomposite"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXcomposite-$portVersion.tar.bz2"
 CHECKSUM_SHA256="b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f"
 SOURCE_DIR="libXcomposite-$portVersion"
@@ -17,13 +17,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="1.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxcomposite$secondaryArchSuffix = $portVersion
 	lib:libXcomposite$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXfixes$secondaryArchSuffix
 	"
 
@@ -37,7 +39,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXfixes$secondaryArchSuffix
 	devel:util_macros
 	"
diff --git a/x11-libs/libxdamage/libxdamage-1.1.5.recipe b/x11-libs/libxdamage/libxdamage-1.1.5.recipe
index 4858fe613..e6a7d5581 100644
--- a/x11-libs/libxdamage/libxdamage-1.1.5.recipe
+++ b/x11-libs/libxdamage/libxdamage-1.1.5.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2001, 2003 Keith Packard
 	2003 Noah Levitt
 	2007 Eric Anholt"
 LICENSE="libXdamage"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXdamage-$portVersion.tar.bz2"
 CHECKSUM_SHA256="b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45"
 SOURCE_DIR="libXdamage-$portVersion"
@@ -17,13 +17,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="1.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxdamage$secondaryArchSuffix = $portVersion
 	lib:libXdamage$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXfixes$secondaryArchSuffix
 	"
 
@@ -34,14 +36,14 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libxdamage$secondaryArchSuffix == $portVersion base
 	devel:damageproto
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXfixes$secondaryArchSuffix
 	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXfixes$secondaryArchSuffix
 	devel:util_macros
 	"
diff --git a/x11-libs/libxext/libxext-1.3.4.recipe b/x11-libs/libxext/libxext-1.3.4.recipe
index 2f92b619a..85d4f24ef 100644
--- a/x11-libs/libxext/libxext-1.3.4.recipe
+++ b/x11-libs/libxext/libxext-1.3.4.recipe
@@ -8,7 +8,7 @@ functions to aid authors of client APIs for X protocol extensions."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1986, 1987, 1988, 1989, 1994, 1998 The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/archive/individual/lib/libXext-$portVersion.tar.gz"
 CHECKSUM_SHA256="8ef0789f282826661ff40a8eef22430378516ac580167da35cc948be9041aac1"
 SOURCE_DIR="libXext-$portVersion"
@@ -19,13 +19,15 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 libVersion="6.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxext$secondaryArchSuffix = $portVersion
 	lib:libXext$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -34,7 +36,7 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxext$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:xextproto
 	"
 
@@ -42,7 +44,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:util_macros
 	devel:xorg_sgml_doctools
 	"
diff --git a/x11-libs/libxfixes/libxfixes-5.0.3.recipe b/x11-libs/libxfixes/libxfixes-5.0.3.recipe
index 6f59086dc..ff2323144 100644
--- a/x11-libs/libxfixes/libxfixes-5.0.3.recipe
+++ b/x11-libs/libxfixes/libxfixes-5.0.3.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2001-2003 Keith Packard
 	2006 Oracle and/or its affiliates
 	2011 Red Hat"
 LICENSE="libXfixes"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://www.x.org/archive/individual/lib/libXfixes-$portVersion.tar.bz2"
 CHECKSUM_SHA256="de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6"
 SOURCE_DIR="libXfixes-$portVersion"
@@ -20,13 +20,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="3.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxfixes$secondaryArchSuffix = $portVersion
 	lib:libXfixes$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -36,13 +38,13 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libxfixes$secondaryArchSuffix == $portVersion base
 	devel:fixesproto
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:util_macros
 	"
 BUILD_PREREQUIRES="
diff --git a/x11-libs/libxft/libxft-2.3.3.recipe b/x11-libs/libxft/libxft-2.3.3.recipe
index 8c92c7681..ff6b7e1a5 100644
--- a/x11-libs/libxft/libxft-2.3.3.recipe
+++ b/x11-libs/libxft/libxft-2.3.3.recipe
@@ -6,7 +6,7 @@ glyph drawing; otherwise, the core X protocol is used."
 HOMEPAGE="https://www.x.org/"
 COPYRIGHT="2000-2003 Keith Packard"
 LICENSE="libXft"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXft-$portVersion.tar.bz2"
 CHECKSUM_SHA256="225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216"
 SOURCE_DIR="libXft-$portVersion"
@@ -17,6 +17,8 @@ SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxft$secondaryArchSuffix = $portVersion
 	lib:libXft$secondaryArchSuffix = $libVersionCompat
@@ -25,7 +27,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libfontconfig$secondaryArchSuffix
 	lib:libfreetype$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXrender$secondaryArchSuffix
 	"
 
@@ -45,7 +47,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libfontconfig$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXrender$secondaryArchSuffix
 	devel:util_macros
 	"
diff --git a/x11-libs/libxi/libxi-1.7.10.recipe b/x11-libs/libxi/libxi-1.7.10.recipe
index 905ec7f3e..b14d0e85c 100644
--- a/x11-libs/libxi/libxi-1.7.10.recipe
+++ b/x11-libs/libxi/libxi-1.7.10.recipe
@@ -6,7 +6,7 @@ independently from the core devices."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1989, 1998 The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/archive/individual/lib/libXi-$portVersion.tar.bz2"
 CHECKSUM_SHA256="36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061"
 SOURCE_DIR="libXi-$portVersion"
@@ -17,13 +17,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="6.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxi$secondaryArchSuffix = $portVersion
 	lib:libXi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXext$secondaryArchSuffix
 	lib:libXfixes$secondaryArchSuffix
 	"
@@ -35,7 +37,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libxi$secondaryArchSuffix == $portVersion base
 	devel:inputproto
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXfixes$secondaryArchSuffix
 	"
@@ -44,7 +46,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXfixes$secondaryArchSuffix
 	devel:util_macros
diff --git a/x11-libs/libxinerama/libxinerama-1.1.4.recipe b/x11-libs/libxinerama/libxinerama-1.1.4.recipe
index 0a7b33a58..28b093722 100644
--- a/x11-libs/libxinerama/libxinerama-1.1.4.recipe
+++ b/x11-libs/libxinerama/libxinerama-1.1.4.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/lib/libXinerama
 	https://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="2007 Oracle"
 LICENSE="MIT (no promotion)"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://www.x.org/archive/individual/lib/libXinerama-$portVersion.tar.bz2"
 CHECKSUM_SHA256="0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720"
 SOURCE_DIR="libXinerama-$portVersion"
@@ -17,13 +17,15 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 libVersion="1.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxinerama$secondaryArchSuffix = $portVersion
 	lib:libXinerama$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXext$secondaryArchSuffix
 	"
 
@@ -33,14 +35,14 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libXinerama$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:xineramaproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:util_macros
 	"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.recipe b/x11-libs/libxkbfile/libxkbfile-1.1.0.recipe
index f32a74577..bd81cf0a0 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.recipe
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.recipe
@@ -4,7 +4,7 @@ description files for XKB, the X11 keyboard configuration extension."
 HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1994-1996 Silicon Graphics Computer Systems, Inc."
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-$portVersion.tar.bz2"
 CHECKSUM_SHA256="758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7"
 
@@ -14,13 +14,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="1.0.2"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxkbfile$secondaryArchSuffix = $portVersion
 	lib:libxkbfile$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -30,12 +32,12 @@ PROVIDES_devel="
 REQUIRES_devel="
 	libxkbfile$secondaryArchSuffix == $portVersion base
 	devel:kbproto
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:util_macros
 	"
 BUILD_PREREQUIRES="
diff --git a/x11-libs/libxrandr/libxrandr-1.5.2.recipe b/x11-libs/libxrandr/libxrandr-1.5.2.recipe
index 149d0cf94..53e84f806 100644
--- a/x11-libs/libxrandr/libxrandr-1.5.2.recipe
+++ b/x11-libs/libxrandr/libxrandr-1.5.2.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="2000, Compaq Computer Corporation.
 	2011 Dave Airlie
 	2006 Keith Packard"
 LICENSE="MIT (no promotion)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXrandr-$portVersion.tar.bz2"
 CHECKSUM_SHA256="8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023"
 SOURCE_DIR="libXrandr-$portVersion"
@@ -22,13 +22,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="2.2.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxrandr$secondaryArchSuffix = $portVersion
 	lib:libXrandr$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXext$secondaryArchSuffix
 	lib:libXrender$secondaryArchSuffix
 	"
@@ -39,7 +41,7 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxrandr$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXrender$secondaryArchSuffix
 	devel:randrproto
@@ -48,7 +50,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXrender$secondaryArchSuffix
 	devel:util_macros
diff --git a/x11-libs/libxrender/libxrender-0.9.10.recipe b/x11-libs/libxrender/libxrender-0.9.10.recipe
index e5f9dad03..c8815cc90 100644
--- a/x11-libs/libxrender/libxrender-0.9.10.recipe
+++ b/x11-libs/libxrender/libxrender-0.9.10.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://www.x.org/releases/individual/lib/"
 COPYRIGHT="2000 SuSE, Inc
 	2001-2003 Keith Packard"
 LICENSE="libXrender"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXrender-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949"
 SOURCE_DIR="libXrender-$portVersion"
@@ -16,13 +16,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="1.3.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxrender$secondaryArchSuffix = $portVersion
 	lib:libXrender$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
@@ -31,14 +33,14 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxrender$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:renderproto
 	devel:xproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:util_macros
 	"
 BUILD_PREREQUIRES="
diff --git a/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe b/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe
index 1aae75052..e29303662 100644
--- a/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe
+++ b/x11-libs/libxscrnsaver/libxscrnsaver-1.2.3.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://cgit.freedesktop.org/xorg/lib/libXScrnSaver
 COPYRIGHT="1992 X Consortium
 	2003-2012 The XFree86 Project, Inc."
 LICENSE="libXScrnSaver"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://www.x.org/releases/individual/lib/libXScrnSaver-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
 SOURCE_DIR="libXScrnSaver-$portVersion"
@@ -18,13 +18,15 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 libVersion="1.0.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxscrnsaver$secondaryArchSuffix = $portVersion
 	lib:libXss$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXext$secondaryArchSuffix
 	"
 
@@ -34,14 +36,14 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxscrnsaver$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:scrnsaverproto
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:util_macros
 	"
diff --git a/x11-libs/libxtst/libxtst-1.2.3.recipe b/x11-libs/libxtst/libxtst-1.2.3.recipe
index 00bffb258..4a25af224 100644
--- a/x11-libs/libxtst/libxtst-1.2.3.recipe
+++ b/x11-libs/libxtst/libxtst-1.2.3.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
 COPYRIGHT="1990, 1991 UniSoft Group Limited
 	1992, 1993, 1995, 1998 The Open Group"
 LICENSE="MIT (no promotion)"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://www.x.org/archive/individual/lib/libXtst-$portVersion.tar.bz2"
 CHECKSUM_SHA256="4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204"
 SOURCE_DIR="libXtst-$portVersion"
@@ -16,13 +16,15 @@ SECONDARY_ARCHITECTURES="x86"
 libVersion="6.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
+# server-interfacing: needs libX11_xcb.
+
 PROVIDES="
 	libxtst$secondaryArchSuffix = $portVersion
 	lib:libXtst$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libX11$secondaryArchSuffix
+	lib:libX11_xcb$secondaryArchSuffix
 	lib:libXext$secondaryArchSuffix
 	lib:libXi$secondaryArchSuffix
 	"
@@ -33,7 +35,7 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	libxtst$secondaryArchSuffix == $portVersion base
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXi$secondaryArchSuffix
 	devel:recordproto
@@ -44,7 +46,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
-	devel:libX11$secondaryArchSuffix
+	devel:libX11_xcb$secondaryArchSuffix
 	devel:libXext$secondaryArchSuffix
 	devel:libXi$secondaryArchSuffix
 	devel:util_macros