sync

12 files changed, 96 insertions, 107 deletions

diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 95591c457..dd14ac345 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -16,11 +16,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -72,6 +71,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -86,7 +87,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -100,6 +100,7 @@
 ./usr/X11R6/include/xorg/swapreq.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/synaptics.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -111,7 +112,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -242,8 +242,6 @@
 ./usr/X11R6/lib/modules/extensions/librecord.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/citron_drv.la
-./usr/X11R6/lib/modules/input/citron_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -290,8 +288,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -331,7 +327,6 @@
 ./usr/X11R6/man/man4/ati.4
 ./usr/X11R6/man/man4/chips.4
 ./usr/X11R6/man/man4/cirrus.4
-./usr/X11R6/man/man4/citron.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -370,8 +365,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index eadf14fb4..cf9644738 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -10,11 +10,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -66,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -80,7 +81,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -92,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -103,7 +104,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -182,8 +182,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -217,8 +215,10 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index bc3afff1d..e43e025f3 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -11,11 +11,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -79,6 +78,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -113,6 +114,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -127,7 +129,6 @@
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -219,8 +220,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -310,7 +309,9 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 05428d761..d7c900e87 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -16,11 +16,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -72,6 +71,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -86,7 +87,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -100,6 +100,7 @@
 ./usr/X11R6/include/xorg/swapreq.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/synaptics.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -111,7 +112,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -248,8 +248,6 @@
 ./usr/X11R6/lib/modules/extensions/librecord.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/citron_drv.la
-./usr/X11R6/lib/modules/input/citron_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -296,8 +294,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -337,7 +333,6 @@
 ./usr/X11R6/man/man4/ati.4
 ./usr/X11R6/man/man4/chips.4
 ./usr/X11R6/man/man4/cirrus.4
-./usr/X11R6/man/man4/citron.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -378,8 +373,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index 9f02fa014..14abf55a1 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -9,11 +9,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -65,6 +64,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -79,7 +80,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -91,6 +91,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -102,7 +103,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -179,8 +179,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -213,8 +211,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index f80bba686..524398ea8 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -7,11 +7,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -63,6 +62,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -77,7 +78,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -89,6 +89,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -100,7 +101,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -168,8 +168,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -251,8 +249,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index 81aabd533..120db084b 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -10,11 +10,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -66,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -80,7 +81,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -92,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -103,7 +104,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -164,8 +164,6 @@
 ./usr/X11R6/lib/modules/extensions/librecord.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/citron_drv.la
-./usr/X11R6/lib/modules/input/citron_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -208,8 +206,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -240,7 +236,6 @@
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/citron.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -260,8 +255,10 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index e54aaeb7b..43e082797 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -7,11 +7,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -63,6 +62,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -77,7 +78,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -89,6 +89,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -100,7 +101,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -177,8 +177,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -209,8 +207,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 2341e5164..650815de7 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -10,11 +10,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -66,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -80,7 +81,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -92,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -103,7 +104,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -180,8 +180,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -214,8 +212,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index d2659a49d..3f4ef6834 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -8,11 +8,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -64,6 +63,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -78,7 +79,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -90,6 +90,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -101,7 +102,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -178,8 +178,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -210,8 +208,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 3a850404c..d654e42a4 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -10,11 +10,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -66,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -80,7 +81,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -92,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -103,7 +104,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -166,8 +166,6 @@
 ./usr/X11R6/lib/modules/extensions/librecord.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/citron_drv.la
-./usr/X11R6/lib/modules/input/citron_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -210,8 +208,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -242,7 +238,6 @@
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/citron.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -263,8 +258,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 2341e5164..650815de7 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -10,11 +10,10 @@
 ./usr/X11R6/include/xorg/IBM.h
 ./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/bstore.h
-./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/bt829.h
 ./usr/X11R6/include/xorg/callback.h
-./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/client.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
 ./usr/X11R6/include/xorg/colormap.h
@@ -66,6 +65,8 @@
 ./usr/X11R6/include/xorg/miscstruct.h
 ./usr/X11R6/include/xorg/mispans.h
 ./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/misync.h
+./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
@@ -80,7 +81,6 @@
 ./usr/X11R6/include/xorg/randrstr.h
 ./usr/X11R6/include/xorg/region.h
 ./usr/X11R6/include/xorg/regionstr.h
-./usr/X11R6/include/xorg/renderedge.h
 ./usr/X11R6/include/xorg/resource.h
 ./usr/X11R6/include/xorg/rgb.h
 ./usr/X11R6/include/xorg/screenint.h
@@ -92,6 +92,7 @@
 ./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/swaprep.h
 ./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/tda8425.h
 ./usr/X11R6/include/xorg/tda9850.h
 ./usr/X11R6/include/xorg/tda9885.h
@@ -103,7 +104,6 @@
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
 ./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaaWrapper.h
 ./usr/X11R6/include/xorg/xaalocal.h
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
@@ -180,8 +180,6 @@
 ./usr/X11R6/lib/modules/libwfb.so
 ./usr/X11R6/lib/modules/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf8_16bpp.la
-./usr/X11R6/lib/modules/libxf8_16bpp.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -214,8 +212,10 @@
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
-./usr/X11R6/share/doc/xorg-server
+./usr/X11R6/share/X11/xorg.conf.d
+./usr/X11R6/share/X11/xorg.conf.d/50-fpit.conf
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log