sync

17 files changed, 2015 insertions, 14 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index f44f0661c..431173e49 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -50,7 +87,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -97,6 +135,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -104,6 +173,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
@@ -166,6 +267,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 2e08fee94..ae03d8aa6 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -14,9 +14,46 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/intel_bufmgr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -55,7 +92,8 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -105,6 +143,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -113,6 +182,38 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/libdrm_intel.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
@@ -175,6 +276,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index cfc202f00..124870e4d 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -49,7 +86,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -96,6 +134,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -103,6 +172,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
@@ -164,6 +265,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index ea3b42a1a..b42d9bd08 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -12,6 +12,43 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/joystick-properties.h
@@ -32,7 +69,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -77,18 +115,107 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index d162c71bb..43f6b78d1 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -13,8 +13,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
@@ -30,7 +67,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -77,6 +115,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -84,11 +153,69 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 655f27616..655cb4807 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -14,9 +14,46 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/intel_bufmgr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -55,7 +92,8 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -105,6 +143,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -113,6 +182,38 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/libdrm_intel.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
@@ -175,6 +276,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index f2b6b6780..8b57dab26 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
@@ -31,7 +68,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -78,6 +116,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -85,6 +154,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
@@ -144,6 +245,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index d8cf695d8..7ee0beeef 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -13,6 +13,43 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
@@ -40,7 +77,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -85,12 +123,75 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
@@ -99,6 +200,32 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 7e4824985..06c5b7123 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -50,7 +87,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -97,6 +135,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -104,6 +173,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
@@ -166,6 +267,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 5d0f3806a..498b90dd3 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/lib/libFS.so.8.0
@@ -30,7 +67,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -77,6 +115,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -84,6 +153,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
@@ -93,6 +194,32 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index b463aa3a2..1b8c0f68a 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,4 +1,105 @@
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
@@ -56,6 +157,32 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 21861178d..404135d86 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
@@ -46,7 +83,8 @@
 ./usr/X11R6/lib/libGLw.so.5.1
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -91,6 +129,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -98,6 +167,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
@@ -159,6 +260,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc64.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc64.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc64.cache-2
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 80b7423e0..f52352ec1 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -48,7 +85,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -95,6 +133,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -102,6 +171,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
@@ -163,6 +264,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index a166d5300..97cff4427 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -50,7 +87,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -97,6 +135,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -104,6 +173,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
@@ -166,6 +267,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc64.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc64.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc64.cache-2
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index cfc202f00..124870e4d 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -14,8 +14,45 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xcb/bigreq.h
+./usr/X11R6/include/xcb/composite.h
+./usr/X11R6/include/xcb/damage.h
+./usr/X11R6/include/xcb/dpms.h
+./usr/X11R6/include/xcb/glx.h
+./usr/X11R6/include/xcb/randr.h
+./usr/X11R6/include/xcb/record.h
+./usr/X11R6/include/xcb/render.h
+./usr/X11R6/include/xcb/res.h
+./usr/X11R6/include/xcb/screensaver.h
+./usr/X11R6/include/xcb/shape.h
+./usr/X11R6/include/xcb/shm.h
+./usr/X11R6/include/xcb/sync.h
+./usr/X11R6/include/xcb/xc_misc.h
+./usr/X11R6/include/xcb/xcb.h
+./usr/X11R6/include/xcb/xcb_atom.h
+./usr/X11R6/include/xcb/xcb_aux.h
+./usr/X11R6/include/xcb/xcb_bitops.h
+./usr/X11R6/include/xcb/xcb_event.h
+./usr/X11R6/include/xcb/xcb_icccm.h
+./usr/X11R6/include/xcb/xcb_image.h
+./usr/X11R6/include/xcb/xcb_keysyms.h
+./usr/X11R6/include/xcb/xcb_pixel.h
+./usr/X11R6/include/xcb/xcb_property.h
+./usr/X11R6/include/xcb/xcb_renderutil.h
+./usr/X11R6/include/xcb/xcb_reply.h
+./usr/X11R6/include/xcb/xcbext.h
+./usr/X11R6/include/xcb/xevie.h
+./usr/X11R6/include/xcb/xf86dri.h
+./usr/X11R6/include/xcb/xfixes.h
+./usr/X11R6/include/xcb/xinerama.h
+./usr/X11R6/include/xcb/xprint.h
+./usr/X11R6/include/xcb/xproto.h
+./usr/X11R6/include/xcb/xtest.h
+./usr/X11R6/include/xcb/xv.h
+./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg/dixaccess.h
@@ -49,7 +86,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.2
+./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -96,6 +134,37 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.so.1.0
+./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
@@ -103,6 +172,38 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/x11-xcb.pc
+./usr/X11R6/lib/pkgconfig/xcb-atom.pc
+./usr/X11R6/lib/pkgconfig/xcb-aux.pc
+./usr/X11R6/lib/pkgconfig/xcb-composite.pc
+./usr/X11R6/lib/pkgconfig/xcb-damage.pc
+./usr/X11R6/lib/pkgconfig/xcb-dpms.pc
+./usr/X11R6/lib/pkgconfig/xcb-event.pc
+./usr/X11R6/lib/pkgconfig/xcb-glx.pc
+./usr/X11R6/lib/pkgconfig/xcb-icccm.pc
+./usr/X11R6/lib/pkgconfig/xcb-image.pc
+./usr/X11R6/lib/pkgconfig/xcb-keysyms.pc
+./usr/X11R6/lib/pkgconfig/xcb-property.pc
+./usr/X11R6/lib/pkgconfig/xcb-proto.pc
+./usr/X11R6/lib/pkgconfig/xcb-randr.pc
+./usr/X11R6/lib/pkgconfig/xcb-record.pc
+./usr/X11R6/lib/pkgconfig/xcb-render.pc
+./usr/X11R6/lib/pkgconfig/xcb-renderutil.pc
+./usr/X11R6/lib/pkgconfig/xcb-reply.pc
+./usr/X11R6/lib/pkgconfig/xcb-res.pc
+./usr/X11R6/lib/pkgconfig/xcb-screensaver.pc
+./usr/X11R6/lib/pkgconfig/xcb-shape.pc
+./usr/X11R6/lib/pkgconfig/xcb-shm.pc
+./usr/X11R6/lib/pkgconfig/xcb-sync.pc
+./usr/X11R6/lib/pkgconfig/xcb-xevie.pc
+./usr/X11R6/lib/pkgconfig/xcb-xf86dri.pc
+./usr/X11R6/lib/pkgconfig/xcb-xfixes.pc
+./usr/X11R6/lib/pkgconfig/xcb-xinerama.pc
+./usr/X11R6/lib/pkgconfig/xcb-xprint.pc
+./usr/X11R6/lib/pkgconfig/xcb-xtest.pc
+./usr/X11R6/lib/pkgconfig/xcb-xv.pc
+./usr/X11R6/lib/pkgconfig/xcb-xvmc.pc
+./usr/X11R6/lib/pkgconfig/xcb.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
@@ -164,6 +265,32 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/xcb/bigreq.xml
+./usr/X11R6/share/xcb/composite.xml
+./usr/X11R6/share/xcb/damage.xml
+./usr/X11R6/share/xcb/dpms.xml
+./usr/X11R6/share/xcb/glx.xml
+./usr/X11R6/share/xcb/randr.xml
+./usr/X11R6/share/xcb/record.xml
+./usr/X11R6/share/xcb/render.xml
+./usr/X11R6/share/xcb/res.xml
+./usr/X11R6/share/xcb/screensaver.xml
+./usr/X11R6/share/xcb/shape.xml
+./usr/X11R6/share/xcb/shm.xml
+./usr/X11R6/share/xcb/sync.xml
+./usr/X11R6/share/xcb/xc_misc.xml
+./usr/X11R6/share/xcb/xcb.xsd
+./usr/X11R6/share/xcb/xevie.xml
+./usr/X11R6/share/xcb/xf86dri.xml
+./usr/X11R6/share/xcb/xfixes.xml
+./usr/X11R6/share/xcb/xinerama.xml
+./usr/X11R6/share/xcb/xinput.xml
+./usr/X11R6/share/xcb/xprint.xml
+./usr/X11R6/share/xcb/xproto.xml
+./usr/X11R6/share/xcb/xselinux.xml
+./usr/X11R6/share/xcb/xtest.xml
+./usr/X11R6/share/xcb/xv.xml
+./usr/X11R6/share/xcb/xvmc.xml
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 35672a750..503d373c4 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -588,6 +588,8 @@
 ./usr/X11R6/lib/libICE.la
 ./usr/X11R6/lib/libSM.a
 ./usr/X11R6/lib/libSM.la
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11.a
 ./usr/X11R6/lib/libX11.la
 ./usr/X11R6/lib/libXRes.a
