262 files changed, 53 insertions, 143 deletions

diff --git a/Makefile.am b/Makefile.am
index 773e7690f..c425cc6bb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,6 @@ if GLX
 GLX_DIR=GL
 endif
 
-if XPRINT
-XPDDX_DIR=Xprint
-XPCONFIG_DIR=XpConfig
-endif
-
 if XINPUT
 XINPUT_DIR=Xi
 endif
@@ -64,9 +59,7 @@ SUBDIRS = \
 	$(COMPOSITE_DIR) \
 	$(GLX_DIR) \
 	exa \
-	hw \
-	$(XPDDX_DIR) \
-	$(XPCONFIG_DIR)
+	hw
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = xorg-server.m4
@@ -101,9 +94,7 @@ DIST_SUBDIRS = \
 	composite \
 	GL \
 	exa \
-	hw \
-	Xprint \
-	XpConfig
+	hw
 
 # gross hack
 relink: all
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 60512d372..9a4f2653e 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -85,8 +85,8 @@ copyright holders.
 #include <X11/Xatom.h>
 #include <X11/extensions/Print.h>
 #include <X11/extensions/Printstr.h>
-#include "../Xprint/DiPrint.h"
-#include "../Xprint/attributes.h"
+#include "../hw/xprint/DiPrint.h"
+#include "../hw/xprint/attributes.h"
 #include "modinit.h"
 
 static void XpResetProc(ExtensionEntry *);
diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c
deleted file mode 100644
index 9449dfdd6..000000000
--- a/Xprint/pcl/PclPixmap.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */
-/*******************************************************************
-**
-**    *********************************************************
-**    *
-**    *  File:		PclPixmap.c
-**    *
-**    *  Contents:
-**    *                 Pixmap handling code for the PCL DDX driver
-**    *
-**    *  Created:	2/19/96
-**    *
-**    *********************************************************
-** 
-********************************************************************/
-/*
-(c) Copyright 1996 Hewlett-Packard Company
-(c) Copyright 1996 International Business Machines Corp.
-(c) Copyright 1996 Sun Microsystems, Inc.
-(c) Copyright 1996 Novell, Inc.
-(c) Copyright 1996 Digital Equipment Corp.
-(c) Copyright 1996 Fujitsu Limited
-(c) Copyright 1996 Hitachi, Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the names of the copyright holders shall
-not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from said
-copyright holders.
-*/
-/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "Pcl.h"
-#include "cfb.h"
-#include "cfb32.h"
-#include "mfb.h"
-#include "pixmapstr.h"
-
-PixmapPtr
-PclCreatePixmap(ScreenPtr pScreen,
-		int width,
-		int height,
-		int depth)
-{
-    if( depth == 1 )
-      return mfbCreatePixmap( pScreen, width, height, depth );
-    else if( depth <= 8 )
-      return cfbCreatePixmap( pScreen, width, height, depth );
-    else if( depth <= 32 )
-      return cfb32CreatePixmap( pScreen, width, height, depth );
-    return 0;
-}
-
-
-Bool
-PclDestroyPixmap(PixmapPtr pPixmap)
-{
-    if( pPixmap->drawable.depth == 1 )
-      return mfbDestroyPixmap( pPixmap );
-    else if( pPixmap->drawable.depth <= 8 )
-      return cfbDestroyPixmap( pPixmap );
-    else if( pPixmap->drawable.depth <= 32 )
-      return cfb32DestroyPixmap( pPixmap );
-    return 0;
-}
diff --git a/configure.ac b/configure.ac
index f4503e7e3..5a93b1319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1727,41 +1727,41 @@ hw/kdrive/smi/Makefile
 hw/kdrive/src/Makefile
 hw/kdrive/vesa/Makefile
 hw/kdrive/via/Makefile
-Xprint/Makefile
-Xprint/doc/Makefile
-Xprint/pcl/Makefile
-Xprint/pcl-mono/Makefile
-Xprint/raster/Makefile
-Xprint/ps/Makefile
-Xprint/etc/Makefile
-Xprint/etc/Xsession.d/Makefile
-Xprint/etc/init.d/Makefile
-Xprint/etc/profile.d/Makefile
-XpConfig/Makefile
-XpConfig/C/print/attributes/Makefile
-XpConfig/C/print/ddx-config/Makefile
-XpConfig/C/print/ddx-config/raster/Makefile
-XpConfig/C/print/models/CANONBJ10E-GS/Makefile
-XpConfig/C/print/models/PSdefault/fonts/Makefile
-XpConfig/C/print/models/PSdefault/Makefile
-XpConfig/C/print/models/PSspooldir/Makefile
-XpConfig/C/print/models/SPSPARC2/Makefile
-XpConfig/C/print/models/SPSPARC2/fonts/Makefile
-XpConfig/C/print/models/GSdefault/Makefile
-XpConfig/C/print/models/HPLJ4050-PS/Makefile
-XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile
-XpConfig/C/print/models/Makefile
-XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile
-XpConfig/C/print/models/CANONC3200-PS/Makefile
-XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile
-XpConfig/C/print/models/HPLJ4family/fonts/Makefile
-XpConfig/C/print/models/HPLJ4family/Makefile
-XpConfig/C/print/models/HPDJ1600C/Makefile
-XpConfig/C/print/models/HPDJ1600C/fonts/Makefile
-XpConfig/C/print/Makefile
-XpConfig/C/Makefile
-XpConfig/en_US/print/attributes/Makefile
-XpConfig/en_US/print/Makefile
-XpConfig/en_US/Makefile
+hw/xprint/Makefile
+hw/xprint/doc/Makefile
+hw/xprint/pcl/Makefile
+hw/xprint/pcl-mono/Makefile
+hw/xprint/raster/Makefile
+hw/xprint/ps/Makefile
+hw/xprint/etc/Makefile
+hw/xprint/etc/Xsession.d/Makefile
+hw/xprint/etc/init.d/Makefile
+hw/xprint/etc/profile.d/Makefile
+hw/xprint/config/Makefile
+hw/xprint/config/C/print/attributes/Makefile
+hw/xprint/config/C/print/ddx-config/Makefile
+hw/xprint/config/C/print/ddx-config/raster/Makefile
+hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile
+hw/xprint/config/C/print/models/PSdefault/fonts/Makefile
+hw/xprint/config/C/print/models/PSdefault/Makefile
+hw/xprint/config/C/print/models/PSspooldir/Makefile
+hw/xprint/config/C/print/models/SPSPARC2/Makefile
+hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile
+hw/xprint/config/C/print/models/GSdefault/Makefile
+hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile
+hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile
+hw/xprint/config/C/print/models/Makefile
+hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile
+hw/xprint/config/C/print/models/CANONC3200-PS/Makefile
+hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile
+hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile
+hw/xprint/config/C/print/models/HPLJ4family/Makefile
+hw/xprint/config/C/print/models/HPDJ1600C/Makefile
+hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile
+hw/xprint/config/C/print/Makefile
+hw/xprint/config/C/Makefile
+hw/xprint/config/en_US/print/attributes/Makefile
+hw/xprint/config/en_US/print/Makefile
+hw/xprint/config/en_US/Makefile
 xorg-server.pc
 ])
