diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index cc19c12de..a3cf5088b 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -119,10 +120,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 32b935853..58caa706a 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -124,10 +125,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index e4aeb9353..d928de53e 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -118,10 +119,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 54e55901f..8610aa541 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -102,10 +102,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 8a1a5deb9..3d18695a3 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -15,6 +15,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -91,10 +92,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 09c3642ba..4285a9220 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -124,10 +125,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 5b9fadb80..6f6adcd99 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -94,10 +95,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index dd3000f42..f055ad3f6 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -116,10 +117,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 33b6de721..977ff1300 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -110,10 +110,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index c8460b019..cc5f4f195 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -119,10 +120,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 7487c6241..4fb0b831a 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -91,10 +92,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 5f40d9356..a2721251c 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -116,10 +117,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index d15b0d1e3..95a200c47 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -118,10 +119,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index c57fdbc52..bfa17e3ae 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -118,10 +119,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index cbfa474b4..18a6774b7 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -119,10 +120,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index e4aeb9353..d928de53e 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -16,6 +16,7 @@
 ./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/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
@@ -118,10 +119,7 @@
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
 ./usr/X11R6/lib/libXpm.so.8.0
-./usr/X11R6/lib/libXprintAppUtil.so.1.0
-./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 76b71ea51..54d8642aa 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -618,14 +618,8 @@
 ./usr/X11R6/lib/libXmu.la
 ./usr/X11R6/lib/libXmuu.a
 ./usr/X11R6/lib/libXmuu.la
-./usr/X11R6/lib/libXp.a
-./usr/X11R6/lib/libXp.la
 ./usr/X11R6/lib/libXpm.a
 ./usr/X11R6/lib/libXpm.la
-./usr/X11R6/lib/libXprintAppUtil.a
-./usr/X11R6/lib/libXprintAppUtil.la
-./usr/X11R6/lib/libXprintUtil.a
-./usr/X11R6/lib/libXprintUtil.la
 ./usr/X11R6/lib/libXrandr.a
 ./usr/X11R6/lib/libXrandr.la
 ./usr/X11R6/lib/libXrender.a
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index a1b22b9b0..c86ec581a 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -105,8 +105,6 @@
 ./usr/X11R6/include/X11/Xaw/PannerP.h
 ./usr/X11R6/include/X11/Xaw/Porthole.h
 ./usr/X11R6/include/X11/Xaw/PortholeP.h
-./usr/X11R6/include/X11/Xaw/Print.h
-./usr/X11R6/include/X11/Xaw/PrintSP.h
 ./usr/X11R6/include/X11/Xaw/Repeater.h
 ./usr/X11R6/include/X11/Xaw/RepeaterP.h
 ./usr/X11R6/include/X11/Xaw/Reports.h
@@ -186,10 +184,6 @@
 ./usr/X11R6/include/X11/Xos_r.h
 ./usr/X11R6/include/X11/Xosdefs.h
 ./usr/X11R6/include/X11/Xpoll.h
-./usr/X11R6/include/X11/XprintAppUtil
-./usr/X11R6/include/X11/XprintAppUtil/xpapputil.h
-./usr/X11R6/include/X11/XprintUtil
-./usr/X11R6/include/X11/XprintUtil/xprintutil.h
 ./usr/X11R6/include/X11/Xproto.h
 ./usr/X11R6/include/X11/Xprotostr.h
 ./usr/X11R6/include/X11/Xregion.h
@@ -304,8 +298,6 @@
 ./usr/X11R6/include/X11/cursorfont.h
 ./usr/X11R6/include/X11/extensions
 ./usr/X11R6/include/X11/extensions/MITMisc.h
-./usr/X11R6/include/X11/extensions/Print.h
-./usr/X11R6/include/X11/extensions/Printstr.h
 ./usr/X11R6/include/X11/extensions/XEVI.h
 ./usr/X11R6/include/X11/extensions/XEVIstr.h
 ./usr/X11R6/include/X11/extensions/XI.h
@@ -826,7 +818,6 @@
 ./usr/X11R6/lib/pkgconfig/kbproto.pc
 ./usr/X11R6/lib/pkgconfig/libfs.pc
 ./usr/X11R6/lib/pkgconfig/pciaccess.pc
