sync (xserver and freetype)

14 files changed, 30 insertions, 46 deletions

diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 5bb55381f..d12d1656d 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -110,6 +110,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -164,6 +165,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -195,15 +197,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./usr/X11R6/include/xorg/site.h
-./usr/X11R6/include/xorg/swaprep.h
-./usr/X11R6/include/xorg/swapreq.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -242,7 +241,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 01bf7690c..b2e7fcd84 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -89,6 +89,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -148,6 +149,7 @@
 ./usr/X11R6/include/xorg/miwideline.h
 ./usr/X11R6/include/xorg/mizerarc.h
 ./usr/X11R6/include/xorg/msp3430.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -179,8 +181,6 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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
@@ -190,7 +190,6 @@
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -229,7 +228,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index b9a85b107..e4dd8def3 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -88,6 +88,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -141,6 +142,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -172,14 +174,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -218,7 +218,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index f3b2ce66a..98a508456 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -87,6 +87,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -140,6 +141,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -171,14 +173,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -217,7 +217,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 62a403ab8..b3746e501 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -110,6 +110,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -164,6 +165,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -195,15 +197,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./usr/X11R6/include/xorg/site.h
-./usr/X11R6/include/xorg/swaprep.h
-./usr/X11R6/include/xorg/swapreq.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -242,7 +241,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index e449bc9f5..fde9223ed 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -158,6 +159,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -189,14 +191,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -235,7 +235,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 00e2a708b..8fce82398 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -22,6 +22,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -75,6 +76,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -106,14 +108,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -152,7 +152,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index c659d28b1..110ef888e 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -159,6 +160,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -190,14 +192,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -236,7 +236,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 22d6ebcd4..15808e0ec 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -158,6 +159,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -189,14 +191,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -235,7 +235,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 74cfbe017..759ba8676 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -158,6 +159,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -189,14 +191,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -235,7 +235,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 98bb26ef1..6f30e2c88 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -88,6 +88,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -141,6 +142,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -172,14 +174,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -218,7 +218,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index e1a11c290..eba78c129 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -105,6 +105,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -159,6 +160,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -190,14 +192,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -236,7 +236,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index b9a85b107..e4dd8def3 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -88,6 +88,7 @@
 ./usr/X11R6/include/xorg/damagestr.h
 ./usr/X11R6/include/xorg/dbestruct.h
 ./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/displaymode.h
 ./usr/X11R6/include/xorg/dix.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dixevents.h
@@ -141,6 +142,7 @@
 ./usr/X11R6/include/xorg/misyncshm.h
 ./usr/X11R6/include/xorg/misyncstr.h
 ./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/nonsdk_extinit.h
 ./usr/X11R6/include/xorg/opaque.h
 ./usr/X11R6/include/xorg/optionstr.h
 ./usr/X11R6/include/xorg/os.h
@@ -172,14 +174,12 @@
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
 ./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/validate.h
 ./usr/X11R6/include/xorg/vbe.h
 ./usr/X11R6/include/xorg/vbeModes.h
 ./usr/X11R6/include/xorg/vgaHW.h
-./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/window.h
 ./usr/X11R6/include/xorg/windowstr.h
@@ -218,7 +218,6 @@
 ./usr/X11R6/include/xorg/xf86xv.h
 ./usr/X11R6/include/xorg/xf86xvmc.h
 ./usr/X11R6/include/xorg/xf86xvpriv.h
-./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xisb.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index c95c6f887..a6be34ed4 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -260,13 +260,13 @@
 ./usr/X11R6/lib/libXfixes.so.6.0
 ./usr/X11R6/lib/libXfont.a
 ./usr/X11R6/lib/libXfont.la
-./usr/X11R6/lib/libXfont.so.12.0
+./usr/X11R6/lib/libXfont.so.13.0
 ./usr/X11R6/lib/libXfontcache.a
 ./usr/X11R6/lib/libXfontcache.la
 ./usr/X11R6/lib/libXfontcache.so.5.0
 ./usr/X11R6/lib/libXft.a
 ./usr/X11R6/lib/libXft.la
-./usr/X11R6/lib/libXft.so.9.0
+./usr/X11R6/lib/libXft.so.10.0
 ./usr/X11R6/lib/libXi.a
 ./usr/X11R6/lib/libXi.la
 ./usr/X11R6/lib/libXi.so.12.1
@@ -320,12 +320,12 @@
 ./usr/X11R6/lib/libdmx.so.2.0
 ./usr/X11R6/lib/libfontconfig.a
 ./usr/X11R6/lib/libfontconfig.la
-./usr/X11R6/lib/libfontconfig.so.9.1
+./usr/X11R6/lib/libfontconfig.so.10.0
 ./usr/X11R6/lib/libfontenc.a
 ./usr/X11R6/lib/libfontenc.la
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.a
-./usr/X11R6/lib/libfreetype.so.24.1
+./usr/X11R6/lib/libfreetype.so.25.0
 ./usr/X11R6/lib/libpciaccess.a
 ./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpciaccess.so.2.0