diff --git a/hw/Makefile.am b/hw/Makefile.am
index 4c35a5817..d00d6fb3f 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -26,6 +26,10 @@ if KDRIVE
 KDRIVE_SUBDIRS = kdrive
 endif
 
+if XPRINT
+XPRINT_SUBDIRS = xprint
+endif
+
 # need to add darwin support here
 
 SUBDIRS =			\
@@ -35,9 +39,10 @@ SUBDIRS =			\
 	$(XVFB_SUBDIRS)		\
 	$(XNEST_SUBDIRS)	\
 	$(DMX_SUBDIRS)          \
-        $(KDRIVE_SUBDIRS)
+        $(KDRIVE_SUBDIRS)	\
+	$(XPRINT_SUBDIRS)
 
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
 
 relink:
 	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
diff --git a/Xprint/AttrValid.c b/hw/xprint/AttrValid.c
index cf9476003..cf9476003 100644
--- a/Xprint/AttrValid.c
+++ b/hw/xprint/AttrValid.c
diff --git a/Xprint/AttrValid.h b/hw/xprint/AttrValid.h
index fab3a7f5e..fab3a7f5e 100644
--- a/Xprint/AttrValid.h
+++ b/hw/xprint/AttrValid.h
diff --git a/Xprint/DiPrint.h b/hw/xprint/DiPrint.h
index a26477971..a26477971 100644
--- a/Xprint/DiPrint.h
+++ b/hw/xprint/DiPrint.h
diff --git a/Xprint/Init.c b/hw/xprint/Init.c
index 0f1be6791..0f1be6791 100644
--- a/Xprint/Init.c
+++ b/hw/xprint/Init.c
diff --git a/Xprint/Makefile.am b/hw/xprint/Makefile.am
index d2a26d641..46647a519 100644
--- a/Xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc pcl pcl-mono raster ps etc
+SUBDIRS = doc pcl pcl-mono raster ps etc config
 
 bin_PROGRAMS = Xprt
 
@@ -9,8 +9,8 @@ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 
 Xprt_LDFLAGS = -L$(top_srcdir)
 Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
-	pcl/libpcl.la pcl-mono/libpcl.la ../fb/libfb.la \
-	../render/librender.la ../mi/libmi.la ../Xext/libXext.la \
+	pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \
+	../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \
 	@FREETYPE_LIBS@
 
 miinitext-wrapper.c:
diff --git a/Xprint/Oid.c b/hw/xprint/Oid.c
index e4dadd519..e4dadd519 100644
--- a/Xprint/Oid.c
+++ b/hw/xprint/Oid.c
diff --git a/Xprint/Oid.h b/hw/xprint/Oid.h
index fc9f12a5b..fc9f12a5b 100644
--- a/Xprint/Oid.h
+++ b/hw/xprint/Oid.h
diff --git a/Xprint/OidDefs.h b/hw/xprint/OidDefs.h
index 55b6568f0..55b6568f0 100644
--- a/Xprint/OidDefs.h
+++ b/hw/xprint/OidDefs.h
diff --git a/Xprint/OidStrs.h b/hw/xprint/OidStrs.h
index 1792a6e16..1792a6e16 100644
--- a/Xprint/OidStrs.h
+++ b/hw/xprint/OidStrs.h
diff --git a/Xprint/Util.c b/hw/xprint/Util.c
index 12a2562a4..12a2562a4 100644
--- a/Xprint/Util.c
+++ b/hw/xprint/Util.c
diff --git a/Xprint/ValTree.c b/hw/xprint/ValTree.c
index 6fa631617..6fa631617 100644
--- a/Xprint/ValTree.c
+++ b/hw/xprint/ValTree.c
diff --git a/Xprint/attributes.c b/hw/xprint/attributes.c
index 8e4c811cb..8e4c811cb 100644
--- a/Xprint/attributes.c
+++ b/hw/xprint/attributes.c
diff --git a/Xprint/attributes.h b/hw/xprint/attributes.h
index 40df4fd0b..40df4fd0b 100644
--- a/Xprint/attributes.h
+++ b/hw/xprint/attributes.h
diff --git a/XpConfig/C/Makefile.am b/hw/xprint/config/C/Makefile.am
index 0390ed2d4..0390ed2d4 100644
--- a/XpConfig/C/Makefile.am
+++ b/hw/xprint/config/C/Makefile.am
diff --git a/XpConfig/C/print/Makefile.am b/hw/xprint/config/C/print/Makefile.am
index e3c01da60..e3c01da60 100644
--- a/XpConfig/C/print/Makefile.am
+++ b/hw/xprint/config/C/print/Makefile.am
diff --git a/XpConfig/C/print/Xprinters b/hw/xprint/config/C/print/Xprinters
index a32c02dc2..a32c02dc2 100644
--- a/XpConfig/C/print/Xprinters
+++ b/hw/xprint/config/C/print/Xprinters
diff --git a/XpConfig/C/print/attributes/Makefile.am b/hw/xprint/config/C/print/attributes/Makefile.am
index 0d2cceaff..0d2cceaff 100644
--- a/XpConfig/C/print/attributes/Makefile.am
+++ b/hw/xprint/config/C/print/attributes/Makefile.am
diff --git a/XpConfig/C/print/attributes/document b/hw/xprint/config/C/print/attributes/document
index b1651bd94..b1651bd94 100644
--- a/XpConfig/C/print/attributes/document
+++ b/hw/xprint/config/C/print/attributes/document
diff --git a/XpConfig/C/print/attributes/job b/hw/xprint/config/C/print/attributes/job
index aa1911dcd..aa1911dcd 100644
--- a/XpConfig/C/print/attributes/job
+++ b/hw/xprint/config/C/print/attributes/job
diff --git a/XpConfig/C/print/attributes/printer b/hw/xprint/config/C/print/attributes/printer
index 41e13b44b..41e13b44b 100644
--- a/XpConfig/C/print/attributes/printer
+++ b/hw/xprint/config/C/print/attributes/printer
diff --git a/XpConfig/C/print/ddx-config/Makefile.am b/hw/xprint/config/C/print/ddx-config/Makefile.am
index 907edca75..907edca75 100644
--- a/XpConfig/C/print/ddx-config/Makefile.am
+++ b/hw/xprint/config/C/print/ddx-config/Makefile.am
diff --git a/XpConfig/C/print/ddx-config/raster/Makefile.am b/hw/xprint/config/C/print/ddx-config/raster/Makefile.am
index 79bfb59df..79bfb59df 100644
--- a/XpConfig/C/print/ddx-config/raster/Makefile.am
+++ b/hw/xprint/config/C/print/ddx-config/raster/Makefile.am
diff --git a/XpConfig/C/print/ddx-config/raster/pcl b/hw/xprint/config/C/print/ddx-config/raster/pcl
index 15d33e7b3..15d33e7b3 100644
--- a/XpConfig/C/print/ddx-config/raster/pcl
+++ b/hw/xprint/config/C/print/ddx-config/raster/pcl
diff --git a/XpConfig/C/print/ddx-config/raster/postscript b/hw/xprint/config/C/print/ddx-config/raster/postscript
index e69de29bb..e69de29bb 100644
--- a/XpConfig/C/print/ddx-config/raster/postscript
+++ b/hw/xprint/config/C/print/ddx-config/raster/postscript
diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am b/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am
index 951b9af97..951b9af97 100644
--- a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am
diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/model-config b/hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config
index 97bfd8196..97bfd8196 100644
--- a/XpConfig/C/print/models/CANONBJ10E-GS/model-config
+++ b/hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config
diff --git a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am
index 771b40864..771b40864 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am
diff --git a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
index 5be5419ba..5be5419ba 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/CANONC3200-PS/model-config b/hw/xprint/config/C/print/models/CANONC3200-PS/model-config
index cdb3f4958..cdb3f4958 100644
--- a/XpConfig/C/print/models/CANONC3200-PS/model-config
+++ b/hw/xprint/config/C/print/models/CANONC3200-PS/model-config
diff --git a/XpConfig/C/print/models/GSdefault/Makefile.am b/hw/xprint/config/C/print/models/GSdefault/Makefile.am
index be0426c76..be0426c76 100644
--- a/XpConfig/C/print/models/GSdefault/Makefile.am
+++ b/hw/xprint/config/C/print/models/GSdefault/Makefile.am
diff --git a/XpConfig/C/print/models/GSdefault/model-config b/hw/xprint/config/C/print/models/GSdefault/model-config
index 61dac18b8..61dac18b8 100644
--- a/XpConfig/C/print/models/GSdefault/model-config
+++ b/hw/xprint/config/C/print/models/GSdefault/model-config
diff --git a/XpConfig/C/print/models/HPDJ1600C/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am
index 1c8b3b5c6..1c8b3b5c6 100644
--- a/XpConfig/C/print/models/HPDJ1600C/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
index 09cc489a5..09cc489a5 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
index b21a9a2a8..b21a9a2a8 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
index 485b874c5..485b874c5 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
index 524934c71..524934c71 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
index 2ef9bc52c..2ef9bc52c 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
index 3d69311ef..3d69311ef 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
index 3833d4f54..3833d4f54 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
index 289a95e5c..289a95e5c 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
index a5984bed1..a5984bed1 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
index df27cd71e..df27cd71e 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
index fb2b5a433..fb2b5a433 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
index f0e58c435..f0e58c435 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
index 8821ff155..8821ff155 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
index e5980fc0e..e5980fc0e 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
index d9a151d7f..d9a151d7f 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
index d14fca56f..d14fca56f 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
index 7a341506f..7a341506f 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
index c20e39a21..c20e39a21 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
index 4a4a35281..4a4a35281 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
index 8d97d4339..8d97d4339 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
index 19844c9c6..19844c9c6 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
index 5415c3f44..5415c3f44 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
index 038dfdb46..038dfdb46 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
index 382a78575..382a78575 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
index 1c7edf653..1c7edf653 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
index 2f077f40f..2f077f40f 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
index 1ce190d51..1ce190d51 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
index 45d6906ba..45d6906ba 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
index b991b5edb..b991b5edb 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
index 1935a9f00..1935a9f00 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
index 2000dc057..2000dc057 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
index 90f0e45a8..90f0e45a8 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
index 52ba39b96..52ba39b96 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
index f5c9053af..f5c9053af 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
index b7586ca61..b7586ca61 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
index 82f054999..82f054999 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
index 591c96b59..591c96b59 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
index c8160954a..c8160954a 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
index 895cfe26a..895cfe26a 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
index 3bdcae4ba..3bdcae4ba 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
index a56d47504..a56d47504 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
index c85f3b4de..c85f3b4de 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
index 875bf1df8..875bf1df8 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am
index b32079e1d..b32079e1d 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/README b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/README
index cccc2be32..cccc2be32 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/README
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/README
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias
index e69de29bb..e69de29bb 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir
index da702ccc1..da702ccc1 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir
diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf
index 483748893..483748893 100644
--- a/XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf
diff --git a/XpConfig/C/print/models/HPDJ1600C/model-config b/hw/xprint/config/C/print/models/HPDJ1600C/model-config
index 5d45d4495..5d45d4495 100644
--- a/XpConfig/C/print/models/HPDJ1600C/model-config
+++ b/hw/xprint/config/C/print/models/HPDJ1600C/model-config
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am
index b8cdfa6c4..b8cdfa6c4 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
index 2ff9ab7e7..2ff9ab7e7 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/HPLJ4050-PS/model-config b/hw/xprint/config/C/print/models/HPLJ4050-PS/model-config
index 159206de2..159206de2 100644
--- a/XpConfig/C/print/models/HPLJ4050-PS/model-config
+++ b/hw/xprint/config/C/print/models/HPLJ4050-PS/model-config
diff --git a/XpConfig/C/print/models/HPLJ4family/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/Makefile.am
index 2089737a9..2089737a9 100644
--- a/XpConfig/C/print/models/HPLJ4family/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4family/Makefile.am
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf
index 09cc489a5..09cc489a5 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf
index b21a9a2a8..b21a9a2a8 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf
index 485b874c5..485b874c5 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf
index 524934c71..524934c71 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf
index 2ef9bc52c..2ef9bc52c 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf
index 3d69311ef..3d69311ef 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf
index 3833d4f54..3833d4f54 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf
index 289a95e5c..289a95e5c 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf
index a5984bed1..a5984bed1 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf
index df27cd71e..df27cd71e 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf
index fb2b5a433..fb2b5a433 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf
index f0e58c435..f0e58c435 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf
index 8821ff155..8821ff155 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf
index e5980fc0e..e5980fc0e 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf
index d9a151d7f..d9a151d7f 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf
index d14fca56f..d14fca56f 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf
index 7a341506f..7a341506f 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf
index c20e39a21..c20e39a21 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf
index 4a4a35281..4a4a35281 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf
index 8d97d4339..8d97d4339 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf
index 19844c9c6..19844c9c6 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf
index 5415c3f44..5415c3f44 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf
index 038dfdb46..038dfdb46 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf
index 382a78575..382a78575 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf
index 1c7edf653..1c7edf653 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf
index 2f077f40f..2f077f40f 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf
index 1ce190d51..1ce190d51 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf
index 45d6906ba..45d6906ba 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf
index b991b5edb..b991b5edb 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf
index 1935a9f00..1935a9f00 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf
index 2000dc057..2000dc057 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf
index 90f0e45a8..90f0e45a8 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf
index 52ba39b96..52ba39b96 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf
index f5c9053af..f5c9053af 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf
index b7586ca61..b7586ca61 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf
index 82f054999..82f054999 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf
index 591c96b59..591c96b59 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf
index c8160954a..c8160954a 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf
index 895cfe26a..895cfe26a 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf
index 3bdcae4ba..3bdcae4ba 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf
index a56d47504..a56d47504 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf
index c85f3b4de..c85f3b4de 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf
index 875bf1df8..875bf1df8 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am
index daec9d20e..daec9d20e 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/README b/hw/xprint/config/C/print/models/HPLJ4family/fonts/README
index 2c9821834..2c9821834 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/README
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/README
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias
index e69de29bb..e69de29bb 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir
index da702ccc1..da702ccc1 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir
diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
index 483748893..483748893 100644
--- a/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
+++ b/hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
diff --git a/XpConfig/C/print/models/HPLJ4family/model-config b/hw/xprint/config/C/print/models/HPLJ4family/model-config
index 1ac997ebe..1ac997ebe 100644
--- a/XpConfig/C/print/models/HPLJ4family/model-config
+++ b/hw/xprint/config/C/print/models/HPLJ4family/model-config
diff --git a/XpConfig/C/print/models/Makefile.am b/hw/xprint/config/C/print/models/Makefile.am
index 488a06a75..488a06a75 100644
--- a/XpConfig/C/print/models/Makefile.am
+++ b/hw/xprint/config/C/print/models/Makefile.am
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am
index 37b57d7bb..37b57d7bb 100644
--- a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am
+++ b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config
index 1d74b8676..1d74b8676 100644
--- a/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config
+++ b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config
diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
index 5739807d8..5739807d8 100755
--- a/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
+++ b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/Makefile.am
index 040f26077..040f26077 100644
--- a/XpConfig/C/print/models/PSdefault/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/Makefile.am
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
index 331178985..331178985 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
index 61bcb22b9..61bcb22b9 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
index 88ccf0834..88ccf0834 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf
index 45cc8857b..45cc8857b 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf
index ac760fdb9..ac760fdb9 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf
index 8db974018..8db974018 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf
index 87aee16cc..87aee16cc 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf
index 6109c8c11..6109c8c11 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf
index 30d462d95..30d462d95 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf
index 89619516f..89619516f 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf
index 2a0de8afc..2a0de8afc 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf
index b1fd475bb..b1fd475bb 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf
index aff4b4949..aff4b4949 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
index b5b77f353..b5b77f353 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
index 100339854..100339854 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
index a8550e70d..a8550e70d 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
index 7cdfd8ee9..7cdfd8ee9 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
index ab22aabf5..ab22aabf5 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
index e68811eb7..e68811eb7 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
index 390f223cb..390f223cb 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
index 655b9b6c0..655b9b6c0 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
index 5e786ec42..5e786ec42 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf
index 094b348cc..094b348cc 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf
index 0bb62bde6..0bb62bde6 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf
index 3c19a7fbf..3c19a7fbf 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf
index 48925f816..48925f816 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf
index cf46ca03f..cf46ca03f 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
index ffe51af80..ffe51af80 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf
index 865433f83..865433f83 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf
index 625e0c43f..625e0c43f 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf
diff --git a/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
index 1ae9a7688..1ae9a7688 100644
--- a/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
+++ b/hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
diff --git a/XpConfig/C/print/models/PSdefault/model-config b/hw/xprint/config/C/print/models/PSdefault/model-config
index 05a19d859..05a19d859 100644
--- a/XpConfig/C/print/models/PSdefault/model-config
+++ b/hw/xprint/config/C/print/models/PSdefault/model-config
diff --git a/XpConfig/C/print/models/PSspooldir/Makefile.am b/hw/xprint/config/C/print/models/PSspooldir/Makefile.am
index 52313aa23..52313aa23 100644
--- a/XpConfig/C/print/models/PSspooldir/Makefile.am
+++ b/hw/xprint/config/C/print/models/PSspooldir/Makefile.am
diff --git a/XpConfig/C/print/models/PSspooldir/model-config b/hw/xprint/config/C/print/models/PSspooldir/model-config
index 6bb477767..6bb477767 100644
--- a/XpConfig/C/print/models/PSspooldir/model-config
+++ b/hw/xprint/config/C/print/models/PSspooldir/model-config
diff --git a/XpConfig/C/print/models/PSspooldir/spooltodir.sh b/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh
index aba14e1b3..aba14e1b3 100755
--- a/XpConfig/C/print/models/PSspooldir/spooltodir.sh
+++ b/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh
diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/Makefile.am
index 5a56f90fb..5a56f90fb 100644
--- a/XpConfig/C/print/models/SPSPARC2/Makefile.am
+++ b/hw/xprint/config/C/print/models/SPSPARC2/Makefile.am
diff --git a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
index 8cc269459..8cc269459 100644
--- a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am
+++ b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am
diff --git a/XpConfig/C/print/models/SPSPARC2/model-config b/hw/xprint/config/C/print/models/SPSPARC2/model-config
index 9f29b9992..9f29b9992 100644
--- a/XpConfig/C/print/models/SPSPARC2/model-config
+++ b/hw/xprint/config/C/print/models/SPSPARC2/model-config
diff --git a/XpConfig/Makefile.am b/hw/xprint/config/Makefile.am
index a5ea214c4..a5ea214c4 100644
--- a/XpConfig/Makefile.am
+++ b/hw/xprint/config/Makefile.am
diff --git a/XpConfig/README b/hw/xprint/config/README
index d7447815d..d7447815d 100644
--- a/XpConfig/README
+++ b/hw/xprint/config/README
diff --git a/XpConfig/en_US/Makefile.am b/hw/xprint/config/en_US/Makefile.am
index 0390ed2d4..0390ed2d4 100644
--- a/XpConfig/en_US/Makefile.am
+++ b/hw/xprint/config/en_US/Makefile.am
diff --git a/XpConfig/en_US/print/Makefile.am b/hw/xprint/config/en_US/print/Makefile.am
index 025003339..025003339 100644
--- a/XpConfig/en_US/print/Makefile.am
+++ b/hw/xprint/config/en_US/print/Makefile.am
diff --git a/XpConfig/en_US/print/attributes/Makefile.am b/hw/xprint/config/en_US/print/attributes/Makefile.am
index 8a05004d1..8a05004d1 100644
--- a/XpConfig/en_US/print/attributes/Makefile.am
+++ b/hw/xprint/config/en_US/print/attributes/Makefile.am
diff --git a/XpConfig/en_US/print/attributes/document b/hw/xprint/config/en_US/print/attributes/document
index 253c46bce..253c46bce 100644
--- a/XpConfig/en_US/print/attributes/document
+++ b/hw/xprint/config/en_US/print/attributes/document
diff --git a/Xprint/ddxInit.c b/hw/xprint/ddxInit.c
index d4c0b9a4c..d4c0b9a4c 100644
--- a/Xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
diff --git a/Xprint/doc/Makefile.am b/hw/xprint/doc/Makefile.am
index c0cb9d3d9..c0cb9d3d9 100644
--- a/Xprint/doc/Makefile.am
+++ b/hw/xprint/doc/Makefile.am
diff --git a/Xprint/doc/Xprt.html b/hw/xprint/doc/Xprt.html
index f84a3c134..f84a3c134 100644
--- a/Xprint/doc/Xprt.html
+++ b/hw/xprint/doc/Xprt.html
diff --git a/Xprint/doc/Xprt.man.pre b/hw/xprint/doc/Xprt.man.pre
index 7599a1344..7599a1344 100644
--- a/Xprint/doc/Xprt.man.pre
+++ b/hw/xprint/doc/Xprt.man.pre
diff --git a/Xprint/doc/Xprt.sgml b/hw/xprint/doc/Xprt.sgml
index 0ffa39fcb..0ffa39fcb 100644
--- a/Xprint/doc/Xprt.sgml
+++ b/hw/xprint/doc/Xprt.sgml
diff --git a/Xprint/etc/Makefile.am b/hw/xprint/etc/Makefile.am
index 0a960cd1b..0a960cd1b 100644
--- a/Xprint/etc/Makefile.am
+++ b/hw/xprint/etc/Makefile.am
diff --git a/Xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am
index e0277d9d4..e0277d9d4 100644
--- a/Xprint/etc/Xsession.d/Makefile.am
+++ b/hw/xprint/etc/Xsession.d/Makefile.am
diff --git a/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
index 3fb6bba7c..3fb6bba7c 100644
--- a/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
+++ b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh
diff --git a/Xprint/etc/init.d/Makefile.am b/hw/xprint/etc/init.d/Makefile.am
index cc03cfab4..cc03cfab4 100644
--- a/Xprint/etc/init.d/Makefile.am
+++ b/hw/xprint/etc/init.d/Makefile.am
diff --git a/Xprint/etc/init.d/xprint.cpp b/hw/xprint/etc/init.d/xprint.cpp
index dbfd1e139..dbfd1e139 100644
--- a/Xprint/etc/init.d/xprint.cpp
+++ b/hw/xprint/etc/init.d/xprint.cpp
diff --git a/Xprint/etc/profile.d/Makefile.am b/hw/xprint/etc/profile.d/Makefile.am
index b91a9115a..b91a9115a 100644
--- a/Xprint/etc/profile.d/Makefile.am
+++ b/hw/xprint/etc/profile.d/Makefile.am
diff --git a/Xprint/etc/profile.d/xprint.csh b/hw/xprint/etc/profile.d/xprint.csh
index 7cc675840..7cc675840 100644
--- a/Xprint/etc/profile.d/xprint.csh
+++ b/hw/xprint/etc/profile.d/xprint.csh
diff --git a/Xprint/etc/profile.d/xprint.sh b/hw/xprint/etc/profile.d/xprint.sh
index b5b46c1e7..b5b46c1e7 100644
--- a/Xprint/etc/profile.d/xprint.sh
+++ b/hw/xprint/etc/profile.d/xprint.sh
diff --git a/Xprint/mediaSizes.c b/hw/xprint/mediaSizes.c
index 7f582199d..7f582199d 100644
--- a/Xprint/mediaSizes.c
+++ b/hw/xprint/mediaSizes.c
diff --git a/Xprint/pcl-mono/Makefile.am b/hw/xprint/pcl-mono/Makefile.am
index 4d8dfc682..4d8dfc682 100644
--- a/Xprint/pcl-mono/Makefile.am
+++ b/hw/xprint/pcl-mono/Makefile.am
diff --git a/Xprint/pcl/Makefile.am b/hw/xprint/pcl/Makefile.am
index 90133e8e2..90133e8e2 100644
--- a/Xprint/pcl/Makefile.am
+++ b/hw/xprint/pcl/Makefile.am
diff --git a/Xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc
index 585ce4839..38a784e13 100644
--- a/Xprint/pcl/Makefile.am.inc
+++ b/hw/xprint/pcl/Makefile.am.inc
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+INCLUDES = -I$(top_srcdir)/hw/xprint
  
 AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 	-D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER)