-./usr/X11R6/lib/pkgconfig/printproto.pc
 ./usr/X11R6/lib/pkgconfig/randrproto.pc
 ./usr/X11R6/lib/pkgconfig/recordproto.pc
 ./usr/X11R6/lib/pkgconfig/renderproto.pc
@@ -861,10 +852,7 @@
 ./usr/X11R6/lib/pkgconfig/xmu.pc
 ./usr/X11R6/lib/pkgconfig/xmuu.pc
 ./usr/X11R6/lib/pkgconfig/xorg-macros.pc
-./usr/X11R6/lib/pkgconfig/xp.pc
 ./usr/X11R6/lib/pkgconfig/xpm.pc
-./usr/X11R6/lib/pkgconfig/xprintapputil.pc
-./usr/X11R6/lib/pkgconfig/xprintutil.pc
 ./usr/X11R6/lib/pkgconfig/xproto.pc
 ./usr/X11R6/lib/pkgconfig/xproxymngproto.pc
 ./usr/X11R6/lib/pkgconfig/xrandr.pc
@@ -2185,39 +2173,6 @@
 ./usr/X11R6/man/man3/XmbufGetVersion.3
 ./usr/X11R6/man/man3/XmbufGetWindowAttributes.3
 ./usr/X11R6/man/man3/XmbufQueryExtension.3
-./usr/X11R6/man/man3/XpCancelDoc.3
-./usr/X11R6/man/man3/XpCancelJob.3
-./usr/X11R6/man/man3/XpCancelPage.3
-./usr/X11R6/man/man3/XpCreateContext.3
-./usr/X11R6/man/man3/XpDestroyContext.3
-./usr/X11R6/man/man3/XpEndDoc.3
-./usr/X11R6/man/man3/XpEndJob.3
-./usr/X11R6/man/man3/XpEndPage.3
-./usr/X11R6/man/man3/XpFreePrinterList.3
-./usr/X11R6/man/man3/XpGetAttributes.3
-./usr/X11R6/man/man3/XpGetContext.3
-./usr/X11R6/man/man3/XpGetDocumentData.3
-./usr/X11R6/man/man3/XpGetImageResolution.3
-./usr/X11R6/man/man3/XpGetLocaleHinter.3
-./usr/X11R6/man/man3/XpGetOneAttribute.3
-./usr/X11R6/man/man3/XpGetPageDimensions.3
-./usr/X11R6/man/man3/XpGetPdmStartParams.3
-./usr/X11R6/man/man3/XpGetPrinterList.3
-./usr/X11R6/man/man3/XpGetScreenOfContext.3
-./usr/X11R6/man/man3/XpInputSelected.3
-./usr/X11R6/man/man3/XpPutDocumentData.3
-./usr/X11R6/man/man3/XpQueryExtension.3
-./usr/X11R6/man/man3/XpQueryScreens.3
-./usr/X11R6/man/man3/XpQueryVersion.3
-./usr/X11R6/man/man3/XpRehashPrinterList.3
-./usr/X11R6/man/man3/XpSelectInput.3
-./usr/X11R6/man/man3/XpSetAttributes.3
-./usr/X11R6/man/man3/XpSetContext.3
-./usr/X11R6/man/man3/XpSetImageResolution.3
-./usr/X11R6/man/man3/XpSetLocaleHinter.3
-./usr/X11R6/man/man3/XpStartDoc.3
-./usr/X11R6/man/man3/XpStartJob.3
-./usr/X11R6/man/man3/XpStartPage.3
 ./usr/X11R6/man/man3/Xrandr.3
 ./usr/X11R6/man/man3/XrmCombineDatabase.3
 ./usr/X11R6/man/man3/XrmCombineFileDatabase.3
@@ -2564,7 +2519,6 @@
 ./usr/X11R6/man/man3/XwcTextListToTextProperty.3
 ./usr/X11R6/man/man3/XwcTextPerCharExtents.3
 ./usr/X11R6/man/man3/XwcTextPropertyToTextList.3
-./usr/X11R6/man/man3/libXp.3
 ./usr/X11R6/man/man5/fonts-conf.5
 ./usr/X11R6/man/man7/Consortium.7
 ./usr/X11R6/man/man7/Standards.7