@@ -672,6 +674,99 @@
 ./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
+./usr/X11R6/lib/libpthread-stubs.a
+./usr/X11R6/lib/libpthread-stubs_p.a
+./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
+./usr/X11R6/lib/libxcb-atom_p.a
+./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
+./usr/X11R6/lib/libxcb-aux_p.a
+./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
+./usr/X11R6/lib/libxcb-composite_p.a
+./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
+./usr/X11R6/lib/libxcb-damage_p.a
+./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
+./usr/X11R6/lib/libxcb-dpms_p.a
+./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
+./usr/X11R6/lib/libxcb-event_p.a
+./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
+./usr/X11R6/lib/libxcb-glx_p.a
+./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
+./usr/X11R6/lib/libxcb-icccm_p.a
+./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
+./usr/X11R6/lib/libxcb-image_p.a
+./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
+./usr/X11R6/lib/libxcb-keysyms_p.a
+./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
+./usr/X11R6/lib/libxcb-property_p.a
+./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
+./usr/X11R6/lib/libxcb-randr_p.a
+./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
+./usr/X11R6/lib/libxcb-record_p.a
+./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
+./usr/X11R6/lib/libxcb-render-util_p.a
+./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
+./usr/X11R6/lib/libxcb-render_p.a
+./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
+./usr/X11R6/lib/libxcb-reply_p.a
+./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
+./usr/X11R6/lib/libxcb-res_p.a
+./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
+./usr/X11R6/lib/libxcb-screensaver_p.a
+./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
+./usr/X11R6/lib/libxcb-shape_p.a
+./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
+./usr/X11R6/lib/libxcb-shm_p.a
+./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
+./usr/X11R6/lib/libxcb-sync_p.a
+./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
+./usr/X11R6/lib/libxcb-xevie_p.a
+./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
+./usr/X11R6/lib/libxcb-xf86dri_p.a
+./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
+./usr/X11R6/lib/libxcb-xfixes_p.a
+./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
+./usr/X11R6/lib/libxcb-xinerama_p.a
+./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
+./usr/X11R6/lib/libxcb-xprint_p.a
+./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
+./usr/X11R6/lib/libxcb-xtest_p.a
+./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
+./usr/X11R6/lib/libxcb-xv_p.a
+./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
+./usr/X11R6/lib/libxcb-xvmc_p.a
+./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
+./usr/X11R6/lib/libxcb_p.a
+./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.a
 ./usr/X11R6/lib/libxkbfile.la
 ./usr/X11R6/lib/libxkbui.a
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 1c1eee31b..55ade286d 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -839,6 +839,7 @@
 ./usr/X11R6/lib/pkgconfig/libfs.pc
 ./usr/X11R6/lib/pkgconfig/pciaccess.pc
 ./usr/X11R6/lib/pkgconfig/printproto.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/randrproto.pc
 ./usr/X11R6/lib/pkgconfig/recordproto.pc
 ./usr/X11R6/lib/pkgconfig/renderproto.pc