@@ -19,7 +19,6 @@ libpcl_la_SOURCES =		\
 	$(srcdir)/../pcl/Pclmap.h	\
 	$(srcdir)/../pcl/PclMisc.c	\
 	$(srcdir)/../pcl/PclPixel.c	\
-	$(srcdir)/../pcl/PclPixmap.c	\
 	$(srcdir)/../pcl/PclPolygon.c	\
 	$(srcdir)/../pcl/PclPrint.c	\
 	$(srcdir)/../pcl/PclSFonts.c	\
diff --git a/Xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h
index bb1f52b2c..bb1f52b2c 100644
--- a/Xprint/pcl/Pcl.h
+++ b/hw/xprint/pcl/Pcl.h
diff --git a/Xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c
index d675e1699..d675e1699 100644
--- a/Xprint/pcl/PclArc.c
+++ b/hw/xprint/pcl/PclArc.c
diff --git a/Xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c
index dc9156b17..dc9156b17 100644
--- a/Xprint/pcl/PclArea.c
+++ b/hw/xprint/pcl/PclArea.c
diff --git a/Xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c
index adbd197fd..adbd197fd 100644
--- a/Xprint/pcl/PclAttVal.c
+++ b/hw/xprint/pcl/PclAttVal.c
diff --git a/Xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c
index 3cde053f1..3cde053f1 100644
--- a/Xprint/pcl/PclAttr.c
+++ b/hw/xprint/pcl/PclAttr.c
diff --git a/Xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c
index 37d42a521..37d42a521 100644
--- a/Xprint/pcl/PclColor.c
+++ b/hw/xprint/pcl/PclColor.c
diff --git a/Xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c
index f50c355e9..f50c355e9 100644
--- a/Xprint/pcl/PclCursor.c
+++ b/hw/xprint/pcl/PclCursor.c
diff --git a/Xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h
index 275bd63ec..275bd63ec 100644
--- a/Xprint/pcl/PclDef.h
+++ b/hw/xprint/pcl/PclDef.h
diff --git a/Xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c
index 591435faa..591435faa 100644
--- a/Xprint/pcl/PclFonts.c
+++ b/hw/xprint/pcl/PclFonts.c
diff --git a/Xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c
index c47986eed..c47986eed 100644
--- a/Xprint/pcl/PclGC.c
+++ b/hw/xprint/pcl/PclGC.c
diff --git a/Xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c
index 272f4da9a..272f4da9a 100644
--- a/Xprint/pcl/PclInit.c
+++ b/hw/xprint/pcl/PclInit.c
diff --git a/Xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c
index f2b564df8..f2b564df8 100644
--- a/Xprint/pcl/PclLine.c
+++ b/hw/xprint/pcl/PclLine.c
diff --git a/Xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c
index 3a958e783..3a958e783 100644
--- a/Xprint/pcl/PclMisc.c
+++ b/hw/xprint/pcl/PclMisc.c
diff --git a/Xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c
index bfad618ed..bfad618ed 100644
--- a/Xprint/pcl/PclPixel.c
+++ b/hw/xprint/pcl/PclPixel.c
diff --git a/Xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c
index 41ba4b1c0..41ba4b1c0 100644
--- a/Xprint/pcl/PclPolygon.c
+++ b/hw/xprint/pcl/PclPolygon.c
diff --git a/Xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c
index 701710253..701710253 100644
--- a/Xprint/pcl/PclPrint.c
+++ b/hw/xprint/pcl/PclPrint.c
diff --git a/Xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c
index 287c5c14f..287c5c14f 100644
--- a/Xprint/pcl/PclSFonts.c
+++ b/hw/xprint/pcl/PclSFonts.c
diff --git a/Xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h
index fdd62f651..fdd62f651 100644
--- a/Xprint/pcl/PclSFonts.h
+++ b/hw/xprint/pcl/PclSFonts.h
diff --git a/Xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c
index 51c0137fc..51c0137fc 100644
--- a/Xprint/pcl/PclSpans.c
+++ b/hw/xprint/pcl/PclSpans.c
diff --git a/Xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c
index be794772c..be794772c 100644
--- a/Xprint/pcl/PclText.c
+++ b/hw/xprint/pcl/PclText.c
diff --git a/Xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c
index cac5826e9..cac5826e9 100644
--- a/Xprint/pcl/PclWindow.c
+++ b/hw/xprint/pcl/PclWindow.c
diff --git a/Xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h
index 5224fd9e3..5224fd9e3 100644
--- a/Xprint/pcl/Pclmap.h
+++ b/hw/xprint/pcl/Pclmap.h
diff --git a/Xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am
index a05734d5f..90872d9da 100644
--- a/Xprint/ps/Makefile.am
+++ b/hw/xprint/ps/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libps.la
 
-INCLUDES = -I$(top_srcdir)/Xprint
+INCLUDES = -I$(top_srcdir)/hw/xprint
 
 AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \
 	-D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT
diff --git a/Xprint/ps/Ps.h b/hw/xprint/ps/Ps.h
index 4effc2066..4effc2066 100644
--- a/Xprint/ps/Ps.h
+++ b/hw/xprint/ps/Ps.h
diff --git a/Xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c
index 511971e7a..511971e7a 100644
--- a/Xprint/ps/PsArc.c
+++ b/hw/xprint/ps/PsArc.c
diff --git a/Xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c
index bf6f8f42a..bf6f8f42a 100644
--- a/Xprint/ps/PsArea.c
+++ b/hw/xprint/ps/PsArea.c
diff --git a/Xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c
index fc23ffef5..fc23ffef5 100644
--- a/Xprint/ps/PsAttVal.c
+++ b/hw/xprint/ps/PsAttVal.c
diff --git a/Xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c
index 74da5a0e1..74da5a0e1 100644
--- a/Xprint/ps/PsAttr.c
+++ b/hw/xprint/ps/PsAttr.c
diff --git a/Xprint/ps/PsCache.c b/hw/xprint/ps/PsCache.c
index 5c823a13e..5c823a13e 100644
--- a/Xprint/ps/PsCache.c
+++ b/hw/xprint/ps/PsCache.c
diff --git a/Xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c
index 91a44f85a..91a44f85a 100644
--- a/Xprint/ps/PsColor.c
+++ b/hw/xprint/ps/PsColor.c
diff --git a/Xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h
index cf45c8516..cf45c8516 100644
--- a/Xprint/ps/PsDef.h
+++ b/hw/xprint/ps/PsDef.h
diff --git a/Xprint/ps/PsFTFonts.c b/hw/xprint/ps/PsFTFonts.c
index 8857ae43e..8857ae43e 100644
--- a/Xprint/ps/PsFTFonts.c
+++ b/hw/xprint/ps/PsFTFonts.c
diff --git a/Xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c
index c4d5b03e2..c4d5b03e2 100644
--- a/Xprint/ps/PsFonts.c
+++ b/hw/xprint/ps/PsFonts.c
diff --git a/Xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c
index ada0b8c65..ada0b8c65 100644
--- a/Xprint/ps/PsGC.c
+++ b/hw/xprint/ps/PsGC.c
diff --git a/Xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c
index f3052bebb..f3052bebb 100644
--- a/Xprint/ps/PsImageUtil.c
+++ b/hw/xprint/ps/PsImageUtil.c
diff --git a/Xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c
index 06c5d11a8..06c5d11a8 100644
--- a/Xprint/ps/PsInit.c
+++ b/hw/xprint/ps/PsInit.c
diff --git a/Xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c
index 2524769c8..2524769c8 100644
--- a/Xprint/ps/PsLine.c
+++ b/hw/xprint/ps/PsLine.c
diff --git a/Xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c
index b8a3ba854..b8a3ba854 100644
--- a/Xprint/ps/PsMisc.c
+++ b/hw/xprint/ps/PsMisc.c
diff --git a/Xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c
index 2197f0ab9..2197f0ab9 100644
--- a/Xprint/ps/PsPixel.c
+++ b/hw/xprint/ps/PsPixel.c
diff --git a/Xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c
index f2d05d023..f2d05d023 100644
--- a/Xprint/ps/PsPixmap.c
+++ b/hw/xprint/ps/PsPixmap.c
diff --git a/Xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c
index c4c30bc79..c4c30bc79 100644
--- a/Xprint/ps/PsPolygon.c
+++ b/hw/xprint/ps/PsPolygon.c
diff --git a/Xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c
index 8a4f0ade8..8a4f0ade8 100644
--- a/Xprint/ps/PsPrint.c
+++ b/hw/xprint/ps/PsPrint.c
diff --git a/Xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c
index d7652f8fb..d7652f8fb 100644
--- a/Xprint/ps/PsSpans.c
+++ b/hw/xprint/ps/PsSpans.c
diff --git a/Xprint/ps/PsText.c b/hw/xprint/ps/PsText.c
index 37463ba1a..37463ba1a 100644
--- a/Xprint/ps/PsText.c
+++ b/hw/xprint/ps/PsText.c
diff --git a/Xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c
index d889dda9a..d889dda9a 100644
--- a/Xprint/ps/PsWindow.c
+++ b/hw/xprint/ps/PsWindow.c
diff --git a/Xprint/ps/psout.c b/hw/xprint/ps/psout.c
index dccd692ba..dccd692ba 100644
--- a/Xprint/ps/psout.c
+++ b/hw/xprint/ps/psout.c
diff --git a/Xprint/ps/psout.h b/hw/xprint/ps/psout.h
index d998e2a09..d998e2a09 100644
--- a/Xprint/ps/psout.h
+++ b/hw/xprint/ps/psout.h
diff --git a/Xprint/ps/psout_ft.c b/hw/xprint/ps/psout_ft.c
index b10d9e592..b10d9e592 100644
--- a/Xprint/ps/psout_ft.c
+++ b/hw/xprint/ps/psout_ft.c
diff --git a/Xprint/ps/psout_ftpstype1.c b/hw/xprint/ps/psout_ftpstype1.c
index 2d40c186a..2d40c186a 100644
--- a/Xprint/ps/psout_ftpstype1.c
+++ b/hw/xprint/ps/psout_ftpstype1.c
diff --git a/Xprint/ps/psout_ftpstype3.c b/hw/xprint/ps/psout_ftpstype3.c
index 733b5386b..733b5386b 100644
--- a/Xprint/ps/psout_ftpstype3.c
+++ b/hw/xprint/ps/psout_ftpstype3.c
diff --git a/Xprint/ps/ttf2pt1wrap.c b/hw/xprint/ps/ttf2pt1wrap.c
index 57bb777d2..57bb777d2 100644
--- a/Xprint/ps/ttf2pt1wrap.c
+++ b/hw/xprint/ps/ttf2pt1wrap.c
diff --git a/Xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am
index 4a2223115..fcd1e7334 100644
--- a/Xprint/raster/Makefile.am
+++ b/hw/xprint/raster/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libraster.la
 
-INCLUDES = -I$(top_srcdir)/Xprint
+INCLUDES = -I$(top_srcdir)/hw/xprint
 
 AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 	-D_XP_PRINT_SERVER_ -DPSZ=8
diff --git a/Xprint/raster/Raster.c b/hw/xprint/raster/Raster.c
index 7ad30b446..7ad30b446 100644
--- a/Xprint/raster/Raster.c
+++ b/hw/xprint/raster/Raster.c
diff --git a/Xprint/raster/Raster.h b/hw/xprint/raster/Raster.h
index 25da756e5..25da756e5 100644
--- a/Xprint/raster/Raster.h
+++ b/hw/xprint/raster/Raster.h
diff --git a/Xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c
index fc00cde5a..fc00cde5a 100644
--- a/Xprint/raster/RasterAttVal.c
+++ b/hw/xprint/raster/RasterAttVal.c
diff --git a/Xprint/spooler.c b/hw/xprint/spooler.c
index f709c57ab..f709c57ab 100644
--- a/Xprint/spooler.c
+++ b/hw/xprint/spooler.c
diff --git a/Xprint/spooler.h b/hw/xprint/spooler.h
index 4e9b4aefc..4e9b4aefc 100644
--- a/Xprint/spooler.h
+++ b/hw/xprint/spooler.h