Split the source tree into two new directories.

PSSRC files are now in 'gs/psi'.
GLSRC files are now in 'gs/base'.

This is to facilitate build modularization and merging in the ghostpdl
tree.

NOTE: msvc32.mak is now in psi, not src.

git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@9048 a1074d23-0009-0410-80fe-cf8c14f379e6

1300 files changed, 1535 insertions, 1568 deletions

diff --git a/doc/ghostpdl.tex b/doc/ghostpdl.tex
index 63e033f77..94255583d 100644
--- a/doc/ghostpdl.tex
+++ b/doc/ghostpdl.tex
@@ -14,7 +14,8 @@ products use the Ghostscript Graphic Library for graphics, imaging and
 driver support.  GhostPDL may be configured with PostScript and PDF support but these PDL's are not documented here, for these see the Ghostscript documentation at
 \url{www.ghostscript.com/doc/} for information about these languages.
 The relevant ghostscript version used by the PDL's  can be found
-in gs/src/version.mak.  The GhostPDL product may be configured with PostScript and PDF support but that is not documented here.
+in gs/base/version.mak.  The GhostPDL product may be configured with 
+PostScript and PDF support but that is not documented here.
 
 
 GhostPDL is not intended to be a finished
diff --git a/doc/ghostpdl.txt b/doc/ghostpdl.txt
index 01909bd73..1d4e9419f 100644
--- a/doc/ghostpdl.txt
+++ b/doc/ghostpdl.txt
@@ -1,5 +1,5 @@
 GhostPDL
-This document discusses configuration, compilation and running of the GhostPDL 1 family of products:XPS [1], PCL5E [2], PCL5C [3], PCLXL [4], and HPGL/2 with RTL [6], additionally a scaled down PJL [5] interpreter is provided. The PDL products use the Ghostscript Graphic Library for graphics, imaging and driver support. GhostPDL may be configured with PostScript and PDF support but these PDL's are not documented here, for these see the Ghostscript documentation at www.ghostscript.com/doc/ for information about these languages. The relevant ghostscript version used by the PDL's can be found in gs/src/version.mak. The GhostPDL product may be configured with PostScript and PDF support but that is not documented here. GhostPDL is not intended to be a finished software application but a collection of software components that will ultimately be included in a software application or a real time embedded system. Generally the GhostPDL languages are compliant with the Genoa (now QualityLogic) Functional Test Suite and the Genoa Application Test suite. Also each language should run the corresponding Genoa Comprehensive Evaluation Test (CET) without egregious errors. For printer customers we have GhostSwitch. GhostSwitch integrates Ghostscript's Postscript and PDF interpreter with GhostPCL and optionally GhostXPS in a language switching environment with auto language sensing and PJL job control as found on many modern printers. In this document and the software, PCL6 refers to technology that supports both PCL5 and PCLXL languages.
+This document discusses configuration, compilation and running of the GhostPDL 1 family of products:XPS [1], PCL5E [2], PCL5C [3], PCLXL [4], and HPGL/2 with RTL [6], additionally a scaled down PJL [5] interpreter is provided. The PDL products use the Ghostscript Graphic Library for graphics, imaging and driver support. GhostPDL may be configured with PostScript and PDF support but these PDL's are not documented here, for these see the Ghostscript documentation at www.ghostscript.com/doc/ for information about these languages. The relevant ghostscript version used by the PDL's can be found in gs/base/version.mak. The GhostPDL product may be configured with PostScript and PDF support but that is not documented here. GhostPDL is not intended to be a finished software application but a collection of software components that will ultimately be included in a software application or a real time embedded system. Generally the GhostPDL languages are compliant with the Genoa (now QualityLogic) Functional Test Suite and the Genoa Application Test suite. Also each language should run the corresponding Genoa Comprehensive Evaluation Test (CET) without egregious errors. For printer customers we have GhostSwitch. GhostSwitch integrates Ghostscript's Postscript and PDF interpreter with GhostPCL and optionally GhostXPS in a language switching environment with auto language sensing and PJL job control as found on many modern printers. In this document and the software, PCL6 refers to technology that supports both PCL5 and PCLXL languages.
 
 Quick Start For Unix environment with GCC.
 # unpack the release and go to the release directory. tar zxvf ghostpcl-xxx.tar.gz; cd ghostpcl-xxx make pcl make xps NB - needs more examples - install, urwfonts, debug builds...
@@ -100,4 +100,4 @@ PostScript is a registered trademark of Adobe Systems Inc. PCL is a registered t
 
 7
 
-
\ No newline at end of file
+
diff --git a/gs/autogen.sh b/gs/autogen.sh
index 7b35bdeb8..ee50a88e2 100755
--- a/gs/autogen.sh
+++ b/gs/autogen.sh
@@ -22,8 +22,8 @@ echo "Generating configuration files for $package, please wait...."
 
 echo "  creating links to configuration sources"
 rm -f configure.ac Makefile.in
-ln -s src/configure.ac .
-ln -s src/Makefile.in .
+ln -s base/configure.ac .
+ln -s base/Makefile.in .
 
 #echo "  aclocal $ACLOCAL_FLAGS"
 #aclocal $ACLOCAL_FLAGS || exit 1
diff --git a/gs/src/ConvertUTF.c b/gs/base/ConvertUTF.c
index 0472964fd..0472964fd 100644
--- a/gs/src/ConvertUTF.c
+++ b/gs/base/ConvertUTF.c
diff --git a/gs/src/ConvertUTF.h b/gs/base/ConvertUTF.h
index ed23fb28f..ed23fb28f 100644
--- a/gs/src/ConvertUTF.h
+++ b/gs/base/ConvertUTF.h
diff --git a/gs/src/Makefile.in b/gs/base/Makefile.in
index e59c6ec62..e1a3bcd43 100644
--- a/gs/src/Makefile.in
+++ b/gs/base/Makefile.in
@@ -23,10 +23,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=./bin
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./obj
 GLOBJDIR=./obj
-PSSRCDIR=./src
+PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
 PSGENDIR=./obj
diff --git a/gs/src/aes.c b/gs/base/aes.c
index 6f9477721..e2a7c23ad 100644
--- a/gs/src/aes.c
+++ b/gs/base/aes.c
@@ -36,7 +36,7 @@
  *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
  */
 
-/* $Id:$ */
+/* $Id$ */
 /* AES block cipher implementation from XYSSL */
 
 #include "string_.h"	/* memcmp() */
diff --git a/gs/src/aes.h b/gs/base/aes.h
index e2b192a57..e2b192a57 100644
--- a/gs/src/aes.h
+++ b/gs/base/aes.h
diff --git a/gs/src/all-arch.mak b/gs/base/all-arch.mak
index 48411d85e..48411d85e 100644
--- a/gs/src/all-arch.mak
+++ b/gs/base/all-arch.mak
diff --git a/gs/src/append_l.com b/gs/base/append_l.com
index f33a3d9c0..f33a3d9c0 100644
--- a/gs/src/append_l.com
+++ b/gs/base/append_l.com
diff --git a/gs/src/bcc32.cfg b/gs/base/bcc32.cfg
index cc74d25e2..cc74d25e2 100644
--- a/gs/src/bcc32.cfg
+++ b/gs/base/bcc32.cfg
diff --git a/gs/src/bcwin32.mak b/gs/base/bcwin32.mak
index f9e10786b..2efdca233 100644
--- a/gs/src/bcwin32.mak
+++ b/gs/base/bcwin32.mak
@@ -29,7 +29,7 @@
 BINDIR=.\bin
 !endif
 !ifndef GLSRCDIR
-GLSRCDIR=.\src
+GLSRCDIR=.\base
 !endif
 !ifndef GLGENDIR
 GLGENDIR=.\obj
@@ -38,7 +38,7 @@ GLGENDIR=.\obj
 GLOBJDIR=.\obj
 !endif
 !ifndef PSSRCDIR
-PSSRCDIR=.\src
+PSSRCDIR=.\psi
 !endif
 !ifndef PSLIBDIR
 PSLIBDIR=.\lib
diff --git a/gs/src/bench.c b/gs/base/bench.c
index c1d7b8d75..c1d7b8d75 100644
--- a/gs/src/bench.c
+++ b/gs/base/bench.c
diff --git a/gs/src/catmake b/gs/base/catmake
index ebf3974bf..ebf3974bf 100755
--- a/gs/src/catmake
+++ b/gs/base/catmake
diff --git a/gs/src/configure.ac b/gs/base/configure.ac
index 7810da021..92f7046b5 100644
--- a/gs/src/configure.ac
+++ b/gs/base/configure.ac
@@ -20,7 +20,7 @@ dnl ------------------------------------------------
 
 AC_INIT
 AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/gs.c)
+AC_CONFIG_SRCDIR(psi/gs.c)
 
 dnl Inherit compiler flags from the environment...
 CFLAGS="${CFLAGS:=}"
diff --git a/gs/src/contrib.mak b/gs/base/contrib.mak
index 927a37337..927a37337 100644
--- a/gs/src/contrib.mak
+++ b/gs/base/contrib.mak
diff --git a/gs/src/copy_one.com b/gs/base/copy_one.com
index 64c8d8f79..64c8d8f79 100644
--- a/gs/src/copy_one.com
+++ b/gs/base/copy_one.com
diff --git a/gs/src/cp.bat b/gs/base/cp.bat
index 67ff19bf2..67ff19bf2 100755
--- a/gs/src/cp.bat
+++ b/gs/base/cp.bat
diff --git a/gs/src/cp.cmd b/gs/base/cp.cmd
index 321d8e953..321d8e953 100755
--- a/gs/src/cp.cmd
+++ b/gs/base/cp.cmd
diff --git a/gs/src/ctype_.h b/gs/base/ctype_.h
index 35984a6cf..35984a6cf 100644
--- a/gs/src/ctype_.h
+++ b/gs/base/ctype_.h
diff --git a/gs/src/devs.mak b/gs/base/devs.mak
index c1e81a63a..c1e81a63a 100644
--- a/gs/src/devs.mak
+++ b/gs/base/devs.mak
diff --git a/gs/src/dirent_.h b/gs/base/dirent_.h
index 2c89ab080..2c89ab080 100644
--- a/gs/src/dirent_.h
+++ b/gs/base/dirent_.h
diff --git a/gs/src/dmmain.c b/gs/base/dmmain.c
index 445c5a049..445c5a049 100644
--- a/gs/src/dmmain.c
+++ b/gs/base/dmmain.c
diff --git a/gs/src/dmmain.r b/gs/base/dmmain.r
index c68f4a74b..c68f4a74b 100644
--- a/gs/src/dmmain.r
+++ b/gs/base/dmmain.r
diff --git a/gs/src/dos_.h b/gs/base/dos_.h
index 637407091..637407091 100644
--- a/gs/src/dos_.h
+++ b/gs/base/dos_.h
diff --git a/gs/src/dpmain.c b/gs/base/dpmain.c
index 8d9da7b36..8d9da7b36 100644
--- a/gs/src/dpmain.c
+++ b/gs/base/dpmain.c
diff --git a/gs/src/dxmain.c b/gs/base/dxmain.c
index 2afd746d6..2afd746d6 100644
--- a/gs/src/dxmain.c
+++ b/gs/base/dxmain.c
diff --git a/gs/src/dxmainc.c b/gs/base/dxmainc.c
index 3d8a761b9..3d8a761b9 100644
--- a/gs/src/dxmainc.c
+++ b/gs/base/dxmainc.c
diff --git a/gs/src/echogs.c b/gs/base/echogs.c
index 4b0b2161c..4b0b2161c 100644
--- a/gs/src/echogs.c
+++ b/gs/base/echogs.c
diff --git a/gs/src/errno_.h b/gs/base/errno_.h
index 2c1b7dc0f..2c1b7dc0f 100644
--- a/gs/src/errno_.h
+++ b/gs/base/errno_.h
diff --git a/gs/src/errors.h b/gs/base/errors.h
index 30855089d..30855089d 100644
--- a/gs/src/errors.h
+++ b/gs/base/errors.h
diff --git a/gs/src/expat.mak b/gs/base/expat.mak
index b2ec24e50..b2ec24e50 100644
--- a/gs/src/expat.mak
+++ b/gs/base/expat.mak
diff --git a/gs/src/fapi_ft.c b/gs/base/fapi_ft.c
index 8af24478e..8af24478e 100644
--- a/gs/src/fapi_ft.c
+++ b/gs/base/fapi_ft.c
diff --git a/gs/src/fapiufst.c b/gs/base/fapiufst.c
index 51ecca785..51ecca785 100644
--- a/gs/src/fapiufst.c
+++ b/gs/base/fapiufst.c
diff --git a/gs/src/fcntl_.h b/gs/base/fcntl_.h
index a5eddb0cc..a5eddb0cc 100644
--- a/gs/src/fcntl_.h
+++ b/gs/base/fcntl_.h
diff --git a/gs/src/gconf.c b/gs/base/gconf.c
index 95ceac278..95ceac278 100644
--- a/gs/src/gconf.c
+++ b/gs/base/gconf.c
diff --git a/gs/src/gconf.h b/gs/base/gconf.h
index 7234d097f..7234d097f 100644
--- a/gs/src/gconf.h
+++ b/gs/base/gconf.h
diff --git a/gs/src/gdebug.h b/gs/base/gdebug.h
index 37b046d68..37b046d68 100644
--- a/gs/src/gdebug.h
+++ b/gs/base/gdebug.h
diff --git a/gs/src/gdev3852.c b/gs/base/gdev3852.c
index acf0e7352..acf0e7352 100644
--- a/gs/src/gdev3852.c
+++ b/gs/base/gdev3852.c
diff --git a/gs/src/gdev3b1.c b/gs/base/gdev3b1.c
index 604e01159..604e01159 100644
--- a/gs/src/gdev3b1.c
+++ b/gs/base/gdev3b1.c
diff --git a/gs/src/gdev4081.c b/gs/base/gdev4081.c
index 1b0642d70..1b0642d70 100644
--- a/gs/src/gdev4081.c
+++ b/gs/base/gdev4081.c
diff --git a/gs/src/gdev4693.c b/gs/base/gdev4693.c
index a3ab606e7..a3ab606e7 100644
--- a/gs/src/gdev4693.c
+++ b/gs/base/gdev4693.c
diff --git a/gs/src/gdev8510.c b/gs/base/gdev8510.c
index d05c36618..d05c36618 100644
--- a/gs/src/gdev8510.c
+++ b/gs/base/gdev8510.c
diff --git a/gs/src/gdev8bcm.c b/gs/base/gdev8bcm.c
index 874338fc3..874338fc3 100644
--- a/gs/src/gdev8bcm.c
+++ b/gs/base/gdev8bcm.c
diff --git a/gs/src/gdev8bcm.h b/gs/base/gdev8bcm.h
index a320c81af..a320c81af 100644
--- a/gs/src/gdev8bcm.h
+++ b/gs/base/gdev8bcm.h
diff --git a/gs/src/gdevabuf.c b/gs/base/gdevabuf.c
index 99cf63cc4..99cf63cc4 100644
--- a/gs/src/gdevabuf.c
+++ b/gs/base/gdevabuf.c
diff --git a/gs/src/gdevadmp.c b/gs/base/gdevadmp.c
index e374b6b5c..e374b6b5c 100644
--- a/gs/src/gdevadmp.c
+++ b/gs/base/gdevadmp.c
diff --git a/gs/src/gdevatx.c b/gs/base/gdevatx.c
index 5e7b101f4..5e7b101f4 100644
--- a/gs/src/gdevatx.c
+++ b/gs/base/gdevatx.c
diff --git a/gs/src/gdevbbox.c b/gs/base/gdevbbox.c
index 1f9f59302..1f9f59302 100644
--- a/gs/src/gdevbbox.c
+++ b/gs/base/gdevbbox.c
diff --git a/gs/src/gdevbbox.h b/gs/base/gdevbbox.h
index f73b0f995..f73b0f995 100644
--- a/gs/src/gdevbbox.h
+++ b/gs/base/gdevbbox.h
diff --git a/gs/src/gdevbit.c b/gs/base/gdevbit.c
index a0803aa2c..a0803aa2c 100644
--- a/gs/src/gdevbit.c
+++ b/gs/base/gdevbit.c
diff --git a/gs/src/gdevbj10.c b/gs/base/gdevbj10.c
index 22d501a1e..22d501a1e 100644
--- a/gs/src/gdevbj10.c
+++ b/gs/base/gdevbj10.c
diff --git a/gs/src/gdevbjc.h b/gs/base/gdevbjc.h
index d0bcc2afe..d0bcc2afe 100644
--- a/gs/src/gdevbjc.h
+++ b/gs/base/gdevbjc.h
diff --git a/gs/src/gdevbjcl.c b/gs/base/gdevbjcl.c
index 3b66ae497..3b66ae497 100644
--- a/gs/src/gdevbjcl.c
+++ b/gs/base/gdevbjcl.c
diff --git a/gs/src/gdevbjcl.h b/gs/base/gdevbjcl.h
index 8661dc823..8661dc823 100644
--- a/gs/src/gdevbjcl.h
+++ b/gs/base/gdevbjcl.h
diff --git a/gs/src/gdevbmp.c b/gs/base/gdevbmp.c
index 81ab12742..81ab12742 100644
--- a/gs/src/gdevbmp.c
+++ b/gs/base/gdevbmp.c
diff --git a/gs/src/gdevbmp.h b/gs/base/gdevbmp.h
index f075b681f..f075b681f 100644
--- a/gs/src/gdevbmp.h
+++ b/gs/base/gdevbmp.h
diff --git a/gs/src/gdevbmpa.c b/gs/base/gdevbmpa.c
index 588101f64..588101f64 100644
--- a/gs/src/gdevbmpa.c
+++ b/gs/base/gdevbmpa.c
diff --git a/gs/src/gdevbmpc.c b/gs/base/gdevbmpc.c
index b2e6721cf..b2e6721cf 100644
--- a/gs/src/gdevbmpc.c
+++ b/gs/base/gdevbmpc.c
diff --git a/gs/src/gdevcairo.c b/gs/base/gdevcairo.c
index 09673acda..09673acda 100644
--- a/gs/src/gdevcairo.c
+++ b/gs/base/gdevcairo.c
diff --git a/gs/src/gdevccr.c b/gs/base/gdevccr.c
index a35392764..a35392764 100644
--- a/gs/src/gdevccr.c
+++ b/gs/base/gdevccr.c
diff --git a/gs/src/gdevcdj.c b/gs/base/gdevcdj.c
index c3040a510..c3040a510 100644
--- a/gs/src/gdevcdj.c
+++ b/gs/base/gdevcdj.c
diff --git a/gs/src/gdevcfax.c b/gs/base/gdevcfax.c
index 524f83355..524f83355 100644
--- a/gs/src/gdevcfax.c
+++ b/gs/base/gdevcfax.c
diff --git a/gs/src/gdevcgm.c b/gs/base/gdevcgm.c
index eee9721e6..eee9721e6 100644
--- a/gs/src/gdevcgm.c
+++ b/gs/base/gdevcgm.c
diff --git a/gs/src/gdevcgml.c b/gs/base/gdevcgml.c
index 6373f3231..6373f3231 100644
--- a/gs/src/gdevcgml.c
+++ b/gs/base/gdevcgml.c
diff --git a/gs/src/gdevcgml.h b/gs/base/gdevcgml.h
index f61c18380..f61c18380 100644
--- a/gs/src/gdevcgml.h
+++ b/gs/base/gdevcgml.h
diff --git a/gs/src/gdevcgmx.h b/gs/base/gdevcgmx.h
index 6cfb72c6b..6cfb72c6b 100644
--- a/gs/src/gdevcgmx.h
+++ b/gs/base/gdevcgmx.h
diff --git a/gs/src/gdevcif.c b/gs/base/gdevcif.c
index 624ae7a7b..624ae7a7b 100644
--- a/gs/src/gdevcif.c
+++ b/gs/base/gdevcif.c
diff --git a/gs/src/gdevclj.c b/gs/base/gdevclj.c
index f92f135b3..f92f135b3 100644
--- a/gs/src/gdevclj.c
+++ b/gs/base/gdevclj.c
diff --git a/gs/src/gdevcljc.c b/gs/base/gdevcljc.c
index 22d674ec6..22d674ec6 100644
--- a/gs/src/gdevcljc.c
+++ b/gs/base/gdevcljc.c
diff --git a/gs/src/gdevcp50.c b/gs/base/gdevcp50.c
index 1a1b5f1d1..1a1b5f1d1 100644
--- a/gs/src/gdevcp50.c
+++ b/gs/base/gdevcp50.c
diff --git a/gs/src/gdevcslw.c b/gs/base/gdevcslw.c
index cb04ae292..cb04ae292 100644
--- a/gs/src/gdevcslw.c
+++ b/gs/base/gdevcslw.c
diff --git a/gs/src/gdevdbit.c b/gs/base/gdevdbit.c
index e62646f65..e62646f65 100644
--- a/gs/src/gdevdbit.c
+++ b/gs/base/gdevdbit.c
diff --git a/gs/src/gdevdcrd.c b/gs/base/gdevdcrd.c
index f15749acb..f15749acb 100644
--- a/gs/src/gdevdcrd.c
+++ b/gs/base/gdevdcrd.c
diff --git a/gs/src/gdevdcrd.h b/gs/base/gdevdcrd.h
index 36011b9c8..36011b9c8 100644
--- a/gs/src/gdevdcrd.h
+++ b/gs/base/gdevdcrd.h
diff --git a/gs/src/gdevddrw.c b/gs/base/gdevddrw.c
index eed41057a..eed41057a 100644
--- a/gs/src/gdevddrw.c
+++ b/gs/base/gdevddrw.c
diff --git a/gs/src/gdevddrw.h b/gs/base/gdevddrw.h
index e6a8c5fa0..e6a8c5fa0 100644
--- a/gs/src/gdevddrw.h
+++ b/gs/base/gdevddrw.h
diff --git a/gs/src/gdevdevn.c b/gs/base/gdevdevn.c
index ae18de019..ae18de019 100644
--- a/gs/src/gdevdevn.c
+++ b/gs/base/gdevdevn.c
diff --git a/gs/src/gdevdevn.h b/gs/base/gdevdevn.h
index ee1ecc094..ee1ecc094 100644
--- a/gs/src/gdevdevn.h
+++ b/gs/base/gdevdevn.h
diff --git a/gs/src/gdevdfax.c b/gs/base/gdevdfax.c
index 903810583..903810583 100644
--- a/gs/src/gdevdfax.c
+++ b/gs/base/gdevdfax.c
diff --git a/gs/src/gdevdflt.c b/gs/base/gdevdflt.c
index 0a32844f1..0a32844f1 100644
--- a/gs/src/gdevdflt.c
+++ b/gs/base/gdevdflt.c
diff --git a/gs/src/gdevdgbr.c b/gs/base/gdevdgbr.c
index 7e7d79b20..7e7d79b20 100644
--- a/gs/src/gdevdgbr.c
+++ b/gs/base/gdevdgbr.c
diff --git a/gs/src/gdevdjet.c b/gs/base/gdevdjet.c
index ec8458bba..ec8458bba 100644
--- a/gs/src/gdevdjet.c
+++ b/gs/base/gdevdjet.c
diff --git a/gs/src/gdevdjtc.c b/gs/base/gdevdjtc.c
index ef19cafd1..ef19cafd1 100644
--- a/gs/src/gdevdjtc.c
+++ b/gs/base/gdevdjtc.c
diff --git a/gs/src/gdevdljm.c b/gs/base/gdevdljm.c
index 1f5535580..1f5535580 100644
--- a/gs/src/gdevdljm.c
+++ b/gs/base/gdevdljm.c
diff --git a/gs/src/gdevdljm.h b/gs/base/gdevdljm.h
index 3fc136989..3fc136989 100644
--- a/gs/src/gdevdljm.h
+++ b/gs/base/gdevdljm.h
diff --git a/gs/src/gdevdm24.c b/gs/base/gdevdm24.c
index 1343ab1ff..1343ab1ff 100644
--- a/gs/src/gdevdm24.c
+++ b/gs/base/gdevdm24.c
diff --git a/gs/src/gdevdrop.c b/gs/base/gdevdrop.c
index 7b3f548e6..7b3f548e6 100644
--- a/gs/src/gdevdrop.c
+++ b/gs/base/gdevdrop.c
diff --git a/gs/src/gdevdsha.c b/gs/base/gdevdsha.c
index aec30f33e..aec30f33e 100644
--- a/gs/src/gdevdsha.c
+++ b/gs/base/gdevdsha.c
diff --git a/gs/src/gdevdsp.c b/gs/base/gdevdsp.c
index e390d4705..e390d4705 100644
--- a/gs/src/gdevdsp.c
+++ b/gs/base/gdevdsp.c
diff --git a/gs/src/gdevdsp.h b/gs/base/gdevdsp.h
index 8273fd0b2..8273fd0b2 100644
--- a/gs/src/gdevdsp.h
+++ b/gs/base/gdevdsp.h
diff --git a/gs/src/gdevdsp2.h b/gs/base/gdevdsp2.h
index 8869a8aa8..8869a8aa8 100644
--- a/gs/src/gdevdsp2.h
+++ b/gs/base/gdevdsp2.h
diff --git a/gs/src/gdevemap.c b/gs/base/gdevemap.c
index 2970eafec..2970eafec 100644
--- a/gs/src/gdevemap.c
+++ b/gs/base/gdevemap.c
diff --git a/gs/src/gdevepsc.c b/gs/base/gdevepsc.c
index f7bf4f0c8..f7bf4f0c8 100644
--- a/gs/src/gdevepsc.c
+++ b/gs/base/gdevepsc.c
diff --git a/gs/src/gdevepsn.c b/gs/base/gdevepsn.c
index fe2b0f3d7..fe2b0f3d7 100644
--- a/gs/src/gdevepsn.c
+++ b/gs/base/gdevepsn.c
diff --git a/gs/src/gdevescp.c b/gs/base/gdevescp.c
index 5a7a79446..5a7a79446 100644
--- a/gs/src/gdevescp.c
+++ b/gs/base/gdevescp.c
diff --git a/gs/src/gdevevga.c b/gs/base/gdevevga.c
index 31b1da586..31b1da586 100644
--- a/gs/src/gdevevga.c
+++ b/gs/base/gdevevga.c
diff --git a/gs/src/gdevfax.c b/gs/base/gdevfax.c
index fcaf2c68c..fcaf2c68c 100644
--- a/gs/src/gdevfax.c
+++ b/gs/base/gdevfax.c
diff --git a/gs/src/gdevfax.h b/gs/base/gdevfax.h
index e294b8fbd..e294b8fbd 100644
--- a/gs/src/gdevfax.h
+++ b/gs/base/gdevfax.h
diff --git a/gs/src/gdevherc.c b/gs/base/gdevherc.c
index 9c12cad3e..9c12cad3e 100644
--- a/gs/src/gdevherc.c
+++ b/gs/base/gdevherc.c
diff --git a/gs/src/gdevhit.c b/gs/base/gdevhit.c
index 303bd0ebb..303bd0ebb 100644
--- a/gs/src/gdevhit.c
+++ b/gs/base/gdevhit.c
diff --git a/gs/src/gdevhl7x.c b/gs/base/gdevhl7x.c
index b829f81fb..b829f81fb 100644
--- a/gs/src/gdevhl7x.c
+++ b/gs/base/gdevhl7x.c
diff --git a/gs/src/gdevifno.c b/gs/base/gdevifno.c
index bd875a71f..bd875a71f 100644
--- a/gs/src/gdevifno.c
+++ b/gs/base/gdevifno.c
diff --git a/gs/src/gdevijs.c b/gs/base/gdevijs.c
index 2d2f47641..2d2f47641 100644
--- a/gs/src/gdevijs.c
+++ b/gs/base/gdevijs.c
diff --git a/gs/src/gdevimdi.c b/gs/base/gdevimdi.c
index 00e989798..00e989798 100644
--- a/gs/src/gdevimdi.c
+++ b/gs/base/gdevimdi.c
diff --git a/gs/src/gdevimgn.c b/gs/base/gdevimgn.c
index 6642a585b..6642a585b 100644
--- a/gs/src/gdevimgn.c
+++ b/gs/base/gdevimgn.c
diff --git a/gs/src/gdevjbig2.c b/gs/base/gdevjbig2.c
index 5daa67f76..5daa67f76 100644
--- a/gs/src/gdevjbig2.c
+++ b/gs/base/gdevjbig2.c
diff --git a/gs/src/gdevjpeg.c b/gs/base/gdevjpeg.c
index 6a1e24a67..6a1e24a67 100644
--- a/gs/src/gdevjpeg.c
+++ b/gs/base/gdevjpeg.c
diff --git a/gs/src/gdevjpx.c b/gs/base/gdevjpx.c
index 54486ee0e..54486ee0e 100644
--- a/gs/src/gdevjpx.c
+++ b/gs/base/gdevjpx.c
diff --git a/gs/src/gdevl256.c b/gs/base/gdevl256.c
index fbc176128..fbc176128 100644
--- a/gs/src/gdevl256.c
+++ b/gs/base/gdevl256.c
diff --git a/gs/src/gdevl31s.c b/gs/base/gdevl31s.c
index 2b14535c7..2b14535c7 100644
--- a/gs/src/gdevl31s.c
+++ b/gs/base/gdevl31s.c
diff --git a/gs/src/gdevlbp8.c b/gs/base/gdevlbp8.c
index 98ce2816f..98ce2816f 100644
--- a/gs/src/gdevlbp8.c
+++ b/gs/base/gdevlbp8.c
diff --git a/gs/src/gdevlj56.c b/gs/base/gdevlj56.c
index 81a4fa38c..81a4fa38c 100644
--- a/gs/src/gdevlj56.c
+++ b/gs/base/gdevlj56.c
diff --git a/gs/src/gdevlp8k.c b/gs/base/gdevlp8k.c
index 48e7e02f5..48e7e02f5 100644
--- a/gs/src/gdevlp8k.c
+++ b/gs/base/gdevlp8k.c
diff --git a/gs/src/gdevlxm.c b/gs/base/gdevlxm.c
index 3fb016ecc..3fb016ecc 100644
--- a/gs/src/gdevlxm.c
+++ b/gs/base/gdevlxm.c
diff --git a/gs/src/gdevm1.c b/gs/base/gdevm1.c
index 490dc8d62..490dc8d62 100644
--- a/gs/src/gdevm1.c
+++ b/gs/base/gdevm1.c
diff --git a/gs/src/gdevm16.c b/gs/base/gdevm16.c
index b47bbf51c..b47bbf51c 100644
--- a/gs/src/gdevm16.c
+++ b/gs/base/gdevm16.c
diff --git a/gs/src/gdevm2.c b/gs/base/gdevm2.c
index 85558bee2..85558bee2 100644
--- a/gs/src/gdevm2.c
+++ b/gs/base/gdevm2.c
diff --git a/gs/src/gdevm24.c b/gs/base/gdevm24.c
index c76d18a23..c76d18a23 100644
--- a/gs/src/gdevm24.c
+++ b/gs/base/gdevm24.c
diff --git a/gs/src/gdevm32.c b/gs/base/gdevm32.c
index cf77d5eb3..cf77d5eb3 100644
--- a/gs/src/gdevm32.c
+++ b/gs/base/gdevm32.c
diff --git a/gs/src/gdevm4.c b/gs/base/gdevm4.c
index 59fa8c74a..59fa8c74a 100644
--- a/gs/src/gdevm4.c
+++ b/gs/base/gdevm4.c
diff --git a/gs/src/gdevm40.c b/gs/base/gdevm40.c
index 3a2fed793..3a2fed793 100644
--- a/gs/src/gdevm40.c
+++ b/gs/base/gdevm40.c
diff --git a/gs/src/gdevm48.c b/gs/base/gdevm48.c
index ff9a501d1..ff9a501d1 100644
--- a/gs/src/gdevm48.c
+++ b/gs/base/gdevm48.c
diff --git a/gs/src/gdevm56.c b/gs/base/gdevm56.c
index f0012b381..f0012b381 100644
--- a/gs/src/gdevm56.c
+++ b/gs/base/gdevm56.c
diff --git a/gs/src/gdevm64.c b/gs/base/gdevm64.c
index 2185fa0e2..2185fa0e2 100644
--- a/gs/src/gdevm64.c
+++ b/gs/base/gdevm64.c
diff --git a/gs/src/gdevm8.c b/gs/base/gdevm8.c
index ea3068d4e..ea3068d4e 100644
--- a/gs/src/gdevm8.c
+++ b/gs/base/gdevm8.c
diff --git a/gs/src/gdevmac.c b/gs/base/gdevmac.c
index 2366bc928..2366bc928 100644
--- a/gs/src/gdevmac.c
+++ b/gs/base/gdevmac.c
diff --git a/gs/src/gdevmac.h b/gs/base/gdevmac.h
index 069565897..069565897 100644
--- a/gs/src/gdevmac.h
+++ b/gs/base/gdevmac.h
diff --git a/gs/src/gdevmacpictop.h b/gs/base/gdevmacpictop.h
index 9c6d8c129..9c6d8c129 100644
--- a/gs/src/gdevmacpictop.h
+++ b/gs/base/gdevmacpictop.h
diff --git a/gs/src/gdevmacttf.h b/gs/base/gdevmacttf.h
index 9316e87d3..9316e87d3 100644
--- a/gs/src/gdevmacttf.h
+++ b/gs/base/gdevmacttf.h
diff --git a/gs/src/gdevmacxf.c b/gs/base/gdevmacxf.c
index 0e3afd9d7..0e3afd9d7 100644
--- a/gs/src/gdevmacxf.c
+++ b/gs/base/gdevmacxf.c
diff --git a/gs/src/gdevmeds.c b/gs/base/gdevmeds.c
index 91712b81a..91712b81a 100644
--- a/gs/src/gdevmeds.c
+++ b/gs/base/gdevmeds.c
diff --git a/gs/src/gdevmeds.h b/gs/base/gdevmeds.h
index f4bfeb905..f4bfeb905 100644
--- a/gs/src/gdevmeds.h
+++ b/gs/base/gdevmeds.h
diff --git a/gs/src/gdevmem.c b/gs/base/gdevmem.c
index a7fd69e3d..a7fd69e3d 100644
--- a/gs/src/gdevmem.c
+++ b/gs/base/gdevmem.c
diff --git a/gs/src/gdevmem.h b/gs/base/gdevmem.h
index d98bea9d5..d98bea9d5 100644
--- a/gs/src/gdevmem.h
+++ b/gs/base/gdevmem.h
diff --git a/gs/src/gdevmgr.c b/gs/base/gdevmgr.c
index 284ce2bb9..284ce2bb9 100644
--- a/gs/src/gdevmgr.c
+++ b/gs/base/gdevmgr.c
diff --git a/gs/src/gdevmgr.h b/gs/base/gdevmgr.h
index f62cb34ab..f62cb34ab 100644
--- a/gs/src/gdevmgr.h
+++ b/gs/base/gdevmgr.h
diff --git a/gs/src/gdevmiff.c b/gs/base/gdevmiff.c
index a1e4b39f4..a1e4b39f4 100644
--- a/gs/src/gdevmiff.c
+++ b/gs/base/gdevmiff.c
diff --git a/gs/src/gdevmpla.c b/gs/base/gdevmpla.c
index 35c10c76c..35c10c76c 100644
--- a/gs/src/gdevmpla.c
+++ b/gs/base/gdevmpla.c
diff --git a/gs/src/gdevmpla.h b/gs/base/gdevmpla.h
index d5fbd3256..d5fbd3256 100644
--- a/gs/src/gdevmpla.h
+++ b/gs/base/gdevmpla.h
diff --git a/gs/src/gdevmr1.c b/gs/base/gdevmr1.c
index fb34762cd..fb34762cd 100644
--- a/gs/src/gdevmr1.c
+++ b/gs/base/gdevmr1.c
diff --git a/gs/src/gdevmr2n.c b/gs/base/gdevmr2n.c
index 167c27e8e..167c27e8e 100644
--- a/gs/src/gdevmr2n.c
+++ b/gs/base/gdevmr2n.c
diff --git a/gs/src/gdevmr8n.c b/gs/base/gdevmr8n.c
index 263140ea4..263140ea4 100644
--- a/gs/src/gdevmr8n.c
+++ b/gs/base/gdevmr8n.c
diff --git a/gs/src/gdevmrop.h b/gs/base/gdevmrop.h
index 950bd2e55..950bd2e55 100644
--- a/gs/src/gdevmrop.h
+++ b/gs/base/gdevmrop.h
diff --git a/gs/src/gdevmrun.c b/gs/base/gdevmrun.c
index c5433dbd3..c5433dbd3 100644
--- a/gs/src/gdevmrun.c
+++ b/gs/base/gdevmrun.c
diff --git a/gs/src/gdevmrun.h b/gs/base/gdevmrun.h
index 0bd73a492..0bd73a492 100644
--- a/gs/src/gdevmrun.h
+++ b/gs/base/gdevmrun.h
diff --git a/gs/src/gdevmswn.c b/gs/base/gdevmswn.c
index 1a40d4547..1a40d4547 100644
--- a/gs/src/gdevmswn.c
+++ b/gs/base/gdevmswn.c
diff --git a/gs/src/gdevmswn.h b/gs/base/gdevmswn.h
index e2418d3ea..e2418d3ea 100644
--- a/gs/src/gdevmswn.h
+++ b/gs/base/gdevmswn.h
diff --git a/gs/src/gdevmsxf.c b/gs/base/gdevmsxf.c
index d280f4c12..d280f4c12 100644
--- a/gs/src/gdevmsxf.c
+++ b/gs/base/gdevmsxf.c
diff --git a/gs/src/gdevn533.c b/gs/base/gdevn533.c
index 3df9ef173..3df9ef173 100644
--- a/gs/src/gdevn533.c
+++ b/gs/base/gdevn533.c
diff --git a/gs/src/gdevnfwd.c b/gs/base/gdevnfwd.c
index a8cb836ff..a8cb836ff 100644
--- a/gs/src/gdevnfwd.c
+++ b/gs/base/gdevnfwd.c
diff --git a/gs/src/gdevo182.c b/gs/base/gdevo182.c
index 574e0356a..574e0356a 100644
--- a/gs/src/gdevo182.c
+++ b/gs/base/gdevo182.c
diff --git a/gs/src/gdevokii.c b/gs/base/gdevokii.c
index 1306d8659..1306d8659 100644
--- a/gs/src/gdevokii.c
+++ b/gs/base/gdevokii.c
diff --git a/gs/src/gdevos2p.c b/gs/base/gdevos2p.c
index befb3959e..befb3959e 100644
--- a/gs/src/gdevos2p.c
+++ b/gs/base/gdevos2p.c
diff --git a/gs/src/gdevp14.c b/gs/base/gdevp14.c
index 950da4297..950da4297 100644
--- a/gs/src/gdevp14.c
+++ b/gs/base/gdevp14.c
diff --git a/gs/src/gdevp14.h b/gs/base/gdevp14.h
index 8d3b97abf..8d3b97abf 100644
--- a/gs/src/gdevp14.h
+++ b/gs/base/gdevp14.h
diff --git a/gs/src/gdevp2up.c b/gs/base/gdevp2up.c
index 9f8258568..9f8258568 100644
--- a/gs/src/gdevp2up.c
+++ b/gs/base/gdevp2up.c
diff --git a/gs/src/gdevpbm.c b/gs/base/gdevpbm.c
index ca492edaa..ca492edaa 100644
--- a/gs/src/gdevpbm.c
+++ b/gs/base/gdevpbm.c
diff --git a/gs/src/gdevpccm.c b/gs/base/gdevpccm.c
index 3cb9851b4..3cb9851b4 100644
--- a/gs/src/gdevpccm.c
+++ b/gs/base/gdevpccm.c
diff --git a/gs/src/gdevpccm.h b/gs/base/gdevpccm.h
index 6f4019f91..6f4019f91 100644
--- a/gs/src/gdevpccm.h
+++ b/gs/base/gdevpccm.h
diff --git a/gs/src/gdevpcfb.c b/gs/base/gdevpcfb.c
index 75c308669..75c308669 100644
--- a/gs/src/gdevpcfb.c
+++ b/gs/base/gdevpcfb.c
diff --git a/gs/src/gdevpcfb.h b/gs/base/gdevpcfb.h
index d8f811854..d8f811854 100644
--- a/gs/src/gdevpcfb.h
+++ b/gs/base/gdevpcfb.h
diff --git a/gs/src/gdevpcl.c b/gs/base/gdevpcl.c
index 267ec7ed6..267ec7ed6 100644
--- a/gs/src/gdevpcl.c
+++ b/gs/base/gdevpcl.c
diff --git a/gs/src/gdevpcl.h b/gs/base/gdevpcl.h
index 8250ae163..8250ae163 100644
--- a/gs/src/gdevpcl.h
+++ b/gs/base/gdevpcl.h
diff --git a/gs/src/gdevpcx.c b/gs/base/gdevpcx.c
index 944de4620..944de4620 100644
--- a/gs/src/gdevpcx.c
+++ b/gs/base/gdevpcx.c
diff --git a/gs/src/gdevpdf.c b/gs/base/gdevpdf.c
index b3fc7b812..b3fc7b812 100644
--- a/gs/src/gdevpdf.c
+++ b/gs/base/gdevpdf.c
diff --git a/gs/src/gdevpdfb.c b/gs/base/gdevpdfb.c
index 5cae7f598..5cae7f598 100644
--- a/gs/src/gdevpdfb.c
+++ b/gs/base/gdevpdfb.c
diff --git a/gs/src/gdevpdfb.h b/gs/base/gdevpdfb.h
index f4a65da46..f4a65da46 100644
--- a/gs/src/gdevpdfb.h
+++ b/gs/base/gdevpdfb.h
diff --git a/gs/src/gdevpdfc.c b/gs/base/gdevpdfc.c
index 88af35229..88af35229 100644
--- a/gs/src/gdevpdfc.c
+++ b/gs/base/gdevpdfc.c
diff --git a/gs/src/gdevpdfc.h b/gs/base/gdevpdfc.h
index fd955fed0..fd955fed0 100644
--- a/gs/src/gdevpdfc.h
+++ b/gs/base/gdevpdfc.h
diff --git a/gs/src/gdevpdfd.c b/gs/base/gdevpdfd.c
index bf2f9256f..bf2f9256f 100644
--- a/gs/src/gdevpdfd.c
+++ b/gs/base/gdevpdfd.c
diff --git a/gs/src/gdevpdfe.c b/gs/base/gdevpdfe.c
index 3d8062ddd..3d8062ddd 100644
--- a/gs/src/gdevpdfe.c
+++ b/gs/base/gdevpdfe.c
diff --git a/gs/src/gdevpdfg.c b/gs/base/gdevpdfg.c
index b58c86efa..b58c86efa 100644
--- a/gs/src/gdevpdfg.c
+++ b/gs/base/gdevpdfg.c
diff --git a/gs/src/gdevpdfg.h b/gs/base/gdevpdfg.h
index ba57532c7..ba57532c7 100644
--- a/gs/src/gdevpdfg.h
+++ b/gs/base/gdevpdfg.h
diff --git a/gs/src/gdevpdfi.c b/gs/base/gdevpdfi.c
index 973bde38b..973bde38b 100644
--- a/gs/src/gdevpdfi.c
+++ b/gs/base/gdevpdfi.c
diff --git a/gs/src/gdevpdfj.c b/gs/base/gdevpdfj.c
index a163013f0..a163013f0 100644
--- a/gs/src/gdevpdfj.c
+++ b/gs/base/gdevpdfj.c
diff --git a/gs/src/gdevpdfk.c b/gs/base/gdevpdfk.c
index 3936e8270..3936e8270 100644
--- a/gs/src/gdevpdfk.c
+++ b/gs/base/gdevpdfk.c
diff --git a/gs/src/gdevpdfm.c b/gs/base/gdevpdfm.c
index b9682ccb8..b9682ccb8 100644
--- a/gs/src/gdevpdfm.c
+++ b/gs/base/gdevpdfm.c
diff --git a/gs/src/gdevpdfo.c b/gs/base/gdevpdfo.c
index 18d862c7a..18d862c7a 100644
--- a/gs/src/gdevpdfo.c
+++ b/gs/base/gdevpdfo.c
diff --git a/gs/src/gdevpdfo.h b/gs/base/gdevpdfo.h
index 39c464313..39c464313 100644
--- a/gs/src/gdevpdfo.h
+++ b/gs/base/gdevpdfo.h
diff --git a/gs/src/gdevpdfp.c b/gs/base/gdevpdfp.c
index b4102a9be..b4102a9be 100644
--- a/gs/src/gdevpdfp.c
+++ b/gs/base/gdevpdfp.c
diff --git a/gs/src/gdevpdfr.c b/gs/base/gdevpdfr.c
index f67375a52..f67375a52 100644
--- a/gs/src/gdevpdfr.c
+++ b/gs/base/gdevpdfr.c
diff --git a/gs/src/gdevpdft.c b/gs/base/gdevpdft.c
index 8e53b3673..8e53b3673 100644
--- a/gs/src/gdevpdft.c
+++ b/gs/base/gdevpdft.c
diff --git a/gs/src/gdevpdfu.c b/gs/base/gdevpdfu.c
index 2c5d4c800..2c5d4c800 100644
--- a/gs/src/gdevpdfu.c
+++ b/gs/base/gdevpdfu.c
diff --git a/gs/src/gdevpdfv.c b/gs/base/gdevpdfv.c
index 1963775c0..1963775c0 100644
--- a/gs/src/gdevpdfv.c
+++ b/gs/base/gdevpdfv.c
diff --git a/gs/src/gdevpdfx.h b/gs/base/gdevpdfx.h
index 2e7ebc55c..2e7ebc55c 100644
--- a/gs/src/gdevpdfx.h
+++ b/gs/base/gdevpdfx.h
diff --git a/gs/src/gdevpdt.c b/gs/base/gdevpdt.c
index 94720866f..94720866f 100644
--- a/gs/src/gdevpdt.c
+++ b/gs/base/gdevpdt.c
diff --git a/gs/src/gdevpdt.h b/gs/base/gdevpdt.h
index cb392f55b..cb392f55b 100644
--- a/gs/src/gdevpdt.h
+++ b/gs/base/gdevpdt.h
diff --git a/gs/src/gdevpdtb.c b/gs/base/gdevpdtb.c
index 627ae0e75..627ae0e75 100644
--- a/gs/src/gdevpdtb.c
+++ b/gs/base/gdevpdtb.c
diff --git a/gs/src/gdevpdtb.h b/gs/base/gdevpdtb.h
index a3d29c04e..a3d29c04e 100644
--- a/gs/src/gdevpdtb.h
+++ b/gs/base/gdevpdtb.h
diff --git a/gs/src/gdevpdtc.c b/gs/base/gdevpdtc.c
index 8bbe8f692..8bbe8f692 100644
--- a/gs/src/gdevpdtc.c
+++ b/gs/base/gdevpdtc.c
diff --git a/gs/src/gdevpdtd.c b/gs/base/gdevpdtd.c
index 4ccdf95a9..4ccdf95a9 100644
--- a/gs/src/gdevpdtd.c
+++ b/gs/base/gdevpdtd.c
diff --git a/gs/src/gdevpdtd.h b/gs/base/gdevpdtd.h
index 5727572b9..5727572b9 100644
--- a/gs/src/gdevpdtd.h
+++ b/gs/base/gdevpdtd.h
diff --git a/gs/src/gdevpdte.c b/gs/base/gdevpdte.c
index ceaffe136..ceaffe136 100644
--- a/gs/src/gdevpdte.c
+++ b/gs/base/gdevpdte.c
diff --git a/gs/src/gdevpdtf.c b/gs/base/gdevpdtf.c
index a8459715a..a8459715a 100644
--- a/gs/src/gdevpdtf.c
+++ b/gs/base/gdevpdtf.c
diff --git a/gs/src/gdevpdtf.h b/gs/base/gdevpdtf.h
index fa6f0c26c..fa6f0c26c 100644
--- a/gs/src/gdevpdtf.h
+++ b/gs/base/gdevpdtf.h
diff --git a/gs/src/gdevpdti.c b/gs/base/gdevpdti.c
index ef38cf8db..ef38cf8db 100644
--- a/gs/src/gdevpdti.c
+++ b/gs/base/gdevpdti.c
diff --git a/gs/src/gdevpdti.h b/gs/base/gdevpdti.h
index 72656282d..72656282d 100644
--- a/gs/src/gdevpdti.h
+++ b/gs/base/gdevpdti.h
diff --git a/gs/src/gdevpdts.c b/gs/base/gdevpdts.c
index 151370869..151370869 100644
--- a/gs/src/gdevpdts.c
+++ b/gs/base/gdevpdts.c
diff --git a/gs/src/gdevpdts.h b/gs/base/gdevpdts.h
index f6cff2390..f6cff2390 100644
--- a/gs/src/gdevpdts.h
+++ b/gs/base/gdevpdts.h
diff --git a/gs/src/gdevpdtt.c b/gs/base/gdevpdtt.c
index e21963e38..e21963e38 100644
--- a/gs/src/gdevpdtt.c
+++ b/gs/base/gdevpdtt.c
diff --git a/gs/src/gdevpdtt.h b/gs/base/gdevpdtt.h
index ed69793b0..ed69793b0 100644
--- a/gs/src/gdevpdtt.h
+++ b/gs/base/gdevpdtt.h
diff --git a/gs/src/gdevpdtv.c b/gs/base/gdevpdtv.c
index 1b84285bb..1b84285bb 100644
--- a/gs/src/gdevpdtv.c
+++ b/gs/base/gdevpdtv.c
diff --git a/gs/src/gdevpdtv.h b/gs/base/gdevpdtv.h
index 37a858e94..37a858e94 100644
--- a/gs/src/gdevpdtv.h
+++ b/gs/base/gdevpdtv.h
diff --git a/gs/src/gdevpdtw.c b/gs/base/gdevpdtw.c
index a73c68bd3..a73c68bd3 100644
--- a/gs/src/gdevpdtw.c
+++ b/gs/base/gdevpdtw.c
diff --git a/gs/src/gdevpdtw.h b/gs/base/gdevpdtw.h
index 083510553..083510553 100644
--- a/gs/src/gdevpdtw.h
+++ b/gs/base/gdevpdtw.h
diff --git a/gs/src/gdevpdtx.h b/gs/base/gdevpdtx.h
index 7b55a124f..7b55a124f 100644
--- a/gs/src/gdevpdtx.h
+++ b/gs/base/gdevpdtx.h
diff --git a/gs/src/gdevpe.c b/gs/base/gdevpe.c
index 969d54fdd..969d54fdd 100644
--- a/gs/src/gdevpe.c
+++ b/gs/base/gdevpe.c
diff --git a/gs/src/gdevperm.c b/gs/base/gdevperm.c
index 61c7c6084..61c7c6084 100644
--- a/gs/src/gdevperm.c
+++ b/gs/base/gdevperm.c
diff --git a/gs/src/gdevphex.c b/gs/base/gdevphex.c
index 4e4f31bf6..4e4f31bf6 100644
--- a/gs/src/gdevphex.c
+++ b/gs/base/gdevphex.c
diff --git a/gs/src/gdevpipe.c b/gs/base/gdevpipe.c
index 8ede3d922..8ede3d922 100644
--- a/gs/src/gdevpipe.c
+++ b/gs/base/gdevpipe.c
diff --git a/gs/src/gdevpjet.c b/gs/base/gdevpjet.c
index f135342b6..f135342b6 100644
--- a/gs/src/gdevpjet.c
+++ b/gs/base/gdevpjet.c
diff --git a/gs/src/gdevplnx.c b/gs/base/gdevplnx.c
index 434ee39a9..434ee39a9 100644
--- a/gs/src/gdevplnx.c
+++ b/gs/base/gdevplnx.c
diff --git a/gs/src/gdevplnx.h b/gs/base/gdevplnx.h
index b897c5150..b897c5150 100644
--- a/gs/src/gdevplnx.h
+++ b/gs/base/gdevplnx.h
diff --git a/gs/src/gdevpm.c b/gs/base/gdevpm.c
index 832ba2d96..832ba2d96 100644
--- a/gs/src/gdevpm.c
+++ b/gs/base/gdevpm.c
diff --git a/gs/src/gdevpm.h b/gs/base/gdevpm.h
index 63ac3d687..63ac3d687 100644
--- a/gs/src/gdevpm.h
+++ b/gs/base/gdevpm.h
diff --git a/gs/src/gdevpng.c b/gs/base/gdevpng.c
index ff310da40..ff310da40 100644
--- a/gs/src/gdevpng.c
+++ b/gs/base/gdevpng.c
diff --git a/gs/src/gdevppla.c b/gs/base/gdevppla.c
index 8885fc938..8885fc938 100644
--- a/gs/src/gdevppla.c
+++ b/gs/base/gdevppla.c
diff --git a/gs/src/gdevppla.h b/gs/base/gdevppla.h
index 2afd987e8..2afd987e8 100644
--- a/gs/src/gdevppla.h
+++ b/gs/base/gdevppla.h
diff --git a/gs/src/gdevprn.c b/gs/base/gdevprn.c
index 5106278eb..5106278eb 100644
--- a/gs/src/gdevprn.c
+++ b/gs/base/gdevprn.c
diff --git a/gs/src/gdevprn.h b/gs/base/gdevprn.h
index 8406ce6f5..8406ce6f5 100644
--- a/gs/src/gdevprn.h
+++ b/gs/base/gdevprn.h
diff --git a/gs/src/gdevprna.c b/gs/base/gdevprna.c
index b7af18aa9..b7af18aa9 100644
--- a/gs/src/gdevprna.c
+++ b/gs/base/gdevprna.c
diff --git a/gs/src/gdevprna.h b/gs/base/gdevprna.h
index 8b7659eb0..8b7659eb0 100644
--- a/gs/src/gdevprna.h
+++ b/gs/base/gdevprna.h
diff --git a/gs/src/gdevps.c b/gs/base/gdevps.c
index 3c3c319d0..3c3c319d0 100644
--- a/gs/src/gdevps.c
+++ b/gs/base/gdevps.c
diff --git a/gs/src/gdevpsd.c b/gs/base/gdevpsd.c
index 7940bf1b2..7940bf1b2 100644
--- a/gs/src/gdevpsd.c
+++ b/gs/base/gdevpsd.c
diff --git a/gs/src/gdevpsdf.h b/gs/base/gdevpsdf.h
index 15eb25070..15eb25070 100644
--- a/gs/src/gdevpsdf.h
+++ b/gs/base/gdevpsdf.h
diff --git a/gs/src/gdevpsdi.c b/gs/base/gdevpsdi.c
index 593a37a8f..593a37a8f 100644
--- a/gs/src/gdevpsdi.c
+++ b/gs/base/gdevpsdi.c
diff --git a/gs/src/gdevpsdp.c b/gs/base/gdevpsdp.c
index cab2bd57b..cab2bd57b 100644
--- a/gs/src/gdevpsdp.c
+++ b/gs/base/gdevpsdp.c
diff --git a/gs/src/gdevpsds.c b/gs/base/gdevpsds.c
index 399d7b89e..399d7b89e 100644
--- a/gs/src/gdevpsds.c
+++ b/gs/base/gdevpsds.c
diff --git a/gs/src/gdevpsds.h b/gs/base/gdevpsds.h
index b67b4adcc..b67b4adcc 100644
--- a/gs/src/gdevpsds.h
+++ b/gs/base/gdevpsds.h
diff --git a/gs/src/gdevpsdu.c b/gs/base/gdevpsdu.c
index 30570981f..30570981f 100644
--- a/gs/src/gdevpsdu.c
+++ b/gs/base/gdevpsdu.c
diff --git a/gs/src/gdevpsf.h b/gs/base/gdevpsf.h
index a9bcb2827..a9bcb2827 100644
--- a/gs/src/gdevpsf.h
+++ b/gs/base/gdevpsf.h
diff --git a/gs/src/gdevpsf1.c b/gs/base/gdevpsf1.c
index 36a47616d..36a47616d 100644
--- a/gs/src/gdevpsf1.c
+++ b/gs/base/gdevpsf1.c
diff --git a/gs/src/gdevpsf2.c b/gs/base/gdevpsf2.c
index abdf1623c..abdf1623c 100644
--- a/gs/src/gdevpsf2.c
+++ b/gs/base/gdevpsf2.c
diff --git a/gs/src/gdevpsfm.c b/gs/base/gdevpsfm.c
index ec742c1fa..ec742c1fa 100644
--- a/gs/src/gdevpsfm.c
+++ b/gs/base/gdevpsfm.c
diff --git a/gs/src/gdevpsft.c b/gs/base/gdevpsft.c
index cfb547a32..cfb547a32 100644
--- a/gs/src/gdevpsft.c
+++ b/gs/base/gdevpsft.c
diff --git a/gs/src/gdevpsfu.c b/gs/base/gdevpsfu.c
index ce11da0e7..ce11da0e7 100644
--- a/gs/src/gdevpsfu.c
+++ b/gs/base/gdevpsfu.c
diff --git a/gs/src/gdevpsfx.c b/gs/base/gdevpsfx.c
index d2846b698..d2846b698 100644
--- a/gs/src/gdevpsfx.c
+++ b/gs/base/gdevpsfx.c
diff --git a/gs/src/gdevpsim.c b/gs/base/gdevpsim.c
index 07af18b33..07af18b33 100644
--- a/gs/src/gdevpsim.c
+++ b/gs/base/gdevpsim.c
diff --git a/gs/src/gdevpsu.c b/gs/base/gdevpsu.c
index f82ce003b..f82ce003b 100644
--- a/gs/src/gdevpsu.c
+++ b/gs/base/gdevpsu.c
diff --git a/gs/src/gdevpsu.h b/gs/base/gdevpsu.h
index babc1fd16..babc1fd16 100644
--- a/gs/src/gdevpsu.h
+++ b/gs/base/gdevpsu.h
diff --git a/gs/src/gdevpx.c b/gs/base/gdevpx.c
index 41db6f1f0..41db6f1f0 100644
--- a/gs/src/gdevpx.c
+++ b/gs/base/gdevpx.c
diff --git a/gs/src/gdevpxat.h b/gs/base/gdevpxat.h
index f71f2094a..f71f2094a 100644
--- a/gs/src/gdevpxat.h
+++ b/gs/base/gdevpxat.h
diff --git a/gs/src/gdevpxen.h b/gs/base/gdevpxen.h
index f7955ceec..f7955ceec 100644
--- a/gs/src/gdevpxen.h
+++ b/gs/base/gdevpxen.h
diff --git a/gs/src/gdevpxop.h b/gs/base/gdevpxop.h
index 6d798268c..6d798268c 100644
--- a/gs/src/gdevpxop.h
+++ b/gs/base/gdevpxop.h
diff --git a/gs/src/gdevpxut.c b/gs/base/gdevpxut.c
index 18542a51a..18542a51a 100644
--- a/gs/src/gdevpxut.c
+++ b/gs/base/gdevpxut.c
diff --git a/gs/src/gdevpxut.h b/gs/base/gdevpxut.h
index af69a6b70..af69a6b70 100644
--- a/gs/src/gdevpxut.h
+++ b/gs/base/gdevpxut.h
diff --git a/gs/src/gdevrinkj.c b/gs/base/gdevrinkj.c
index 886621c92..886621c92 100644
--- a/gs/src/gdevrinkj.c
+++ b/gs/base/gdevrinkj.c
diff --git a/gs/src/gdevrops.c b/gs/base/gdevrops.c
index 6a1602edb..6a1602edb 100644
--- a/gs/src/gdevrops.c
+++ b/gs/base/gdevrops.c
diff --git a/gs/src/gdevs3ga.c b/gs/base/gdevs3ga.c
index 62228610c..62228610c 100644
--- a/gs/src/gdevs3ga.c
+++ b/gs/base/gdevs3ga.c
diff --git a/gs/src/gdevsco.c b/gs/base/gdevsco.c
index f33487e46..f33487e46 100644
--- a/gs/src/gdevsco.c
+++ b/gs/base/gdevsco.c
diff --git a/gs/src/gdevsgi.c b/gs/base/gdevsgi.c
index e1b7a1b94..e1b7a1b94 100644
--- a/gs/src/gdevsgi.c
+++ b/gs/base/gdevsgi.c
diff --git a/gs/src/gdevsgi.h b/gs/base/gdevsgi.h
index 37f6de7e7..37f6de7e7 100644
--- a/gs/src/gdevsgi.h
+++ b/gs/base/gdevsgi.h
diff --git a/gs/src/gdevsj48.c b/gs/base/gdevsj48.c
index 31b5ea92d..31b5ea92d 100644
--- a/gs/src/gdevsj48.c
+++ b/gs/base/gdevsj48.c
diff --git a/gs/src/gdevsnfb.c b/gs/base/gdevsnfb.c
index 49e9c6217..49e9c6217 100644
--- a/gs/src/gdevsnfb.c
+++ b/gs/base/gdevsnfb.c
diff --git a/gs/src/gdevsppr.c b/gs/base/gdevsppr.c
index 290e1cdf4..290e1cdf4 100644
--- a/gs/src/gdevsppr.c
+++ b/gs/base/gdevsppr.c
diff --git a/gs/src/gdevstc.c b/gs/base/gdevstc.c
index 982577a11..982577a11 100644
--- a/gs/src/gdevstc.c
+++ b/gs/base/gdevstc.c
diff --git a/gs/src/gdevstc.h b/gs/base/gdevstc.h
index 0ead90596..0ead90596 100644
--- a/gs/src/gdevstc.h
+++ b/gs/base/gdevstc.h
diff --git a/gs/src/gdevstc1.c b/gs/base/gdevstc1.c
index a36c89575..a36c89575 100644
--- a/gs/src/gdevstc1.c
+++ b/gs/base/gdevstc1.c
diff --git a/gs/src/gdevstc2.c b/gs/base/gdevstc2.c
index 848adf388..848adf388 100644
--- a/gs/src/gdevstc2.c
+++ b/gs/base/gdevstc2.c
diff --git a/gs/src/gdevstc3.c b/gs/base/gdevstc3.c
index d40617c22..d40617c22 100644
--- a/gs/src/gdevstc3.c
+++ b/gs/base/gdevstc3.c
diff --git a/gs/src/gdevstc4.c b/gs/base/gdevstc4.c
index 7bb0a618e..7bb0a618e 100644
--- a/gs/src/gdevstc4.c
+++ b/gs/base/gdevstc4.c
diff --git a/gs/src/gdevsun.c b/gs/base/gdevsun.c
index 1e99785b4..1e99785b4 100644
--- a/gs/src/gdevsun.c
+++ b/gs/base/gdevsun.c
diff --git a/gs/src/gdevsunr.c b/gs/base/gdevsunr.c
index dc9462799..dc9462799 100644
--- a/gs/src/gdevsunr.c
+++ b/gs/base/gdevsunr.c
diff --git a/gs/src/gdevsvg.c b/gs/base/gdevsvg.c
index 4e526460e..4e526460e 100644
--- a/gs/src/gdevsvg.c
+++ b/gs/base/gdevsvg.c
diff --git a/gs/src/gdevsvga.c b/gs/base/gdevsvga.c
index a18523291..a18523291 100644
--- a/gs/src/gdevsvga.c
+++ b/gs/base/gdevsvga.c
diff --git a/gs/src/gdevsvga.h b/gs/base/gdevsvga.h
index 5cd467de2..5cd467de2 100644
--- a/gs/src/gdevsvga.h
+++ b/gs/base/gdevsvga.h
diff --git a/gs/src/gdevtfax.c b/gs/base/gdevtfax.c
index 58c4a9c3c..58c4a9c3c 100644
--- a/gs/src/gdevtfax.c
+++ b/gs/base/gdevtfax.c
diff --git a/gs/src/gdevtfax.h b/gs/base/gdevtfax.h
index fca7f5b06..fca7f5b06 100644
--- a/gs/src/gdevtfax.h
+++ b/gs/base/gdevtfax.h
diff --git a/gs/src/gdevtfnx.c b/gs/base/gdevtfnx.c
index e388316c7..e388316c7 100644
--- a/gs/src/gdevtfnx.c
+++ b/gs/base/gdevtfnx.c
diff --git a/gs/src/gdevtifs.c b/gs/base/gdevtifs.c
index 8b1fc975c..8b1fc975c 100644
--- a/gs/src/gdevtifs.c
+++ b/gs/base/gdevtifs.c
diff --git a/gs/src/gdevtifs.h b/gs/base/gdevtifs.h
index 1848e659f..1848e659f 100644
--- a/gs/src/gdevtifs.h
+++ b/gs/base/gdevtifs.h
diff --git a/gs/src/gdevtknk.c b/gs/base/gdevtknk.c
index 28fad0c0a..28fad0c0a 100644
--- a/gs/src/gdevtknk.c
+++ b/gs/base/gdevtknk.c
diff --git a/gs/src/gdevtrac.c b/gs/base/gdevtrac.c
index 525f6c060..525f6c060 100644
--- a/gs/src/gdevtrac.c
+++ b/gs/base/gdevtrac.c
diff --git a/gs/src/gdevtsep.c b/gs/base/gdevtsep.c
index 50f9208d3..50f9208d3 100644
--- a/gs/src/gdevtsep.c
+++ b/gs/base/gdevtsep.c
diff --git a/gs/src/gdevtxtw.c b/gs/base/gdevtxtw.c
index 0489116ca..0489116ca 100644
--- a/gs/src/gdevtxtw.c
+++ b/gs/base/gdevtxtw.c
diff --git a/gs/src/gdevupd.c b/gs/base/gdevupd.c
index d8b7bd094..d8b7bd094 100644
--- a/gs/src/gdevupd.c
+++ b/gs/base/gdevupd.c
diff --git a/gs/src/gdevvec.c b/gs/base/gdevvec.c
index a48a6065b..a48a6065b 100644
--- a/gs/src/gdevvec.c
+++ b/gs/base/gdevvec.c
diff --git a/gs/src/gdevvec.h b/gs/base/gdevvec.h
index 875a8b639..875a8b639 100644
--- a/gs/src/gdevvec.h
+++ b/gs/base/gdevvec.h
diff --git a/gs/src/gdevvglb.c b/gs/base/gdevvglb.c
index d832f530a..d832f530a 100644
--- a/gs/src/gdevvglb.c
+++ b/gs/base/gdevvglb.c
diff --git a/gs/src/gdevwddb.c b/gs/base/gdevwddb.c
index 8e44faacb..8e44faacb 100644
--- a/gs/src/gdevwddb.c
+++ b/gs/base/gdevwddb.c
diff --git a/gs/src/gdevwdib.c b/gs/base/gdevwdib.c
index e40fde177..e40fde177 100644
--- a/gs/src/gdevwdib.c
+++ b/gs/base/gdevwdib.c
diff --git a/gs/src/gdevwpr2.c b/gs/base/gdevwpr2.c
index aa20749e0..aa20749e0 100644
--- a/gs/src/gdevwpr2.c
+++ b/gs/base/gdevwpr2.c
diff --git a/gs/src/gdevwprn.c b/gs/base/gdevwprn.c
index dc95e2bc8..dc95e2bc8 100644
--- a/gs/src/gdevwprn.c
+++ b/gs/base/gdevwprn.c
diff --git a/gs/src/gdevwts.c b/gs/base/gdevwts.c
index 7eab723e9..7eab723e9 100644
--- a/gs/src/gdevwts.c
+++ b/gs/base/gdevwts.c
diff --git a/gs/src/gdevx.c b/gs/base/gdevx.c
index af17b7390..af17b7390 100644
--- a/gs/src/gdevx.c
+++ b/gs/base/gdevx.c
diff --git a/gs/src/gdevx.h b/gs/base/gdevx.h
index 8dcb447bf..8dcb447bf 100644
--- a/gs/src/gdevx.h
+++ b/gs/base/gdevx.h
diff --git a/gs/src/gdevxalt.c b/gs/base/gdevxalt.c
index ff131cc8a..ff131cc8a 100644
--- a/gs/src/gdevxalt.c
+++ b/gs/base/gdevxalt.c
diff --git a/gs/src/gdevxcf.c b/gs/base/gdevxcf.c
index 36909560b..36909560b 100644
--- a/gs/src/gdevxcf.c
+++ b/gs/base/gdevxcf.c
diff --git a/gs/src/gdevxcmp.c b/gs/base/gdevxcmp.c
index faf2de3a2..faf2de3a2 100644
--- a/gs/src/gdevxcmp.c
+++ b/gs/base/gdevxcmp.c
diff --git a/gs/src/gdevxcmp.h b/gs/base/gdevxcmp.h
index e2c064793..e2c064793 100644
--- a/gs/src/gdevxcmp.h
+++ b/gs/base/gdevxcmp.h
diff --git a/gs/src/gdevxini.c b/gs/base/gdevxini.c
index eecb530f0..eecb530f0 100644
--- a/gs/src/gdevxini.c
+++ b/gs/base/gdevxini.c
diff --git a/gs/src/gdevxres.c b/gs/base/gdevxres.c
index 0d2ea20b2..0d2ea20b2 100644
--- a/gs/src/gdevxres.c
+++ b/gs/base/gdevxres.c
diff --git a/gs/src/gdevxxf.c b/gs/base/gdevxxf.c
index 7f002ca76..7f002ca76 100644
--- a/gs/src/gdevxxf.c
+++ b/gs/base/gdevxxf.c
diff --git a/gs/src/genarch.c b/gs/base/genarch.c
index ca9255716..ca9255716 100644
--- a/gs/src/genarch.c
+++ b/gs/base/genarch.c
diff --git a/gs/src/genconf.c b/gs/base/genconf.c
index bfb62cd8b..bfb62cd8b 100644
--- a/gs/src/genconf.c
+++ b/gs/base/genconf.c
diff --git a/gs/src/gendev.c b/gs/base/gendev.c
index 0c765e9ce..0c765e9ce 100644
--- a/gs/src/gendev.c
+++ b/gs/base/gendev.c
diff --git a/gs/src/genht.c b/gs/base/genht.c
index 159877c9a..159877c9a 100644
--- a/gs/src/genht.c
+++ b/gs/base/genht.c
diff --git a/gs/src/gp.h b/gs/base/gp.h
index aa61e99b8..aa61e99b8 100644
--- a/gs/src/gp.h
+++ b/gs/base/gp.h
diff --git a/gs/src/gp_dosfe.c b/gs/base/gp_dosfe.c
index 5f35c2704..5f35c2704 100644
--- a/gs/src/gp_dosfe.c
+++ b/gs/base/gp_dosfe.c
diff --git a/gs/src/gp_dosfs.c b/gs/base/gp_dosfs.c
index f4a22ee34..f4a22ee34 100644
--- a/gs/src/gp_dosfs.c
+++ b/gs/base/gp_dosfs.c
diff --git a/gs/src/gp_dvx.c b/gs/base/gp_dvx.c
index 3c6af2fd6..3c6af2fd6 100644
--- a/gs/src/gp_dvx.c
+++ b/gs/base/gp_dvx.c
diff --git a/gs/src/gp_getnv.c b/gs/base/gp_getnv.c
index 70d67b8ee..70d67b8ee 100644
--- a/gs/src/gp_getnv.c
+++ b/gs/base/gp_getnv.c
diff --git a/gs/src/gp_iwatc.c b/gs/base/gp_iwatc.c
index d4a0ea142..d4a0ea142 100644
--- a/gs/src/gp_iwatc.c
+++ b/gs/base/gp_iwatc.c
diff --git a/gs/src/gp_mac.c b/gs/base/gp_mac.c
index 58fd5aca0..58fd5aca0 100644
--- a/gs/src/gp_mac.c
+++ b/gs/base/gp_mac.c
diff --git a/gs/src/gp_mac.h b/gs/base/gp_mac.h
index 5fd4d77b9..5fd4d77b9 100644
--- a/gs/src/gp_mac.h
+++ b/gs/base/gp_mac.h
diff --git a/gs/src/gp_macio.c b/gs/base/gp_macio.c
index cbd3c5059..cbd3c5059 100644
--- a/gs/src/gp_macio.c
+++ b/gs/base/gp_macio.c
diff --git a/gs/src/gp_macpoll.c b/gs/base/gp_macpoll.c
index 17fa9408c..17fa9408c 100644
--- a/gs/src/gp_macpoll.c
+++ b/gs/base/gp_macpoll.c
diff --git a/gs/src/gp_mktmp.c b/gs/base/gp_mktmp.c
index bfa182701..bfa182701 100644
--- a/gs/src/gp_mktmp.c
+++ b/gs/base/gp_mktmp.c
diff --git a/gs/src/gp_msdll.c b/gs/base/gp_msdll.c
index 1e89eafc8..1e89eafc8 100644
--- a/gs/src/gp_msdll.c
+++ b/gs/base/gp_msdll.c
diff --git a/gs/src/gp_msdos.c b/gs/base/gp_msdos.c
index 812616dc6..812616dc6 100644
--- a/gs/src/gp_msdos.c
+++ b/gs/base/gp_msdos.c
diff --git a/gs/src/gp_mshdl.c b/gs/base/gp_mshdl.c
index 11705ff7b..11705ff7b 100644
--- a/gs/src/gp_mshdl.c
+++ b/gs/base/gp_mshdl.c
diff --git a/gs/src/gp_mslib.c b/gs/base/gp_mslib.c
index fdbf578b4..fdbf578b4 100644
--- a/gs/src/gp_mslib.c
+++ b/gs/base/gp_mslib.c
diff --git a/gs/src/gp_mspol.c b/gs/base/gp_mspol.c
index 591080701..591080701 100644
--- a/gs/src/gp_mspol.c
+++ b/gs/base/gp_mspol.c
diff --git a/gs/src/gp_msprn.c b/gs/base/gp_msprn.c
index 65b61f49e..65b61f49e 100644
--- a/gs/src/gp_msprn.c
+++ b/gs/base/gp_msprn.c
diff --git a/gs/src/gp_mswin.c b/gs/base/gp_mswin.c
index 6f7c399ac..6f7c399ac 100644
--- a/gs/src/gp_mswin.c
+++ b/gs/base/gp_mswin.c
diff --git a/gs/src/gp_mswin.h b/gs/base/gp_mswin.h
index 566da9444..566da9444 100644
--- a/gs/src/gp_mswin.h
+++ b/gs/base/gp_mswin.h
diff --git a/gs/src/gp_nsync.c b/gs/base/gp_nsync.c
index 7d96e0147..7d96e0147 100644
--- a/gs/src/gp_nsync.c
+++ b/gs/base/gp_nsync.c
diff --git a/gs/src/gp_ntfs.c b/gs/base/gp_ntfs.c
index 186d1a14b..186d1a14b 100644
--- a/gs/src/gp_ntfs.c
+++ b/gs/base/gp_ntfs.c
diff --git a/gs/src/gp_os2.c b/gs/base/gp_os2.c
index 2a1dc8c91..2a1dc8c91 100644
--- a/gs/src/gp_os2.c
+++ b/gs/base/gp_os2.c
diff --git a/gs/src/gp_os2.h b/gs/base/gp_os2.h
index fdb4be807..fdb4be807 100644
--- a/gs/src/gp_os2.h
+++ b/gs/base/gp_os2.h
diff --git a/gs/src/gp_os2pr.c b/gs/base/gp_os2pr.c
index c75845348..c75845348 100644
--- a/gs/src/gp_os2pr.c
+++ b/gs/base/gp_os2pr.c
diff --git a/gs/src/gp_os9.c b/gs/base/gp_os9.c
index 1db683924..1db683924 100644
--- a/gs/src/gp_os9.c
+++ b/gs/base/gp_os9.c
diff --git a/gs/src/gp_psync.c b/gs/base/gp_psync.c
index 5ee4654b2..5ee4654b2 100644
--- a/gs/src/gp_psync.c
+++ b/gs/base/gp_psync.c
diff --git a/gs/src/gp_stdia.c b/gs/base/gp_stdia.c
index 3cfac67bd..3cfac67bd 100644
--- a/gs/src/gp_stdia.c
+++ b/gs/base/gp_stdia.c
diff --git a/gs/src/gp_stdin.c b/gs/base/gp_stdin.c
index c3fe80eff..c3fe80eff 100644
--- a/gs/src/gp_stdin.c
+++ b/gs/base/gp_stdin.c
diff --git a/gs/src/gp_strdl.c b/gs/base/gp_strdl.c
index 5c8fc733b..5c8fc733b 100644
--- a/gs/src/gp_strdl.c
+++ b/gs/base/gp_strdl.c
diff --git a/gs/src/gp_sysv.c b/gs/base/gp_sysv.c
index a95aefa2e..a95aefa2e 100644
--- a/gs/src/gp_sysv.c
+++ b/gs/base/gp_sysv.c
diff --git a/gs/src/gp_unifn.c b/gs/base/gp_unifn.c
index dc120352d..dc120352d 100644
--- a/gs/src/gp_unifn.c
+++ b/gs/base/gp_unifn.c
diff --git a/gs/src/gp_unifs.c b/gs/base/gp_unifs.c
index 568bde3c3..568bde3c3 100644
--- a/gs/src/gp_unifs.c
+++ b/gs/base/gp_unifs.c
diff --git a/gs/src/gp_unix.c b/gs/base/gp_unix.c
index 1079f3410..1079f3410 100644
--- a/gs/src/gp_unix.c
+++ b/gs/base/gp_unix.c
diff --git a/gs/src/gp_unix_cache.c b/gs/base/gp_unix_cache.c
index ac74df459..ac74df459 100644
--- a/gs/src/gp_unix_cache.c
+++ b/gs/base/gp_unix_cache.c
diff --git a/gs/src/gp_vms.c b/gs/base/gp_vms.c
index 75026d233..75026d233 100644
--- a/gs/src/gp_vms.c
+++ b/gs/base/gp_vms.c
diff --git a/gs/src/gp_wgetv.c b/gs/base/gp_wgetv.c
index 2f3627425..2f3627425 100644
--- a/gs/src/gp_wgetv.c
+++ b/gs/base/gp_wgetv.c
diff --git a/gs/src/gp_win32.c b/gs/base/gp_win32.c
index 6697556ad..6697556ad 100644
--- a/gs/src/gp_win32.c
+++ b/gs/base/gp_win32.c
diff --git a/gs/src/gp_wsync.c b/gs/base/gp_wsync.c
index fda62c09d..fda62c09d 100644
--- a/gs/src/gp_wsync.c
+++ b/gs/base/gp_wsync.c
diff --git a/gs/src/gpcheck.h b/gs/base/gpcheck.h
index 794ec63de..794ec63de 100644
--- a/gs/src/gpcheck.h
+++ b/gs/base/gpcheck.h
diff --git a/gs/src/gpgetenv.h b/gs/base/gpgetenv.h
index c8b08d449..c8b08d449 100644
--- a/gs/src/gpgetenv.h
+++ b/gs/base/gpgetenv.h
diff --git a/gs/src/gpmisc.c b/gs/base/gpmisc.c
index e33f26478..e33f26478 100644
--- a/gs/src/gpmisc.c
+++ b/gs/base/gpmisc.c
diff --git a/gs/src/gpmisc.h b/gs/base/gpmisc.h
index 37a20ee4e..37a20ee4e 100644
--- a/gs/src/gpmisc.h
+++ b/gs/base/gpmisc.h
diff --git a/gs/src/gpsync.h b/gs/base/gpsync.h
index 1877a1f71..1877a1f71 100644
--- a/gs/src/gpsync.h
+++ b/gs/base/gpsync.h
diff --git a/gs/src/gs.mak b/gs/base/gs.mak
index e71de41eb..e71de41eb 100644
--- a/gs/src/gs.mak
+++ b/gs/base/gs.mak
diff --git a/gs/src/gs_dll_call.h b/gs/base/gs_dll_call.h
index b968d72fa..b968d72fa 100644
--- a/gs/src/gs_dll_call.h
+++ b/gs/base/gs_dll_call.h
diff --git a/gs/src/gsalloc.c b/gs/base/gsalloc.c
index e0edcb10e..e0edcb10e 100644
--- a/gs/src/gsalloc.c
+++ b/gs/base/gsalloc.c
diff --git a/gs/src/gsalloc.h b/gs/base/gsalloc.h
index e8555997b..e8555997b 100644
--- a/gs/src/gsalloc.h
+++ b/gs/base/gsalloc.h
diff --git a/gs/src/gsalpha.c b/gs/base/gsalpha.c
index 07784c6e6..07784c6e6 100644
--- a/gs/src/gsalpha.c
+++ b/gs/base/gsalpha.c
diff --git a/gs/src/gsalpha.h b/gs/base/gsalpha.h
index 03acba43d..03acba43d 100644
--- a/gs/src/gsalpha.h
+++ b/gs/base/gsalpha.h
diff --git a/gs/src/gsalphac.c b/gs/base/gsalphac.c
index d8977c229..d8977c229 100644
--- a/gs/src/gsalphac.c
+++ b/gs/base/gsalphac.c
diff --git a/gs/src/gsalphac.h b/gs/base/gsalphac.h
index fa614a2fb..fa614a2fb 100644
--- a/gs/src/gsalphac.h
+++ b/gs/base/gsalphac.h
diff --git a/gs/src/gsargs.c b/gs/base/gsargs.c
index 6e9e8b593..6e9e8b593 100644
--- a/gs/src/gsargs.c
+++ b/gs/base/gsargs.c
diff --git a/gs/src/gsargs.h b/gs/base/gsargs.h
index 72b450137..72b450137 100644
--- a/gs/src/gsargs.h
+++ b/gs/base/gsargs.h
diff --git a/gs/src/gsbitcom.c b/gs/base/gsbitcom.c
index 11c7a91b5..11c7a91b5 100644
--- a/gs/src/gsbitcom.c
+++ b/gs/base/gsbitcom.c
diff --git a/gs/src/gsbitmap.h b/gs/base/gsbitmap.h
index 0fb18fa7c..0fb18fa7c 100644
--- a/gs/src/gsbitmap.h
+++ b/gs/base/gsbitmap.h
diff --git a/gs/src/gsbitops.c b/gs/base/gsbitops.c
index b71ad9d14..b71ad9d14 100644
--- a/gs/src/gsbitops.c
+++ b/gs/base/gsbitops.c
diff --git a/gs/src/gsbitops.h b/gs/base/gsbitops.h
index a13a28d76..a13a28d76 100644
--- a/gs/src/gsbitops.h
+++ b/gs/base/gsbitops.h
diff --git a/gs/src/gsbittab.c b/gs/base/gsbittab.c
index f65af7739..f65af7739 100644
--- a/gs/src/gsbittab.c
+++ b/gs/base/gsbittab.c
diff --git a/gs/src/gsbittab.h b/gs/base/gsbittab.h
index 5e56bdc8d..5e56bdc8d 100644
--- a/gs/src/gsbittab.h
+++ b/gs/base/gsbittab.h
diff --git a/gs/src/gsccode.h b/gs/base/gsccode.h
index b4abec356..b4abec356 100644
--- a/gs/src/gsccode.h
+++ b/gs/base/gsccode.h
diff --git a/gs/src/gsccolor.h b/gs/base/gsccolor.h
index 97c5a24b6..97c5a24b6 100644
--- a/gs/src/gsccolor.h
+++ b/gs/base/gsccolor.h
diff --git a/gs/src/gscdef.c b/gs/base/gscdef.c
index 78dba0683..78dba0683 100644
--- a/gs/src/gscdef.c
+++ b/gs/base/gscdef.c
diff --git a/gs/src/gscdefs.h b/gs/base/gscdefs.h
index df51799e8..df51799e8 100644
--- a/gs/src/gscdefs.h
+++ b/gs/base/gscdefs.h
diff --git a/gs/src/gscdevn.c b/gs/base/gscdevn.c
index 2315786e4..2315786e4 100644
--- a/gs/src/gscdevn.c
+++ b/gs/base/gscdevn.c
diff --git a/gs/src/gscdevn.h b/gs/base/gscdevn.h
index b36069cf6..b36069cf6 100644
--- a/gs/src/gscdevn.h
+++ b/gs/base/gscdevn.h
diff --git a/gs/src/gscedata.c b/gs/base/gscedata.c
index 1bd634829..1bd634829 100644
--- a/gs/src/gscedata.c
+++ b/gs/base/gscedata.c
diff --git a/gs/src/gscedata.h b/gs/base/gscedata.h
index e341d4961..e341d4961 100644
--- a/gs/src/gscedata.h
+++ b/gs/base/gscedata.h
diff --git a/gs/src/gscencs.c b/gs/base/gscencs.c
index 859f1633f..859f1633f 100644
--- a/gs/src/gscencs.c
+++ b/gs/base/gscencs.c
diff --git a/gs/src/gscencs.h b/gs/base/gscencs.h
index 590f65b5e..590f65b5e 100644
--- a/gs/src/gscencs.h
+++ b/gs/base/gscencs.h
diff --git a/gs/src/gschar.c b/gs/base/gschar.c
index 588e4ea12..588e4ea12 100644
--- a/gs/src/gschar.c
+++ b/gs/base/gschar.c
diff --git a/gs/src/gschar.h b/gs/base/gschar.h
index 6ab90c4b3..6ab90c4b3 100644
--- a/gs/src/gschar.h
+++ b/gs/base/gschar.h
diff --git a/gs/src/gschar0.c b/gs/base/gschar0.c
index 572355446..572355446 100644
--- a/gs/src/gschar0.c
+++ b/gs/base/gschar0.c
diff --git a/gs/src/gscicach.c b/gs/base/gscicach.c
index 33688d7a8..33688d7a8 100644
--- a/gs/src/gscicach.c
+++ b/gs/base/gscicach.c
diff --git a/gs/src/gscicach.h b/gs/base/gscicach.h
index e0cda1b60..e0cda1b60 100644
--- a/gs/src/gscicach.h
+++ b/gs/base/gscicach.h
diff --git a/gs/src/gscie.c b/gs/base/gscie.c
index 7bee78be0..7bee78be0 100644
--- a/gs/src/gscie.c
+++ b/gs/base/gscie.c
diff --git a/gs/src/gscie.h b/gs/base/gscie.h
index 2684a07f9..2684a07f9 100644
--- a/gs/src/gscie.h
+++ b/gs/base/gscie.h
diff --git a/gs/src/gsciemap.c b/gs/base/gsciemap.c
index 58c1b9272..58c1b9272 100644
--- a/gs/src/gsciemap.c
+++ b/gs/base/gsciemap.c
diff --git a/gs/src/gscindex.h b/gs/base/gscindex.h
index 6a75f414a..6a75f414a 100644
--- a/gs/src/gscindex.h
+++ b/gs/base/gscindex.h
diff --git a/gs/src/gsclipsr.c b/gs/base/gsclipsr.c
index 1c2dd7705..1c2dd7705 100644
--- a/gs/src/gsclipsr.c
+++ b/gs/base/gsclipsr.c
diff --git a/gs/src/gsclipsr.h b/gs/base/gsclipsr.h
index 20c8f5b5e..20c8f5b5e 100644
--- a/gs/src/gsclipsr.h
+++ b/gs/base/gsclipsr.h
diff --git a/gs/src/gscolor.c b/gs/base/gscolor.c
index f6a2d923d..f6a2d923d 100644
--- a/gs/src/gscolor.c
+++ b/gs/base/gscolor.c
diff --git a/gs/src/gscolor.h b/gs/base/gscolor.h
index 6d917e83c..6d917e83c 100644
--- a/gs/src/gscolor.h
+++ b/gs/base/gscolor.h
diff --git a/gs/src/gscolor1.c b/gs/base/gscolor1.c
index befcf2de6..befcf2de6 100644
--- a/gs/src/gscolor1.c
+++ b/gs/base/gscolor1.c
diff --git a/gs/src/gscolor1.h b/gs/base/gscolor1.h
index cc8e02a9e..cc8e02a9e 100644
--- a/gs/src/gscolor1.h
+++ b/gs/base/gscolor1.h
diff --git a/gs/src/gscolor2.c b/gs/base/gscolor2.c
index 1adacaec2..1adacaec2 100644
--- a/gs/src/gscolor2.c
+++ b/gs/base/gscolor2.c
diff --git a/gs/src/gscolor2.h b/gs/base/gscolor2.h
index 1730ddfef..1730ddfef 100644
--- a/gs/src/gscolor2.h
+++ b/gs/base/gscolor2.h
diff --git a/gs/src/gscolor3.c b/gs/base/gscolor3.c
index bb265d38c..bb265d38c 100644
--- a/gs/src/gscolor3.c
+++ b/gs/base/gscolor3.c
diff --git a/gs/src/gscolor3.h b/gs/base/gscolor3.h
index f36b96a47..f36b96a47 100644
--- a/gs/src/gscolor3.h
+++ b/gs/base/gscolor3.h
diff --git a/gs/src/gscompt.h b/gs/base/gscompt.h
index 54bcc28ad..54bcc28ad 100644
--- a/gs/src/gscompt.h
+++ b/gs/base/gscompt.h
diff --git a/gs/src/gscoord.c b/gs/base/gscoord.c
index 3d9e9614d..3d9e9614d 100644
--- a/gs/src/gscoord.c
+++ b/gs/base/gscoord.c
diff --git a/gs/src/gscoord.h b/gs/base/gscoord.h
index 0d6d4ae1a..0d6d4ae1a 100644
--- a/gs/src/gscoord.h
+++ b/gs/base/gscoord.h
diff --git a/gs/src/gscparam.c b/gs/base/gscparam.c
index cb61bf9c0..cb61bf9c0 100644
--- a/gs/src/gscparam.c
+++ b/gs/base/gscparam.c
diff --git a/gs/src/gscpixel.c b/gs/base/gscpixel.c
index df9a12620..df9a12620 100644
--- a/gs/src/gscpixel.c
+++ b/gs/base/gscpixel.c
diff --git a/gs/src/gscpixel.h b/gs/base/gscpixel.h
index e9a0d12e1..e9a0d12e1 100644
--- a/gs/src/gscpixel.h
+++ b/gs/base/gscpixel.h
diff --git a/gs/src/gscpm.h b/gs/base/gscpm.h
index a53e0eb59..a53e0eb59 100644
--- a/gs/src/gscpm.h
+++ b/gs/base/gscpm.h
diff --git a/gs/src/gscrd.c b/gs/base/gscrd.c
index 802d002f4..802d002f4 100644
--- a/gs/src/gscrd.c
+++ b/gs/base/gscrd.c
diff --git a/gs/src/gscrd.h b/gs/base/gscrd.h
index eb89e5791..eb89e5791 100644
--- a/gs/src/gscrd.h
+++ b/gs/base/gscrd.h
diff --git a/gs/src/gscrdp.c b/gs/base/gscrdp.c
index 15daa6086..15daa6086 100644
--- a/gs/src/gscrdp.c
+++ b/gs/base/gscrdp.c
diff --git a/gs/src/gscrdp.h b/gs/base/gscrdp.h
index ea10cb924..ea10cb924 100644
--- a/gs/src/gscrdp.h
+++ b/gs/base/gscrdp.h
diff --git a/gs/src/gscrypt1.c b/gs/base/gscrypt1.c
index cda1640bd..cda1640bd 100644
--- a/gs/src/gscrypt1.c
+++ b/gs/base/gscrypt1.c
diff --git a/gs/src/gscrypt1.h b/gs/base/gscrypt1.h
index db1bdf650..db1bdf650 100644
--- a/gs/src/gscrypt1.h
+++ b/gs/base/gscrypt1.h
diff --git a/gs/src/gscscie.c b/gs/base/gscscie.c
index 0c8e0798e..0c8e0798e 100644
--- a/gs/src/gscscie.c
+++ b/gs/base/gscscie.c
diff --git a/gs/src/gscsel.h b/gs/base/gscsel.h
index 00f52fb90..00f52fb90 100644
--- a/gs/src/gscsel.h
+++ b/gs/base/gscsel.h
diff --git a/gs/src/gscsepr.c b/gs/base/gscsepr.c
index f8280fdfd..f8280fdfd 100644
--- a/gs/src/gscsepr.c
+++ b/gs/base/gscsepr.c
diff --git a/gs/src/gscsepr.h b/gs/base/gscsepr.h
index 563336c07..563336c07 100644
--- a/gs/src/gscsepr.h
+++ b/gs/base/gscsepr.h
diff --git a/gs/src/gscspace.c b/gs/base/gscspace.c
index 709f35ade..709f35ade 100644
--- a/gs/src/gscspace.c
+++ b/gs/base/gscspace.c
diff --git a/gs/src/gscspace.h b/gs/base/gscspace.h
index 809cf31cb..809cf31cb 100644
--- a/gs/src/gscspace.h
+++ b/gs/base/gscspace.h
diff --git a/gs/src/gscssub.c b/gs/base/gscssub.c
index a5b7415e3..a5b7415e3 100644
--- a/gs/src/gscssub.c
+++ b/gs/base/gscssub.c
diff --git a/gs/src/gscssub.h b/gs/base/gscssub.h
index f3da63f2e..f3da63f2e 100644
--- a/gs/src/gscssub.h
+++ b/gs/base/gscssub.h
diff --git a/gs/src/gsdcolor.h b/gs/base/gsdcolor.h
index e8da04b50..e8da04b50 100644
--- a/gs/src/gsdcolor.h
+++ b/gs/base/gsdcolor.h
diff --git a/gs/src/gsdevice.c b/gs/base/gsdevice.c
index 3ed56a474..3ed56a474 100644
--- a/gs/src/gsdevice.c
+++ b/gs/base/gsdevice.c
diff --git a/gs/src/gsdevice.h b/gs/base/gsdevice.h
index 3fe21ba16..3fe21ba16 100644
--- a/gs/src/gsdevice.h
+++ b/gs/base/gsdevice.h
diff --git a/gs/src/gsdevmem.c b/gs/base/gsdevmem.c
index f2041e089..f2041e089 100644
--- a/gs/src/gsdevmem.c
+++ b/gs/base/gsdevmem.c
diff --git a/gs/src/gsdfilt.c b/gs/base/gsdfilt.c
index ff5e7d3d5..ff5e7d3d5 100644
--- a/gs/src/gsdfilt.c
+++ b/gs/base/gsdfilt.c
diff --git a/gs/src/gsdfilt.h b/gs/base/gsdfilt.h
index d23d6087e..d23d6087e 100644
--- a/gs/src/gsdfilt.h
+++ b/gs/base/gsdfilt.h
diff --git a/gs/src/gsdll.h b/gs/base/gsdll.h
index 727ac48db..727ac48db 100644
--- a/gs/src/gsdll.h
+++ b/gs/base/gsdll.h
diff --git a/gs/src/gsdllwin.h b/gs/base/gsdllwin.h
index a16282e00..a16282e00 100644
--- a/gs/src/gsdllwin.h
+++ b/gs/base/gsdllwin.h
diff --git a/gs/src/gsdparam.c b/gs/base/gsdparam.c
index 4ff1f2dc6..4ff1f2dc6 100644
--- a/gs/src/gsdparam.c
+++ b/gs/base/gsdparam.c
diff --git a/gs/src/gsdpnext.h b/gs/base/gsdpnext.h
index 9be5c154c..9be5c154c 100644
--- a/gs/src/gsdpnext.h
+++ b/gs/base/gsdpnext.h
diff --git a/gs/src/gsdps.c b/gs/base/gsdps.c
index 75f04b7f4..75f04b7f4 100644
--- a/gs/src/gsdps.c
+++ b/gs/base/gsdps.c
diff --git a/gs/src/gsdps.h b/gs/base/gsdps.h
index cba4ddcc2..cba4ddcc2 100644
--- a/gs/src/gsdps.h
+++ b/gs/base/gsdps.h
diff --git a/gs/src/gsdps1.c b/gs/base/gsdps1.c
index 3d042e563..3d042e563 100644
--- a/gs/src/gsdps1.c
+++ b/gs/base/gsdps1.c
diff --git a/gs/src/gsdsrc.c b/gs/base/gsdsrc.c
index 11b64965d..11b64965d 100644
--- a/gs/src/gsdsrc.c
+++ b/gs/base/gsdsrc.c
diff --git a/gs/src/gsdsrc.h b/gs/base/gsdsrc.h
index 29ccd5dc7..29ccd5dc7 100644
--- a/gs/src/gsdsrc.h
+++ b/gs/base/gsdsrc.h
diff --git a/gs/src/gsequivc.c b/gs/base/gsequivc.c
index 5c7bb16b5..5c7bb16b5 100644
--- a/gs/src/gsequivc.c
+++ b/gs/base/gsequivc.c
diff --git a/gs/src/gsequivc.h b/gs/base/gsequivc.h
index 95616fbaf..95616fbaf 100644
--- a/gs/src/gsequivc.h
+++ b/gs/base/gsequivc.h
diff --git a/gs/src/gserror.h b/gs/base/gserror.h
index a00ecc3f4..a00ecc3f4 100644
--- a/gs/src/gserror.h
+++ b/gs/base/gserror.h
diff --git a/gs/src/gserrors.h b/gs/base/gserrors.h
index a39e3228a..a39e3228a 100644
--- a/gs/src/gserrors.h
+++ b/gs/base/gserrors.h
diff --git a/gs/src/gsexit.h b/gs/base/gsexit.h
index 0e850985d..0e850985d 100644
--- a/gs/src/gsexit.h
+++ b/gs/base/gsexit.h
diff --git a/gs/src/gsfcid.c b/gs/base/gsfcid.c
index 576722427..576722427 100644
--- a/gs/src/gsfcid.c
+++ b/gs/base/gsfcid.c
diff --git a/gs/src/gsfcid2.c b/gs/base/gsfcid2.c
index cb1561e67..cb1561e67 100644
--- a/gs/src/gsfcid2.c
+++ b/gs/base/gsfcid2.c
diff --git a/gs/src/gsfcmap.c b/gs/base/gsfcmap.c
index 040f06246..040f06246 100644
--- a/gs/src/gsfcmap.c
+++ b/gs/base/gsfcmap.c
diff --git a/gs/src/gsfcmap.h b/gs/base/gsfcmap.h
index 93f1156ef..93f1156ef 100644
--- a/gs/src/gsfcmap.h
+++ b/gs/base/gsfcmap.h
diff --git a/gs/src/gsfcmap1.c b/gs/base/gsfcmap1.c
index 35652aa90..35652aa90 100644
--- a/gs/src/gsfcmap1.c
+++ b/gs/base/gsfcmap1.c
diff --git a/gs/src/gsflip.c b/gs/base/gsflip.c
index 8654d1c0e..8654d1c0e 100644
--- a/gs/src/gsflip.c
+++ b/gs/base/gsflip.c
diff --git a/gs/src/gsflip.h b/gs/base/gsflip.h
index d6bac411f..d6bac411f 100644
--- a/gs/src/gsflip.h
+++ b/gs/base/gsflip.h
diff --git a/gs/src/gsfname.c b/gs/base/gsfname.c
index c8c87d03d..c8c87d03d 100644
--- a/gs/src/gsfname.c
+++ b/gs/base/gsfname.c
diff --git a/gs/src/gsfname.h b/gs/base/gsfname.h
index 6809f047e..6809f047e 100644
--- a/gs/src/gsfname.h
+++ b/gs/base/gsfname.h
diff --git a/gs/src/gsfont.c b/gs/base/gsfont.c
index e55120fb9..e55120fb9 100644
--- a/gs/src/gsfont.c
+++ b/gs/base/gsfont.c
diff --git a/gs/src/gsfont.h b/gs/base/gsfont.h
index 11eb7a871..11eb7a871 100644
--- a/gs/src/gsfont.h
+++ b/gs/base/gsfont.h
diff --git a/gs/src/gsfont0.c b/gs/base/gsfont0.c
index 273c4e886..273c4e886 100644
--- a/gs/src/gsfont0.c
+++ b/gs/base/gsfont0.c
diff --git a/gs/src/gsfont0c.c b/gs/base/gsfont0c.c
index e708335ea..e708335ea 100644
--- a/gs/src/gsfont0c.c
+++ b/gs/base/gsfont0c.c
diff --git a/gs/src/gsfunc.c b/gs/base/gsfunc.c
index c980ffc27..c980ffc27 100644
--- a/gs/src/gsfunc.c
+++ b/gs/base/gsfunc.c
diff --git a/gs/src/gsfunc.h b/gs/base/gsfunc.h
index c82c25ec2..c82c25ec2 100644
--- a/gs/src/gsfunc.h
+++ b/gs/base/gsfunc.h
diff --git a/gs/src/gsfunc0.c b/gs/base/gsfunc0.c
index 4fc24c9bd..4fc24c9bd 100644
--- a/gs/src/gsfunc0.c
+++ b/gs/base/gsfunc0.c
diff --git a/gs/src/gsfunc0.h b/gs/base/gsfunc0.h
index 3ec3be7a6..3ec3be7a6 100644
--- a/gs/src/gsfunc0.h
+++ b/gs/base/gsfunc0.h
diff --git a/gs/src/gsfunc3.c b/gs/base/gsfunc3.c
index 990a6b0df..990a6b0df 100644
--- a/gs/src/gsfunc3.c
+++ b/gs/base/gsfunc3.c
diff --git a/gs/src/gsfunc3.h b/gs/base/gsfunc3.h
index 9381811e3..9381811e3 100644
--- a/gs/src/gsfunc3.h
+++ b/gs/base/gsfunc3.h
diff --git a/gs/src/gsfunc4.c b/gs/base/gsfunc4.c
index 70bfd50ac..70bfd50ac 100644
--- a/gs/src/gsfunc4.c
+++ b/gs/base/gsfunc4.c
diff --git a/gs/src/gsfunc4.h b/gs/base/gsfunc4.h
index faebd44f9..faebd44f9 100644
--- a/gs/src/gsfunc4.h
+++ b/gs/base/gsfunc4.h
diff --git a/gs/src/gsgc.h b/gs/base/gsgc.h
index ad59d753a..ad59d753a 100644
--- a/gs/src/gsgc.h
+++ b/gs/base/gsgc.h
diff --git a/gs/src/gsgcache.c b/gs/base/gsgcache.c
index 26598b78f..26598b78f 100644
--- a/gs/src/gsgcache.c
+++ b/gs/base/gsgcache.c
diff --git a/gs/src/gsgcache.h b/gs/base/gsgcache.h
index 2837cfe2e..2837cfe2e 100644
--- a/gs/src/gsgcache.h
+++ b/gs/base/gsgcache.h
diff --git a/gs/src/gsgdata.c b/gs/base/gsgdata.c
index 4864a585a..4864a585a 100644
--- a/gs/src/gsgdata.c
+++ b/gs/base/gsgdata.c
diff --git a/gs/src/gsgdata.h b/gs/base/gsgdata.h
index 294e6c72e..294e6c72e 100644
--- a/gs/src/gsgdata.h
+++ b/gs/base/gsgdata.h
diff --git a/gs/src/gshsb.c b/gs/base/gshsb.c
index 5ab444027..5ab444027 100644
--- a/gs/src/gshsb.c
+++ b/gs/base/gshsb.c
diff --git a/gs/src/gshsb.h b/gs/base/gshsb.h
index 2845c8614..2845c8614 100644
--- a/gs/src/gshsb.h
+++ b/gs/base/gshsb.h
diff --git a/gs/src/gsht.c b/gs/base/gsht.c
index ea36626e0..ea36626e0 100644
--- a/gs/src/gsht.c
+++ b/gs/base/gsht.c
diff --git a/gs/src/gsht.h b/gs/base/gsht.h
index dd4309c0b..dd4309c0b 100644
--- a/gs/src/gsht.h
+++ b/gs/base/gsht.h
diff --git a/gs/src/gsht1.c b/gs/base/gsht1.c
index bbe091f48..bbe091f48 100644
--- a/gs/src/gsht1.c
+++ b/gs/base/gsht1.c
diff --git a/gs/src/gsht1.h b/gs/base/gsht1.h
index e5ebb7058..e5ebb7058 100644
--- a/gs/src/gsht1.h
+++ b/gs/base/gsht1.h
diff --git a/gs/src/gshtscr.c b/gs/base/gshtscr.c
index 519520a61..519520a61 100644
--- a/gs/src/gshtscr.c
+++ b/gs/base/gshtscr.c
diff --git a/gs/src/gshtx.c b/gs/base/gshtx.c
index ae767c2cc..ae767c2cc 100644
--- a/gs/src/gshtx.c
+++ b/gs/base/gshtx.c
diff --git a/gs/src/gshtx.h b/gs/base/gshtx.h
index ab5db52aa..ab5db52aa 100644
--- a/gs/src/gshtx.h
+++ b/gs/base/gshtx.h
diff --git a/gs/src/gsicc.c b/gs/base/gsicc.c
index 6f2ca82f1..6f2ca82f1 100644
--- a/gs/src/gsicc.c
+++ b/gs/base/gsicc.c
diff --git a/gs/src/gsicc.h b/gs/base/gsicc.h
index b40836cde..b40836cde 100644
--- a/gs/src/gsicc.h
+++ b/gs/base/gsicc.h
diff --git a/gs/src/gsimage.c b/gs/base/gsimage.c
index d1679a74a..d1679a74a 100644
--- a/gs/src/gsimage.c
+++ b/gs/base/gsimage.c
diff --git a/gs/src/gsimage.h b/gs/base/gsimage.h
index c57ef3de1..c57ef3de1 100644
--- a/gs/src/gsimage.h
+++ b/gs/base/gsimage.h
diff --git a/gs/src/gsimpath.c b/gs/base/gsimpath.c
index f3daae66e..f3daae66e 100644
--- a/gs/src/gsimpath.c
+++ b/gs/base/gsimpath.c
diff --git a/gs/src/gsinit.c b/gs/base/gsinit.c
index f3a6a2133..f3a6a2133 100644
--- a/gs/src/gsinit.c
+++ b/gs/base/gsinit.c
diff --git a/gs/src/gsio.h b/gs/base/gsio.h
index c88553339..c88553339 100644
--- a/gs/src/gsio.h
+++ b/gs/base/gsio.h
diff --git a/gs/src/gsiodev.c b/gs/base/gsiodev.c
index d4ceec73d..d4ceec73d 100644
--- a/gs/src/gsiodev.c
+++ b/gs/base/gsiodev.c
diff --git a/gs/src/gsiodevs.c b/gs/base/gsiodevs.c
index 364167c36..364167c36 100644
--- a/gs/src/gsiodevs.c
+++ b/gs/base/gsiodevs.c
diff --git a/gs/src/gsiodisk.c b/gs/base/gsiodisk.c
index 151c0024b..151c0024b 100644
--- a/gs/src/gsiodisk.c
+++ b/gs/base/gsiodisk.c
diff --git a/gs/src/gsiomacres.c b/gs/base/gsiomacres.c
index ba828a605..ba828a605 100644
--- a/gs/src/gsiomacres.c
+++ b/gs/base/gsiomacres.c
diff --git a/gs/src/gsiorom.c b/gs/base/gsiorom.c
index 61493b15f..61493b15f 100644
--- a/gs/src/gsiorom.c
+++ b/gs/base/gsiorom.c
diff --git a/gs/src/gsiorom.h b/gs/base/gsiorom.h
index 720706d79..720706d79 100644
--- a/gs/src/gsiorom.h
+++ b/gs/base/gsiorom.h
diff --git a/gs/src/gsipar3x.h b/gs/base/gsipar3x.h
index f1d9dfb63..f1d9dfb63 100644
--- a/gs/src/gsipar3x.h
+++ b/gs/base/gsipar3x.h
diff --git a/gs/src/gsiparam.h b/gs/base/gsiparam.h
index 502776ba2..502776ba2 100644
--- a/gs/src/gsiparam.h
+++ b/gs/base/gsiparam.h
diff --git a/gs/src/gsiparm2.h b/gs/base/gsiparm2.h
index 72f3da83d..72f3da83d 100644
--- a/gs/src/gsiparm2.h
+++ b/gs/base/gsiparm2.h
diff --git a/gs/src/gsiparm3.h b/gs/base/gsiparm3.h
index 5cab5a4a2..5cab5a4a2 100644
--- a/gs/src/gsiparm3.h
+++ b/gs/base/gsiparm3.h
diff --git a/gs/src/gsiparm4.h b/gs/base/gsiparm4.h
index 8a488d9a1..8a488d9a1 100644
--- a/gs/src/gsiparm4.h
+++ b/gs/base/gsiparm4.h
diff --git a/gs/src/gsistate.c b/gs/base/gsistate.c
index 0c7562656..0c7562656 100644
--- a/gs/src/gsistate.c
+++ b/gs/base/gsistate.c
diff --git a/gs/src/gsjconf.h b/gs/base/gsjconf.h
index ba0036cb4..ba0036cb4 100644
--- a/gs/src/gsjconf.h
+++ b/gs/base/gsjconf.h
diff --git a/gs/src/gsjmorec.h b/gs/base/gsjmorec.h
index 743e42d4f..743e42d4f 100644
--- a/gs/src/gsjmorec.h
+++ b/gs/base/gsjmorec.h
diff --git a/gs/src/gslib.c b/gs/base/gslib.c
index ed6fd06fa..ed6fd06fa 100644
--- a/gs/src/gslib.c
+++ b/gs/base/gslib.c
diff --git a/gs/src/gslib.h b/gs/base/gslib.h
index d92bc49b0..d92bc49b0 100644
--- a/gs/src/gslib.h
+++ b/gs/base/gslib.h
diff --git a/gs/src/gslibctx.c b/gs/base/gslibctx.c
index bcfc7c843..bcfc7c843 100644
--- a/gs/src/gslibctx.c
+++ b/gs/base/gslibctx.c
diff --git a/gs/src/gslibctx.h b/gs/base/gslibctx.h
index c3ef56c71..c3ef56c71 100644
--- a/gs/src/gslibctx.h
+++ b/gs/base/gslibctx.h
diff --git a/gs/src/gsline.c b/gs/base/gsline.c
index 39b9a3d52..39b9a3d52 100644
--- a/gs/src/gsline.c
+++ b/gs/base/gsline.c
diff --git a/gs/src/gsline.h b/gs/base/gsline.h
index 40966d869..40966d869 100644
--- a/gs/src/gsline.h
+++ b/gs/base/gsline.h
diff --git a/gs/src/gslparam.h b/gs/base/gslparam.h
index 58e685e5b..58e685e5b 100644
--- a/gs/src/gslparam.h
+++ b/gs/base/gslparam.h
diff --git a/gs/src/gsmalloc.c b/gs/base/gsmalloc.c
index 707966a04..707966a04 100644
--- a/gs/src/gsmalloc.c
+++ b/gs/base/gsmalloc.c
diff --git a/gs/src/gsmalloc.h b/gs/base/gsmalloc.h
index 8e831bfbc..8e831bfbc 100644
--- a/gs/src/gsmalloc.h
+++ b/gs/base/gsmalloc.h
diff --git a/gs/src/gsmatrix.c b/gs/base/gsmatrix.c
index 4e9b34a90..4e9b34a90 100644
--- a/gs/src/gsmatrix.c
+++ b/gs/base/gsmatrix.c
diff --git a/gs/src/gsmatrix.h b/gs/base/gsmatrix.h
index 09be6d2b2..09be6d2b2 100644
--- a/gs/src/gsmatrix.h
+++ b/gs/base/gsmatrix.h
diff --git a/gs/src/gsmchunk.c b/gs/base/gsmchunk.c
index 6cbcaf791..6cbcaf791 100644
--- a/gs/src/gsmchunk.c
+++ b/gs/base/gsmchunk.c
diff --git a/gs/src/gsmchunk.h b/gs/base/gsmchunk.h
index 23575c205..23575c205 100644
--- a/gs/src/gsmchunk.h
+++ b/gs/base/gsmchunk.h
diff --git a/gs/src/gsmdebug.h b/gs/base/gsmdebug.h
index 5e0d13231..5e0d13231 100644
--- a/gs/src/gsmdebug.h
+++ b/gs/base/gsmdebug.h
diff --git a/gs/src/gsmemlok.c b/gs/base/gsmemlok.c
index 1b0392420..1b0392420 100644
--- a/gs/src/gsmemlok.c
+++ b/gs/base/gsmemlok.c
diff --git a/gs/src/gsmemlok.h b/gs/base/gsmemlok.h
index 7cd610d56..7cd610d56 100644
--- a/gs/src/gsmemlok.h
+++ b/gs/base/gsmemlok.h
diff --git a/gs/src/gsmemory.c b/gs/base/gsmemory.c
index 621b67c27..621b67c27 100644
--- a/gs/src/gsmemory.c
+++ b/gs/base/gsmemory.c
diff --git a/gs/src/gsmemory.h b/gs/base/gsmemory.h
index dbc7955ba..dbc7955ba 100644
--- a/gs/src/gsmemory.h
+++ b/gs/base/gsmemory.h
diff --git a/gs/src/gsmemraw.h b/gs/base/gsmemraw.h
index 384b5de0e..384b5de0e 100644
--- a/gs/src/gsmemraw.h
+++ b/gs/base/gsmemraw.h
diff --git a/gs/src/gsmemret.c b/gs/base/gsmemret.c
index cf3905b81..cf3905b81 100644
--- a/gs/src/gsmemret.c
+++ b/gs/base/gsmemret.c
diff --git a/gs/src/gsmemret.h b/gs/base/gsmemret.h
index aed149dc2..aed149dc2 100644
--- a/gs/src/gsmemret.h
+++ b/gs/base/gsmemret.h
diff --git a/gs/src/gsmisc.c b/gs/base/gsmisc.c
index 17c5ee76c..17c5ee76c 100644
--- a/gs/src/gsmisc.c
+++ b/gs/base/gsmisc.c
diff --git a/gs/src/gsnamecl.c b/gs/base/gsnamecl.c
index 1c6a618e3..1c6a618e3 100644
--- a/gs/src/gsnamecl.c
+++ b/gs/base/gsnamecl.c
diff --git a/gs/src/gsnamecl.h b/gs/base/gsnamecl.h
index 3da50cb07..3da50cb07 100644
--- a/gs/src/gsnamecl.h
+++ b/gs/base/gsnamecl.h
diff --git a/gs/src/gsncdummy.c b/gs/base/gsncdummy.c
index 06abb8d34..06abb8d34 100644
--- a/gs/src/gsncdummy.c
+++ b/gs/base/gsncdummy.c
diff --git a/gs/src/gsncdummy.h b/gs/base/gsncdummy.h
index 542668a0e..542668a0e 100644
--- a/gs/src/gsncdummy.h
+++ b/gs/base/gsncdummy.h
diff --git a/gs/src/gsnogc.c b/gs/base/gsnogc.c
index 95318f673..95318f673 100644
--- a/gs/src/gsnogc.c
+++ b/gs/base/gsnogc.c
diff --git a/gs/src/gsnogc.h b/gs/base/gsnogc.h
index b8666983e..b8666983e 100644
--- a/gs/src/gsnogc.h
+++ b/gs/base/gsnogc.h
diff --git a/gs/src/gsnorop.c b/gs/base/gsnorop.c
index e3a48d821..e3a48d821 100644
--- a/gs/src/gsnorop.c
+++ b/gs/base/gsnorop.c
diff --git a/gs/src/gsnotify.c b/gs/base/gsnotify.c
index 170fa485a..170fa485a 100644
--- a/gs/src/gsnotify.c
+++ b/gs/base/gsnotify.c
diff --git a/gs/src/gsnotify.h b/gs/base/gsnotify.h
index b94308869..b94308869 100644
--- a/gs/src/gsnotify.h
+++ b/gs/base/gsnotify.h
diff --git a/gs/src/gsos2.def b/gs/base/gsos2.def
index 227a9fc1e..227a9fc1e 100644
--- a/gs/src/gsos2.def
+++ b/gs/base/gsos2.def
diff --git a/gs/src/gsos2.icx b/gs/base/gsos2.icx
index 8e02eb848..8e02eb848 100644
--- a/gs/src/gsos2.icx
+++ b/gs/base/gsos2.icx
diff --git a/gs/src/gsos2.rc b/gs/base/gsos2.rc
index 3d4fc9f31..3d4fc9f31 100644
--- a/gs/src/gsos2.rc
+++ b/gs/base/gsos2.rc
diff --git a/gs/src/gsovrc.c b/gs/base/gsovrc.c
index 7e3b96834..7e3b96834 100644
--- a/gs/src/gsovrc.c
+++ b/gs/base/gsovrc.c
diff --git a/gs/src/gsovrc.h b/gs/base/gsovrc.h
index 885869e1b..885869e1b 100644
--- a/gs/src/gsovrc.h
+++ b/gs/base/gsovrc.h
diff --git a/gs/src/gspaint.c b/gs/base/gspaint.c
index 2206513cc..2206513cc 100644
--- a/gs/src/gspaint.c
+++ b/gs/base/gspaint.c
diff --git a/gs/src/gspaint.h b/gs/base/gspaint.h
index f4fecc893..f4fecc893 100644
--- a/gs/src/gspaint.h
+++ b/gs/base/gspaint.h
diff --git a/gs/src/gsparam.c b/gs/base/gsparam.c
index 75ca001a4..75ca001a4 100644
--- a/gs/src/gsparam.c
+++ b/gs/base/gsparam.c
diff --git a/gs/src/gsparam.h b/gs/base/gsparam.h
index 8b51b3ecc..8b51b3ecc 100644
--- a/gs/src/gsparam.h
+++ b/gs/base/gsparam.h
diff --git a/gs/src/gsparam2.c b/gs/base/gsparam2.c
index 89817e410..89817e410 100644
--- a/gs/src/gsparam2.c
+++ b/gs/base/gsparam2.c
diff --git a/gs/src/gsparams.c b/gs/base/gsparams.c
index 910b679ea..910b679ea 100644
--- a/gs/src/gsparams.c
+++ b/gs/base/gsparams.c
diff --git a/gs/src/gsparams.h b/gs/base/gsparams.h
index e93f8032c..e93f8032c 100644
--- a/gs/src/gsparams.h
+++ b/gs/base/gsparams.h
diff --git a/gs/src/gsparamx.c b/gs/base/gsparamx.c
index d88a1a10b..d88a1a10b 100644
--- a/gs/src/gsparamx.c
+++ b/gs/base/gsparamx.c
diff --git a/gs/src/gsparamx.h b/gs/base/gsparamx.h
index 90dfc58c0..90dfc58c0 100644
--- a/gs/src/gsparamx.h
+++ b/gs/base/gsparamx.h
diff --git a/gs/src/gspath.c b/gs/base/gspath.c
index 0d6d5bed3..0d6d5bed3 100644
--- a/gs/src/gspath.c
+++ b/gs/base/gspath.c
diff --git a/gs/src/gspath.h b/gs/base/gspath.h
index 637ea20d3..637ea20d3 100644
--- a/gs/src/gspath.h
+++ b/gs/base/gspath.h
diff --git a/gs/src/gspath1.c b/gs/base/gspath1.c
index df0b826c5..df0b826c5 100644
--- a/gs/src/gspath1.c
+++ b/gs/base/gspath1.c
diff --git a/gs/src/gspath2.h b/gs/base/gspath2.h
index 6762839b1..6762839b1 100644
--- a/gs/src/gspath2.h
+++ b/gs/base/gspath2.h
diff --git a/gs/src/gspcolor.c b/gs/base/gspcolor.c
index f4cb13551..f4cb13551 100644
--- a/gs/src/gspcolor.c
+++ b/gs/base/gspcolor.c
diff --git a/gs/src/gspcolor.h b/gs/base/gspcolor.h
index 2b608e279..2b608e279 100644
--- a/gs/src/gspcolor.h
+++ b/gs/base/gspcolor.h
diff --git a/gs/src/gspenum.h b/gs/base/gspenum.h
index 0e480feec..0e480feec 100644
--- a/gs/src/gspenum.h
+++ b/gs/base/gspenum.h
diff --git a/gs/src/gspmdrv.c b/gs/base/gspmdrv.c
index 1bc7e6812..1bc7e6812 100644
--- a/gs/src/gspmdrv.c
+++ b/gs/base/gspmdrv.c
diff --git a/gs/src/gspmdrv.def b/gs/base/gspmdrv.def
index e85944624..e85944624 100644
--- a/gs/src/gspmdrv.def
+++ b/gs/base/gspmdrv.def
diff --git a/gs/src/gspmdrv.h b/gs/base/gspmdrv.h
index 5c01b22b2..5c01b22b2 100644
--- a/gs/src/gspmdrv.h
+++ b/gs/base/gspmdrv.h
diff --git a/gs/src/gspmdrv.icx b/gs/base/gspmdrv.icx
index 8e02eb848..8e02eb848 100644
--- a/gs/src/gspmdrv.icx
+++ b/gs/base/gspmdrv.icx
diff --git a/gs/src/gspmdrv.rc b/gs/base/gspmdrv.rc
index ae4a7edf7..ae4a7edf7 100644
--- a/gs/src/gspmdrv.rc
+++ b/gs/base/gspmdrv.rc
diff --git a/gs/src/gsptype1.c b/gs/base/gsptype1.c
index 59bcfc631..59bcfc631 100644
--- a/gs/src/gsptype1.c
+++ b/gs/base/gsptype1.c
diff --git a/gs/src/gsptype1.h b/gs/base/gsptype1.h
index a502a6abe..a502a6abe 100644
--- a/gs/src/gsptype1.h
+++ b/gs/base/gsptype1.h
diff --git a/gs/src/gsptype2.c b/gs/base/gsptype2.c
index 9b9a5da23..9b9a5da23 100644
--- a/gs/src/gsptype2.c
+++ b/gs/base/gsptype2.c
diff --git a/gs/src/gsptype2.h b/gs/base/gsptype2.h
index e98fdf198..e98fdf198 100644
--- a/gs/src/gsptype2.h
+++ b/gs/base/gsptype2.h
diff --git a/gs/src/gsrect.h b/gs/base/gsrect.h
index d550756b0..d550756b0 100644
--- a/gs/src/gsrect.h
+++ b/gs/base/gsrect.h
diff --git a/gs/src/gsrefct.h b/gs/base/gsrefct.h
index c6d957815..c6d957815 100644
--- a/gs/src/gsrefct.h
+++ b/gs/base/gsrefct.h
diff --git a/gs/src/gsromfs0.c b/gs/base/gsromfs0.c
index b59109ce3..c22c57689 100644
--- a/gs/src/gsromfs0.c
+++ b/gs/base/gsromfs0.c
@@ -11,7 +11,7 @@
    San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
 */
 
-/* $Id:$ */
+/* $Id$ */
 /* dummy gsromfs source module used when COMPILE_INITS=0 */
 
 #include "stdint_.h"
diff --git a/gs/src/gsrop.c b/gs/base/gsrop.c
index 2c5461527..2c5461527 100644
--- a/gs/src/gsrop.c
+++ b/gs/base/gsrop.c
diff --git a/gs/src/gsrop.h b/gs/base/gsrop.h
index 6c4303ce8..6c4303ce8 100644
--- a/gs/src/gsrop.h
+++ b/gs/base/gsrop.h
diff --git a/gs/src/gsropt.h b/gs/base/gsropt.h
index f5304ac54..f5304ac54 100644
--- a/gs/src/gsropt.h
+++ b/gs/base/gsropt.h
diff --git a/gs/src/gsroptab.c b/gs/base/gsroptab.c
index 6cbab7920..6cbab7920 100644
--- a/gs/src/gsroptab.c
+++ b/gs/base/gsroptab.c
diff --git a/gs/src/gsserial.c b/gs/base/gsserial.c
index b84d6296f..b84d6296f 100644
--- a/gs/src/gsserial.c
+++ b/gs/base/gsserial.c
diff --git a/gs/src/gsserial.h b/gs/base/gsserial.h
index 4d67f92cc..4d67f92cc 100644
--- a/gs/src/gsserial.h
+++ b/gs/base/gsserial.h
diff --git a/gs/src/gsshade.c b/gs/base/gsshade.c
index 5da78560f..5da78560f 100644
--- a/gs/src/gsshade.c
+++ b/gs/base/gsshade.c
diff --git a/gs/src/gsshade.h b/gs/base/gsshade.h
index 47d092ccf..47d092ccf 100644
--- a/gs/src/gsshade.h
+++ b/gs/base/gsshade.h
diff --git a/gs/src/gsstate.c b/gs/base/gsstate.c
index ca91345b4..ca91345b4 100644
--- a/gs/src/gsstate.c
+++ b/gs/base/gsstate.c
diff --git a/gs/src/gsstate.h b/gs/base/gsstate.h
index 55e8d332f..55e8d332f 100644
--- a/gs/src/gsstate.h
+++ b/gs/base/gsstate.h
diff --git a/gs/src/gsstruct.h b/gs/base/gsstruct.h
index ff66842ed..ff66842ed 100644
--- a/gs/src/gsstruct.h
+++ b/gs/base/gsstruct.h
diff --git a/gs/src/gsstype.h b/gs/base/gsstype.h
index f881cb788..f881cb788 100644
--- a/gs/src/gsstype.h
+++ b/gs/base/gsstype.h
diff --git a/gs/src/gstext.c b/gs/base/gstext.c
index 61212d648..61212d648 100644
--- a/gs/src/gstext.c
+++ b/gs/base/gstext.c
diff --git a/gs/src/gstext.h b/gs/base/gstext.h
index 00b12e705..00b12e705 100644
--- a/gs/src/gstext.h
+++ b/gs/base/gstext.h
diff --git a/gs/src/gstparam.h b/gs/base/gstparam.h
index a99da3adc..a99da3adc 100644
--- a/gs/src/gstparam.h
+++ b/gs/base/gstparam.h
diff --git a/gs/src/gstrans.c b/gs/base/gstrans.c
index 35ea7e40d..35ea7e40d 100644
--- a/gs/src/gstrans.c
+++ b/gs/base/gstrans.c
diff --git a/gs/src/gstrans.h b/gs/base/gstrans.h
index 98d6edf16..98d6edf16 100644
--- a/gs/src/gstrans.h
+++ b/gs/base/gstrans.h
diff --git a/gs/src/gstrap.c b/gs/base/gstrap.c
index 94faba4a9..94faba4a9 100644
--- a/gs/src/gstrap.c
+++ b/gs/base/gstrap.c
diff --git a/gs/src/gstrap.h b/gs/base/gstrap.h
index 8d979b3af..8d979b3af 100644
--- a/gs/src/gstrap.h
+++ b/gs/base/gstrap.h
diff --git a/gs/src/gstype1.c b/gs/base/gstype1.c
index d5b285213..d5b285213 100644
--- a/gs/src/gstype1.c
+++ b/gs/base/gstype1.c
diff --git a/gs/src/gstype1.h b/gs/base/gstype1.h
index 5112fd8b5..5112fd8b5 100644
--- a/gs/src/gstype1.h
+++ b/gs/base/gstype1.h
diff --git a/gs/src/gstype2.c b/gs/base/gstype2.c
index 9bd5098b8..9bd5098b8 100644
--- a/gs/src/gstype2.c
+++ b/gs/base/gstype2.c
diff --git a/gs/src/gstype42.c b/gs/base/gstype42.c
index 2827680f6..2827680f6 100644
--- a/gs/src/gstype42.c
+++ b/gs/base/gstype42.c
diff --git a/gs/src/gstypes.h b/gs/base/gstypes.h
index 2eb457381..2eb457381 100644
--- a/gs/src/gstypes.h
+++ b/gs/base/gstypes.h
diff --git a/gs/src/gsuid.h b/gs/base/gsuid.h
index 40ef8d086..40ef8d086 100644
--- a/gs/src/gsuid.h
+++ b/gs/base/gsuid.h
diff --git a/gs/src/gsutil.c b/gs/base/gsutil.c
index 767f8695b..767f8695b 100644
--- a/gs/src/gsutil.c
+++ b/gs/base/gsutil.c
diff --git a/gs/src/gsutil.h b/gs/base/gsutil.h
index eaa05bdcd..eaa05bdcd 100644
--- a/gs/src/gsutil.h
+++ b/gs/base/gsutil.h
diff --git a/gs/src/gswin.icx b/gs/base/gswin.icx
index e73cf65a3..e73cf65a3 100644
--- a/gs/src/gswin.icx
+++ b/gs/base/gswin.icx
diff --git a/gs/src/gswin.rc b/gs/base/gswin.rc
index f40e4cf8a..f40e4cf8a 100644
--- a/gs/src/gswin.rc
+++ b/gs/base/gswin.rc
diff --git a/gs/src/gswin16.icx b/gs/base/gswin16.icx
index f6b3c4b1a..f6b3c4b1a 100644
--- a/gs/src/gswin16.icx
+++ b/gs/base/gswin16.icx
diff --git a/gs/src/gswin32.rc b/gs/base/gswin32.rc
index c31ee41b5..c31ee41b5 100644
--- a/gs/src/gswin32.rc
+++ b/gs/base/gswin32.rc
diff --git a/gs/src/gswts.c b/gs/base/gswts.c
index e99a0aa5e..e99a0aa5e 100644
--- a/gs/src/gswts.c
+++ b/gs/base/gswts.c
diff --git a/gs/src/gswts.h b/gs/base/gswts.h
index 14e99d09a..14e99d09a 100644
--- a/gs/src/gswts.h
+++ b/gs/base/gswts.h
diff --git a/gs/src/gsxfont.h b/gs/base/gsxfont.h
index 474db1edc..474db1edc 100644
--- a/gs/src/gsxfont.h
+++ b/gs/base/gsxfont.h
diff --git a/gs/src/gx.h b/gs/base/gx.h
index 10ba4f355..10ba4f355 100644
--- a/gs/src/gx.h
+++ b/gs/base/gx.h
diff --git a/gs/src/gxacpath.c b/gs/base/gxacpath.c
index 1cbecda08..1cbecda08 100644
--- a/gs/src/gxacpath.c
+++ b/gs/base/gxacpath.c
diff --git a/gs/src/gxalloc.h b/gs/base/gxalloc.h
index 591d3f92d..591d3f92d 100644
--- a/gs/src/gxalloc.h
+++ b/gs/base/gxalloc.h
diff --git a/gs/src/gxalpha.h b/gs/base/gxalpha.h
index 6769cf398..6769cf398 100644
--- a/gs/src/gxalpha.h
+++ b/gs/base/gxalpha.h
diff --git a/gs/src/gxarith.h b/gs/base/gxarith.h
index 4ab0e445c..4ab0e445c 100644
--- a/gs/src/gxarith.h
+++ b/gs/base/gxarith.h
diff --git a/gs/src/gxband.h b/gs/base/gxband.h
index bd757d830..bd757d830 100644
--- a/gs/src/gxband.h
+++ b/gs/base/gxband.h
diff --git a/gs/src/gxbcache.c b/gs/base/gxbcache.c
index 35a5c9c4c..35a5c9c4c 100644
--- a/gs/src/gxbcache.c
+++ b/gs/base/gxbcache.c
diff --git a/gs/src/gxbcache.h b/gs/base/gxbcache.h
index 5f7d8c9d9..5f7d8c9d9 100644
--- a/gs/src/gxbcache.h
+++ b/gs/base/gxbcache.h
diff --git a/gs/src/gxbitfmt.h b/gs/base/gxbitfmt.h
index a4874d216..a4874d216 100644
--- a/gs/src/gxbitfmt.h
+++ b/gs/base/gxbitfmt.h
diff --git a/gs/src/gxbitmap.h b/gs/base/gxbitmap.h
index 8b14deee7..8b14deee7 100644
--- a/gs/src/gxbitmap.h
+++ b/gs/base/gxbitmap.h
diff --git a/gs/src/gxbitops.h b/gs/base/gxbitops.h
index 0e0c23de3..0e0c23de3 100644
--- a/gs/src/gxbitops.h
+++ b/gs/base/gxbitops.h
diff --git a/gs/src/gxblend.c b/gs/base/gxblend.c
index 04083ca62..04083ca62 100644
--- a/gs/src/gxblend.c
+++ b/gs/base/gxblend.c
diff --git a/gs/src/gxblend.h b/gs/base/gxblend.h
index 6e99a8f77..6e99a8f77 100644
--- a/gs/src/gxblend.h
+++ b/gs/base/gxblend.h
diff --git a/gs/src/gxccache.c b/gs/base/gxccache.c
index 6717665c7..6717665c7 100644
--- a/gs/src/gxccache.c
+++ b/gs/base/gxccache.c
diff --git a/gs/src/gxccman.c b/gs/base/gxccman.c
index 75b54aa50..75b54aa50 100644
--- a/gs/src/gxccman.c
+++ b/gs/base/gxccman.c
diff --git a/gs/src/gxcdevn.h b/gs/base/gxcdevn.h
index 6786b5912..6786b5912 100644
--- a/gs/src/gxcdevn.h
+++ b/gs/base/gxcdevn.h
diff --git a/gs/src/gxchar.c b/gs/base/gxchar.c
index 51e3e3a33..51e3e3a33 100644
--- a/gs/src/gxchar.c
+++ b/gs/base/gxchar.c
diff --git a/gs/src/gxchar.h b/gs/base/gxchar.h
index 97372ecc9..97372ecc9 100644
--- a/gs/src/gxchar.h
+++ b/gs/base/gxchar.h
diff --git a/gs/src/gxchrout.c b/gs/base/gxchrout.c
index 3442ac14c..3442ac14c 100644
--- a/gs/src/gxchrout.c
+++ b/gs/base/gxchrout.c
diff --git a/gs/src/gxchrout.h b/gs/base/gxchrout.h
index 2cc55e518..2cc55e518 100644
--- a/gs/src/gxchrout.h
+++ b/gs/base/gxchrout.h
diff --git a/gs/src/gxcht.c b/gs/base/gxcht.c
index ab9693d55..ab9693d55 100644
--- a/gs/src/gxcht.c
+++ b/gs/base/gxcht.c
diff --git a/gs/src/gxcid.h b/gs/base/gxcid.h
index 3a0f83964..3a0f83964 100644
--- a/gs/src/gxcid.h
+++ b/gs/base/gxcid.h
diff --git a/gs/src/gxcie.h b/gs/base/gxcie.h
index 071fc331a..071fc331a 100644
--- a/gs/src/gxcie.h
+++ b/gs/base/gxcie.h
diff --git a/gs/src/gxcindex.h b/gs/base/gxcindex.h
index 6598e33d7..6598e33d7 100644
--- a/gs/src/gxcindex.h
+++ b/gs/base/gxcindex.h
diff --git a/gs/src/gxclbits.c b/gs/base/gxclbits.c
index cbc01ee65..cbc01ee65 100644
--- a/gs/src/gxclbits.c
+++ b/gs/base/gxclbits.c
diff --git a/gs/src/gxcldev.h b/gs/base/gxcldev.h
index 5bcb9edb2..5bcb9edb2 100644
--- a/gs/src/gxcldev.h
+++ b/gs/base/gxcldev.h
diff --git a/gs/src/gxclfile.c b/gs/base/gxclfile.c
index 5152d9270..5152d9270 100644
--- a/gs/src/gxclfile.c
+++ b/gs/base/gxclfile.c
diff --git a/gs/src/gxclimag.c b/gs/base/gxclimag.c
index bd9c5c40a..bd9c5c40a 100644
--- a/gs/src/gxclimag.c
+++ b/gs/base/gxclimag.c
diff --git a/gs/src/gxclio.h b/gs/base/gxclio.h
index 038424c66..038424c66 100644
--- a/gs/src/gxclio.h
+++ b/gs/base/gxclio.h
diff --git a/gs/src/gxclip.c b/gs/base/gxclip.c
index 16504659f..16504659f 100644
--- a/gs/src/gxclip.c
+++ b/gs/base/gxclip.c
diff --git a/gs/src/gxclip.h b/gs/base/gxclip.h
index 6e9ea367b..6e9ea367b 100644
--- a/gs/src/gxclip.h
+++ b/gs/base/gxclip.h
diff --git a/gs/src/gxclip2.c b/gs/base/gxclip2.c
index a9de23a11..a9de23a11 100644
--- a/gs/src/gxclip2.c
+++ b/gs/base/gxclip2.c
diff --git a/gs/src/gxclip2.h b/gs/base/gxclip2.h
index 654007da5..654007da5 100644
--- a/gs/src/gxclip2.h
+++ b/gs/base/gxclip2.h
diff --git a/gs/src/gxclipm.c b/gs/base/gxclipm.c
index 3ece0ed2a..3ece0ed2a 100644
--- a/gs/src/gxclipm.c
+++ b/gs/base/gxclipm.c
diff --git a/gs/src/gxclipm.h b/gs/base/gxclipm.h
index acd99a832..acd99a832 100644
--- a/gs/src/gxclipm.h
+++ b/gs/base/gxclipm.h
diff --git a/gs/src/gxclipsr.h b/gs/base/gxclipsr.h
index 745995daa..745995daa 100644
--- a/gs/src/gxclipsr.h
+++ b/gs/base/gxclipsr.h
diff --git a/gs/src/gxclist.c b/gs/base/gxclist.c
index 5b9c70daf..5b9c70daf 100644
--- a/gs/src/gxclist.c
+++ b/gs/base/gxclist.c
diff --git a/gs/src/gxclist.h b/gs/base/gxclist.h
index a21adb849..a21adb849 100644
--- a/gs/src/gxclist.h
+++ b/gs/base/gxclist.h
diff --git a/gs/src/gxcllzw.c b/gs/base/gxcllzw.c
index 313cc982e..313cc982e 100644
--- a/gs/src/gxcllzw.c
+++ b/gs/base/gxcllzw.c
diff --git a/gs/src/gxclmem.c b/gs/base/gxclmem.c
index 7f1747ee2..7f1747ee2 100644
--- a/gs/src/gxclmem.c
+++ b/gs/base/gxclmem.c
diff --git a/gs/src/gxclmem.h b/gs/base/gxclmem.h
index 856d32015..856d32015 100644
--- a/gs/src/gxclmem.h
+++ b/gs/base/gxclmem.h
diff --git a/gs/src/gxclpage.c b/gs/base/gxclpage.c
index b542ba9ef..b542ba9ef 100644
--- a/gs/src/gxclpage.c
+++ b/gs/base/gxclpage.c
diff --git a/gs/src/gxclpage.h b/gs/base/gxclpage.h
index 636edb51e..636edb51e 100644
--- a/gs/src/gxclpage.h
+++ b/gs/base/gxclpage.h
diff --git a/gs/src/gxclpath.c b/gs/base/gxclpath.c
index 45533a2f2..45533a2f2 100644
--- a/gs/src/gxclpath.c
+++ b/gs/base/gxclpath.c
diff --git a/gs/src/gxclpath.h b/gs/base/gxclpath.h
index 914172ba5..914172ba5 100644
--- a/gs/src/gxclpath.h
+++ b/gs/base/gxclpath.h
diff --git a/gs/src/gxclrast.c b/gs/base/gxclrast.c
index 23e52524f..23e52524f 100644
--- a/gs/src/gxclrast.c
+++ b/gs/base/gxclrast.c
diff --git a/gs/src/gxclread.c b/gs/base/gxclread.c
index 00358b49d..00358b49d 100644
--- a/gs/src/gxclread.c
+++ b/gs/base/gxclread.c
diff --git a/gs/src/gxclrect.c b/gs/base/gxclrect.c
index 37368b06e..37368b06e 100644
--- a/gs/src/gxclrect.c
+++ b/gs/base/gxclrect.c
diff --git a/gs/src/gxclthrd.c b/gs/base/gxclthrd.c
index 3cad47e44..3cad47e44 100644
--- a/gs/src/gxclthrd.c
+++ b/gs/base/gxclthrd.c
diff --git a/gs/src/gxclthrd.h b/gs/base/gxclthrd.h
index 66b8d69d8..66b8d69d8 100644
--- a/gs/src/gxclthrd.h
+++ b/gs/base/gxclthrd.h
diff --git a/gs/src/gxclutil.c b/gs/base/gxclutil.c
index 36b3f57b5..36b3f57b5 100644
--- a/gs/src/gxclutil.c
+++ b/gs/base/gxclutil.c
diff --git a/gs/src/gxclzlib.c b/gs/base/gxclzlib.c
index 988d75d5a..988d75d5a 100644
--- a/gs/src/gxclzlib.c
+++ b/gs/base/gxclzlib.c
diff --git a/gs/src/gxcmap.c b/gs/base/gxcmap.c
index 238fd3482..238fd3482 100644
--- a/gs/src/gxcmap.c
+++ b/gs/base/gxcmap.c
diff --git a/gs/src/gxcmap.h b/gs/base/gxcmap.h
index 2046252cd..2046252cd 100644
--- a/gs/src/gxcmap.h
+++ b/gs/base/gxcmap.h
diff --git a/gs/src/gxcolor2.h b/gs/base/gxcolor2.h
index 2e8bc4ff8..2e8bc4ff8 100644
--- a/gs/src/gxcolor2.h
+++ b/gs/base/gxcolor2.h
diff --git a/gs/src/gxcomp.h b/gs/base/gxcomp.h
index d5cf842b3..d5cf842b3 100644
--- a/gs/src/gxcomp.h
+++ b/gs/base/gxcomp.h
diff --git a/gs/src/gxcoord.h b/gs/base/gxcoord.h
index 783c1a48b..783c1a48b 100644
--- a/gs/src/gxcoord.h
+++ b/gs/base/gxcoord.h
diff --git a/gs/src/gxcpath.c b/gs/base/gxcpath.c
index 775dc508e..775dc508e 100644
--- a/gs/src/gxcpath.c
+++ b/gs/base/gxcpath.c
diff --git a/gs/src/gxcpath.h b/gs/base/gxcpath.h
index 458987e99..458987e99 100644
--- a/gs/src/gxcpath.h
+++ b/gs/base/gxcpath.h
diff --git a/gs/src/gxcspace.h b/gs/base/gxcspace.h
index a8b94a942..a8b94a942 100644
--- a/gs/src/gxcspace.h
+++ b/gs/base/gxcspace.h
diff --git a/gs/src/gxctable.c b/gs/base/gxctable.c
index 54d494ee2..54d494ee2 100644
--- a/gs/src/gxctable.c
+++ b/gs/base/gxctable.c
diff --git a/gs/src/gxctable.h b/gs/base/gxctable.h
index 27a2fc23d..27a2fc23d 100644
--- a/gs/src/gxctable.h
+++ b/gs/base/gxctable.h
diff --git a/gs/src/gxcvalue.h b/gs/base/gxcvalue.h
index a633822a4..a633822a4 100644
--- a/gs/src/gxcvalue.h
+++ b/gs/base/gxcvalue.h
diff --git a/gs/src/gxdcconv.c b/gs/base/gxdcconv.c
index b1029a14c..b1029a14c 100644
--- a/gs/src/gxdcconv.c
+++ b/gs/base/gxdcconv.c
diff --git a/gs/src/gxdcconv.h b/gs/base/gxdcconv.h
index b7596123a..b7596123a 100644
--- a/gs/src/gxdcconv.h
+++ b/gs/base/gxdcconv.h
diff --git a/gs/src/gxdcolor.c b/gs/base/gxdcolor.c
index 2f84e6c48..2f84e6c48 100644
--- a/gs/src/gxdcolor.c
+++ b/gs/base/gxdcolor.c
diff --git a/gs/src/gxdcolor.h b/gs/base/gxdcolor.h
index 041e79354..041e79354 100644
--- a/gs/src/gxdcolor.h
+++ b/gs/base/gxdcolor.h
diff --git a/gs/src/gxdda.h b/gs/base/gxdda.h
index f4c6f0245..f4c6f0245 100644
--- a/gs/src/gxdda.h
+++ b/gs/base/gxdda.h
diff --git a/gs/src/gxdevbuf.h b/gs/base/gxdevbuf.h
index d8755458a..d8755458a 100644
--- a/gs/src/gxdevbuf.h
+++ b/gs/base/gxdevbuf.h
diff --git a/gs/src/gxdevcli.h b/gs/base/gxdevcli.h
index cae4716a7..cae4716a7 100644
--- a/gs/src/gxdevcli.h
+++ b/gs/base/gxdevcli.h
diff --git a/gs/src/gxdevice.h b/gs/base/gxdevice.h
index 9adff5a67..9adff5a67 100644
--- a/gs/src/gxdevice.h
+++ b/gs/base/gxdevice.h
diff --git a/gs/src/gxdevmem.h b/gs/base/gxdevmem.h
index bf51692f8..bf51692f8 100644
--- a/gs/src/gxdevmem.h
+++ b/gs/base/gxdevmem.h
diff --git a/gs/src/gxdevndi.c b/gs/base/gxdevndi.c
index 4b0bdb125..4b0bdb125 100644
--- a/gs/src/gxdevndi.c
+++ b/gs/base/gxdevndi.c
diff --git a/gs/src/gxdevndi.h b/gs/base/gxdevndi.h
index 941215c03..941215c03 100644
--- a/gs/src/gxdevndi.h
+++ b/gs/base/gxdevndi.h
diff --git a/gs/src/gxdevrop.h b/gs/base/gxdevrop.h
index cbbe757e7..cbbe757e7 100644
--- a/gs/src/gxdevrop.h
+++ b/gs/base/gxdevrop.h
diff --git a/gs/src/gxdht.h b/gs/base/gxdht.h
index d4b53dc1a..d4b53dc1a 100644
--- a/gs/src/gxdht.h
+++ b/gs/base/gxdht.h
diff --git a/gs/src/gxdhtres.h b/gs/base/gxdhtres.h
index f0acb6d93..f0acb6d93 100644
--- a/gs/src/gxdhtres.h
+++ b/gs/base/gxdhtres.h
diff --git a/gs/src/gxdhtserial.c b/gs/base/gxdhtserial.c
index 8f300faa8..8f300faa8 100644
--- a/gs/src/gxdhtserial.c
+++ b/gs/base/gxdhtserial.c
diff --git a/gs/src/gxdhtserial.h b/gs/base/gxdhtserial.h
index 9573fb689..9573fb689 100644
--- a/gs/src/gxdhtserial.h
+++ b/gs/base/gxdhtserial.h
diff --git a/gs/src/gxdither.h b/gs/base/gxdither.h
index a5deb6526..a5deb6526 100644
--- a/gs/src/gxdither.h
+++ b/gs/base/gxdither.h
diff --git a/gs/src/gxdtfill.h b/gs/base/gxdtfill.h
index 55717d269..55717d269 100644
--- a/gs/src/gxdtfill.h
+++ b/gs/base/gxdtfill.h
diff --git a/gs/src/gxfapiu.c b/gs/base/gxfapiu.c
index 9788a7b11..9788a7b11 100644
--- a/gs/src/gxfapiu.c
+++ b/gs/base/gxfapiu.c
diff --git a/gs/src/gxfapiu.h b/gs/base/gxfapiu.h
index 27529921f..27529921f 100644
--- a/gs/src/gxfapiu.h
+++ b/gs/base/gxfapiu.h
diff --git a/gs/src/gxfarith.h b/gs/base/gxfarith.h
index 4349bc92b..4349bc92b 100644
--- a/gs/src/gxfarith.h
+++ b/gs/base/gxfarith.h
diff --git a/gs/src/gxfcache.h b/gs/base/gxfcache.h
index f4b2e54bf..f4b2e54bf 100644
--- a/gs/src/gxfcache.h
+++ b/gs/base/gxfcache.h
diff --git a/gs/src/gxfcid.h b/gs/base/gxfcid.h
index c2051a6b8..c2051a6b8 100644
--- a/gs/src/gxfcid.h
+++ b/gs/base/gxfcid.h
diff --git a/gs/src/gxfcmap.h b/gs/base/gxfcmap.h
index f7232d6df..f7232d6df 100644
--- a/gs/src/gxfcmap.h
+++ b/gs/base/gxfcmap.h
diff --git a/gs/src/gxfcmap1.h b/gs/base/gxfcmap1.h
index 5f3cca08e..5f3cca08e 100644
--- a/gs/src/gxfcmap1.h
+++ b/gs/base/gxfcmap1.h
diff --git a/gs/src/gxfcopy.c b/gs/base/gxfcopy.c
index 630ff8906..630ff8906 100644
--- a/gs/src/gxfcopy.c
+++ b/gs/base/gxfcopy.c
diff --git a/gs/src/gxfcopy.h b/gs/base/gxfcopy.h
index da2ee6126..da2ee6126 100644
--- a/gs/src/gxfcopy.h
+++ b/gs/base/gxfcopy.h
diff --git a/gs/src/gxfdrop.c b/gs/base/gxfdrop.c
index 5831f3855..5831f3855 100644
--- a/gs/src/gxfdrop.c
+++ b/gs/base/gxfdrop.c
diff --git a/gs/src/gxfdrop.h b/gs/base/gxfdrop.h
index 8e22089a1..8e22089a1 100644
--- a/gs/src/gxfdrop.h
+++ b/gs/base/gxfdrop.h
diff --git a/gs/src/gxfill.c b/gs/base/gxfill.c
index 366feadbf..366feadbf 100644
--- a/gs/src/gxfill.c
+++ b/gs/base/gxfill.c
diff --git a/gs/src/gxfill.h b/gs/base/gxfill.h
index 532006a7e..532006a7e 100644
--- a/gs/src/gxfill.h
+++ b/gs/base/gxfill.h
diff --git a/gs/src/gxfillsl.h b/gs/base/gxfillsl.h
index cc5dd516e..cc5dd516e 100644
--- a/gs/src/gxfillsl.h
+++ b/gs/base/gxfillsl.h
diff --git a/gs/src/gxfilltr.h b/gs/base/gxfilltr.h
index 78c6639d4..78c6639d4 100644
--- a/gs/src/gxfilltr.h
+++ b/gs/base/gxfilltr.h
diff --git a/gs/src/gxfillts.h b/gs/base/gxfillts.h
index b8caf7dfb..b8caf7dfb 100644
--- a/gs/src/gxfillts.h
+++ b/gs/base/gxfillts.h
diff --git a/gs/src/gxfixed.h b/gs/base/gxfixed.h
index 0bde74e4f..0bde74e4f 100644
--- a/gs/src/gxfixed.h
+++ b/gs/base/gxfixed.h
diff --git a/gs/src/gxfmap.h b/gs/base/gxfmap.h
index 24fe69ee9..24fe69ee9 100644
--- a/gs/src/gxfmap.h
+++ b/gs/base/gxfmap.h
diff --git a/gs/src/gxfont.h b/gs/base/gxfont.h
index c21a0e9c9..c21a0e9c9 100644
--- a/gs/src/gxfont.h
+++ b/gs/base/gxfont.h
diff --git a/gs/src/gxfont0.h b/gs/base/gxfont0.h
index b1bd2f173..b1bd2f173 100644
--- a/gs/src/gxfont0.h
+++ b/gs/base/gxfont0.h
diff --git a/gs/src/gxfont0c.h b/gs/base/gxfont0c.h
index 949724da9..949724da9 100644
--- a/gs/src/gxfont0c.h
+++ b/gs/base/gxfont0c.h
diff --git a/gs/src/gxfont1.h b/gs/base/gxfont1.h
index fd02475a3..fd02475a3 100644
--- a/gs/src/gxfont1.h
+++ b/gs/base/gxfont1.h
diff --git a/gs/src/gxfont42.h b/gs/base/gxfont42.h
index 7c3ccaaf0..7c3ccaaf0 100644
--- a/gs/src/gxfont42.h
+++ b/gs/base/gxfont42.h
diff --git a/gs/src/gxfrac.h b/gs/base/gxfrac.h
index 5365bf1d3..5365bf1d3 100644
--- a/gs/src/gxfrac.h
+++ b/gs/base/gxfrac.h
diff --git a/gs/src/gxftype.h b/gs/base/gxftype.h
index c9362ae7a..c9362ae7a 100644
--- a/gs/src/gxftype.h
+++ b/gs/base/gxftype.h
diff --git a/gs/src/gxfunc.h b/gs/base/gxfunc.h
index 2fe03a089..2fe03a089 100644
--- a/gs/src/gxfunc.h
+++ b/gs/base/gxfunc.h
diff --git a/gs/src/gxgetbit.h b/gs/base/gxgetbit.h
index f6edb9c0d..f6edb9c0d 100644
--- a/gs/src/gxgetbit.h
+++ b/gs/base/gxgetbit.h
diff --git a/gs/src/gxhintn.c b/gs/base/gxhintn.c
index 24209234c..24209234c 100644
--- a/gs/src/gxhintn.c
+++ b/gs/base/gxhintn.c
diff --git a/gs/src/gxhintn.h b/gs/base/gxhintn.h
index 93ba4eabb..93ba4eabb 100644
--- a/gs/src/gxhintn.h
+++ b/gs/base/gxhintn.h
diff --git a/gs/src/gxhintn1.c b/gs/base/gxhintn1.c
index aaa74f88d..aaa74f88d 100644
--- a/gs/src/gxhintn1.c
+++ b/gs/base/gxhintn1.c
diff --git a/gs/src/gxhldevc.c b/gs/base/gxhldevc.c
index 52c990ad5..52c990ad5 100644
--- a/gs/src/gxhldevc.c
+++ b/gs/base/gxhldevc.c
diff --git a/gs/src/gxhldevc.h b/gs/base/gxhldevc.h
index a93481801..a93481801 100644
--- a/gs/src/gxhldevc.h
+++ b/gs/base/gxhldevc.h
diff --git a/gs/src/gxht.c b/gs/base/gxht.c
index d49730ee2..d49730ee2 100644
--- a/gs/src/gxht.c
+++ b/gs/base/gxht.c
diff --git a/gs/src/gxht.h b/gs/base/gxht.h
index f5b026cd2..f5b026cd2 100644
--- a/gs/src/gxht.h
+++ b/gs/base/gxht.h
diff --git a/gs/src/gxhtbit.c b/gs/base/gxhtbit.c
index 7f2ef4847..7f2ef4847 100644
--- a/gs/src/gxhtbit.c
+++ b/gs/base/gxhtbit.c
diff --git a/gs/src/gxhttile.h b/gs/base/gxhttile.h
index 01c4c4902..01c4c4902 100644
--- a/gs/src/gxhttile.h
+++ b/gs/base/gxhttile.h
diff --git a/gs/src/gxhttype.h b/gs/base/gxhttype.h
index fc58dd9cc..fc58dd9cc 100644
--- a/gs/src/gxhttype.h
+++ b/gs/base/gxhttype.h
diff --git a/gs/src/gxi12bit.c b/gs/base/gxi12bit.c
index c1c7ffaa6..c1c7ffaa6 100644
--- a/gs/src/gxi12bit.c
+++ b/gs/base/gxi12bit.c
diff --git a/gs/src/gxi16bit.c b/gs/base/gxi16bit.c
index b9a04128c..b9a04128c 100644
--- a/gs/src/gxi16bit.c
+++ b/gs/base/gxi16bit.c
diff --git a/gs/src/gxiclass.h b/gs/base/gxiclass.h
index 01e5a8046..01e5a8046 100644
--- a/gs/src/gxiclass.h
+++ b/gs/base/gxiclass.h
diff --git a/gs/src/gxicolor.c b/gs/base/gxicolor.c
index 4a2dcb4c7..4a2dcb4c7 100644
--- a/gs/src/gxicolor.c
+++ b/gs/base/gxicolor.c
diff --git a/gs/src/gxidata.c b/gs/base/gxidata.c
index d18a1e09a..d18a1e09a 100644
--- a/gs/src/gxidata.c
+++ b/gs/base/gxidata.c
diff --git a/gs/src/gxifast.c b/gs/base/gxifast.c
index 76572bb6a..76572bb6a 100644
--- a/gs/src/gxifast.c
+++ b/gs/base/gxifast.c
diff --git a/gs/src/gximag3x.c b/gs/base/gximag3x.c
index 56b252ecd..56b252ecd 100644
--- a/gs/src/gximag3x.c
+++ b/gs/base/gximag3x.c
diff --git a/gs/src/gximag3x.h b/gs/base/gximag3x.h
index abebeb69c..abebeb69c 100644
--- a/gs/src/gximag3x.h
+++ b/gs/base/gximag3x.h
diff --git a/gs/src/gximage.c b/gs/base/gximage.c
index 9f94f0db0..9f94f0db0 100644
--- a/gs/src/gximage.c
+++ b/gs/base/gximage.c
diff --git a/gs/src/gximage.h b/gs/base/gximage.h
index d4bdcdbbe..d4bdcdbbe 100644
--- a/gs/src/gximage.h
+++ b/gs/base/gximage.h
diff --git a/gs/src/gximage1.c b/gs/base/gximage1.c
index 4581db87e..4581db87e 100644
--- a/gs/src/gximage1.c
+++ b/gs/base/gximage1.c
diff --git a/gs/src/gximage2.c b/gs/base/gximage2.c
index c45f71f40..c45f71f40 100644
--- a/gs/src/gximage2.c
+++ b/gs/base/gximage2.c
diff --git a/gs/src/gximage3.c b/gs/base/gximage3.c
index 3399cc1f8..3399cc1f8 100644
--- a/gs/src/gximage3.c
+++ b/gs/base/gximage3.c
diff --git a/gs/src/gximage3.h b/gs/base/gximage3.h
index 334bdf572..334bdf572 100644
--- a/gs/src/gximage3.h
+++ b/gs/base/gximage3.h
diff --git a/gs/src/gximage4.c b/gs/base/gximage4.c
index c36ea5c78..c36ea5c78 100644
--- a/gs/src/gximage4.c
+++ b/gs/base/gximage4.c
diff --git a/gs/src/gximask.c b/gs/base/gximask.c
index 7eadfddc7..7eadfddc7 100644
--- a/gs/src/gximask.c
+++ b/gs/base/gximask.c
diff --git a/gs/src/gximask.h b/gs/base/gximask.h
index d1bd10285..d1bd10285 100644
--- a/gs/src/gximask.h
+++ b/gs/base/gximask.h
diff --git a/gs/src/gximono.c b/gs/base/gximono.c
index 35c6b0477..35c6b0477 100644
--- a/gs/src/gximono.c
+++ b/gs/base/gximono.c
diff --git a/gs/src/gxino12b.c b/gs/base/gxino12b.c
index 8719c081f..8719c081f 100644
--- a/gs/src/gxino12b.c
+++ b/gs/base/gxino12b.c
diff --git a/gs/src/gxino16b.c b/gs/base/gxino16b.c
index d7c15e783..d7c15e783 100644
--- a/gs/src/gxino16b.c
+++ b/gs/base/gxino16b.c
diff --git a/gs/src/gxiodev.h b/gs/base/gxiodev.h
index 45321783b..45321783b 100644
--- a/gs/src/gxiodev.h
+++ b/gs/base/gxiodev.h
diff --git a/gs/src/gxiparam.h b/gs/base/gxiparam.h
index 39729976b..39729976b 100644
--- a/gs/src/gxiparam.h
+++ b/gs/base/gxiparam.h
diff --git a/gs/src/gxipixel.c b/gs/base/gxipixel.c
index 93fdc11cd..93fdc11cd 100644
--- a/gs/src/gxipixel.c
+++ b/gs/base/gxipixel.c
diff --git a/gs/src/gxiscale.c b/gs/base/gxiscale.c
index 847be1875..847be1875 100644
--- a/gs/src/gxiscale.c
+++ b/gs/base/gxiscale.c
diff --git a/gs/src/gxistate.h b/gs/base/gxistate.h
index b8e222717..b8e222717 100644
--- a/gs/src/gxistate.h
+++ b/gs/base/gxistate.h
diff --git a/gs/src/gxline.h b/gs/base/gxline.h
index 5b34f93cc..5b34f93cc 100644
--- a/gs/src/gxline.h
+++ b/gs/base/gxline.h
diff --git a/gs/src/gxlum.h b/gs/base/gxlum.h
index bda365bf4..bda365bf4 100644
--- a/gs/src/gxlum.h
+++ b/gs/base/gxlum.h
diff --git a/gs/src/gxmatrix.h b/gs/base/gxmatrix.h
index 68e560ab0..68e560ab0 100644
--- a/gs/src/gxmatrix.h
+++ b/gs/base/gxmatrix.h
diff --git a/gs/src/gxmclip.c b/gs/base/gxmclip.c
index bf43732d1..bf43732d1 100644
--- a/gs/src/gxmclip.c
+++ b/gs/base/gxmclip.c
diff --git a/gs/src/gxmclip.h b/gs/base/gxmclip.h
index a66121679..a66121679 100644
--- a/gs/src/gxmclip.h
+++ b/gs/base/gxmclip.h
diff --git a/gs/src/gxobj.h b/gs/base/gxobj.h
index 705f40ffc..705f40ffc 100644
--- a/gs/src/gxobj.h
+++ b/gs/base/gxobj.h
diff --git a/gs/src/gxoprect.c b/gs/base/gxoprect.c
index 3b5e20359..3b5e20359 100644
--- a/gs/src/gxoprect.c
+++ b/gs/base/gxoprect.c
diff --git a/gs/src/gxoprect.h b/gs/base/gxoprect.h
index cc4e80887..cc4e80887 100644
--- a/gs/src/gxoprect.h
+++ b/gs/base/gxoprect.h
diff --git a/gs/src/gxp1fill.c b/gs/base/gxp1fill.c
index 792df4423..792df4423 100644
--- a/gs/src/gxp1fill.c
+++ b/gs/base/gxp1fill.c
diff --git a/gs/src/gxp1impl.h b/gs/base/gxp1impl.h
index 28d75d0f3..28d75d0f3 100644
--- a/gs/src/gxp1impl.h
+++ b/gs/base/gxp1impl.h
diff --git a/gs/src/gxpageq.c b/gs/base/gxpageq.c
index 13dd2e095..13dd2e095 100644
--- a/gs/src/gxpageq.c
+++ b/gs/base/gxpageq.c
diff --git a/gs/src/gxpageq.h b/gs/base/gxpageq.h
index f6c68ea15..f6c68ea15 100644
--- a/gs/src/gxpageq.h
+++ b/gs/base/gxpageq.h
diff --git a/gs/src/gxpaint.c b/gs/base/gxpaint.c
index 50860bd28..50860bd28 100644
--- a/gs/src/gxpaint.c
+++ b/gs/base/gxpaint.c
diff --git a/gs/src/gxpaint.h b/gs/base/gxpaint.h
index c8c792668..c8c792668 100644
--- a/gs/src/gxpaint.h
+++ b/gs/base/gxpaint.h
diff --git a/gs/src/gxpath.c b/gs/base/gxpath.c
index fbf61cab7..fbf61cab7 100644
--- a/gs/src/gxpath.c
+++ b/gs/base/gxpath.c
diff --git a/gs/src/gxpath.h b/gs/base/gxpath.h
index c7c11153a..c7c11153a 100644
--- a/gs/src/gxpath.h
+++ b/gs/base/gxpath.h
diff --git a/gs/src/gxpath2.c b/gs/base/gxpath2.c
index 66a4d29ff..66a4d29ff 100644
--- a/gs/src/gxpath2.c
+++ b/gs/base/gxpath2.c
diff --git a/gs/src/gxpcache.h b/gs/base/gxpcache.h
index 597d3c349..597d3c349 100644
--- a/gs/src/gxpcache.h
+++ b/gs/base/gxpcache.h
diff --git a/gs/src/gxpcmap.c b/gs/base/gxpcmap.c
index ebe217aef..ebe217aef 100644
--- a/gs/src/gxpcmap.c
+++ b/gs/base/gxpcmap.c
diff --git a/gs/src/gxpcolor.h b/gs/base/gxpcolor.h
index 55f63ee41..55f63ee41 100644
--- a/gs/src/gxpcolor.h
+++ b/gs/base/gxpcolor.h
diff --git a/gs/src/gxpcopy.c b/gs/base/gxpcopy.c
index 7b61c1430..7b61c1430 100644
--- a/gs/src/gxpcopy.c
+++ b/gs/base/gxpcopy.c
diff --git a/gs/src/gxpdash.c b/gs/base/gxpdash.c
index 7bced2033..7bced2033 100644
--- a/gs/src/gxpdash.c
+++ b/gs/base/gxpdash.c
diff --git a/gs/src/gxpflat.c b/gs/base/gxpflat.c
index fa106d467..fa106d467 100644
--- a/gs/src/gxpflat.c
+++ b/gs/base/gxpflat.c
diff --git a/gs/src/gxrplane.h b/gs/base/gxrplane.h
index b2b257969..b2b257969 100644
--- a/gs/src/gxrplane.h
+++ b/gs/base/gxrplane.h
diff --git a/gs/src/gxsample.c b/gs/base/gxsample.c
index 8b633e0bc..8b633e0bc 100644
--- a/gs/src/gxsample.c
+++ b/gs/base/gxsample.c
diff --git a/gs/src/gxsample.h b/gs/base/gxsample.h
index 00f7bd3f0..00f7bd3f0 100644
--- a/gs/src/gxsample.h
+++ b/gs/base/gxsample.h
diff --git a/gs/src/gxsamplp.h b/gs/base/gxsamplp.h
index 657ac34c5..657ac34c5 100644
--- a/gs/src/gxsamplp.h
+++ b/gs/base/gxsamplp.h
diff --git a/gs/src/gxshade.c b/gs/base/gxshade.c
index 032bb0eb6..032bb0eb6 100644
--- a/gs/src/gxshade.c
+++ b/gs/base/gxshade.c
diff --git a/gs/src/gxshade.h b/gs/base/gxshade.h
index 5bcbfa8ba..5bcbfa8ba 100644
--- a/gs/src/gxshade.h
+++ b/gs/base/gxshade.h
diff --git a/gs/src/gxshade1.c b/gs/base/gxshade1.c
index afaba5779..afaba5779 100644
--- a/gs/src/gxshade1.c
+++ b/gs/base/gxshade1.c
diff --git a/gs/src/gxshade4.c b/gs/base/gxshade4.c
index 2ae31794f..2ae31794f 100644
--- a/gs/src/gxshade4.c
+++ b/gs/base/gxshade4.c
diff --git a/gs/src/gxshade4.h b/gs/base/gxshade4.h
index 1734c019d..1734c019d 100644
--- a/gs/src/gxshade4.h
+++ b/gs/base/gxshade4.h
diff --git a/gs/src/gxshade6.c b/gs/base/gxshade6.c
index 9673632af..9673632af 100644
--- a/gs/src/gxshade6.c
+++ b/gs/base/gxshade6.c
diff --git a/gs/src/gxstate.h b/gs/base/gxstate.h
index 03ea37a32..03ea37a32 100644
--- a/gs/src/gxstate.h
+++ b/gs/base/gxstate.h
diff --git a/gs/src/gxstdio.h b/gs/base/gxstdio.h
index b08bdecf8..b08bdecf8 100644
--- a/gs/src/gxstdio.h
+++ b/gs/base/gxstdio.h
diff --git a/gs/src/gxstroke.c b/gs/base/gxstroke.c
index 817c6ead4..817c6ead4 100644
--- a/gs/src/gxstroke.c
+++ b/gs/base/gxstroke.c
diff --git a/gs/src/gxsync.c b/gs/base/gxsync.c
index 1a7709809..1a7709809 100644
--- a/gs/src/gxsync.c
+++ b/gs/base/gxsync.c
diff --git a/gs/src/gxsync.h b/gs/base/gxsync.h
index 3783356af..3783356af 100644
--- a/gs/src/gxsync.h
+++ b/gs/base/gxsync.h
diff --git a/gs/src/gxtext.h b/gs/base/gxtext.h
index 49b00ce60..49b00ce60 100644
--- a/gs/src/gxtext.h
+++ b/gs/base/gxtext.h
diff --git a/gs/src/gxtmap.h b/gs/base/gxtmap.h
index 4d0418967..4d0418967 100644
--- a/gs/src/gxtmap.h
+++ b/gs/base/gxtmap.h
diff --git a/gs/src/gxttf.h b/gs/base/gxttf.h
index 5cec802ac..5cec802ac 100644
--- a/gs/src/gxttf.h
+++ b/gs/base/gxttf.h
diff --git a/gs/src/gxttfb.c b/gs/base/gxttfb.c
index ad20bd057..ad20bd057 100644
--- a/gs/src/gxttfb.c
+++ b/gs/base/gxttfb.c
diff --git a/gs/src/gxttfb.h b/gs/base/gxttfb.h
index 5e3e93323..5e3e93323 100644
--- a/gs/src/gxttfb.h
+++ b/gs/base/gxttfb.h
diff --git a/gs/src/gxtype1.c b/gs/base/gxtype1.c
index 18e236e93..18e236e93 100644
--- a/gs/src/gxtype1.c
+++ b/gs/base/gxtype1.c
diff --git a/gs/src/gxtype1.h b/gs/base/gxtype1.h
index 22721dd2f..22721dd2f 100644
--- a/gs/src/gxtype1.h
+++ b/gs/base/gxtype1.h
diff --git a/gs/src/gxwts.c b/gs/base/gxwts.c
index 7752c20fc..7752c20fc 100644
--- a/gs/src/gxwts.c
+++ b/gs/base/gxwts.c
diff --git a/gs/src/gxwts.h b/gs/base/gxwts.h
index 35bd6a7d1..35bd6a7d1 100644
--- a/gs/src/gxwts.h
+++ b/gs/base/gxwts.h
diff --git a/gs/src/gxxfont.h b/gs/base/gxxfont.h
index 3c635047b..3c635047b 100644
--- a/gs/src/gxxfont.h
+++ b/gs/base/gxxfont.h
diff --git a/gs/src/gzacpath.h b/gs/base/gzacpath.h
index 3927cd0a1..3927cd0a1 100644
--- a/gs/src/gzacpath.h
+++ b/gs/base/gzacpath.h
diff --git a/gs/src/gzcpath.h b/gs/base/gzcpath.h
index 682a2bf35..682a2bf35 100644
--- a/gs/src/gzcpath.h
+++ b/gs/base/gzcpath.h
diff --git a/gs/src/gzht.h b/gs/base/gzht.h
index 850e5c599..850e5c599 100644
--- a/gs/src/gzht.h
+++ b/gs/base/gzht.h
diff --git a/gs/src/gzline.h b/gs/base/gzline.h
index 8ae0532ff..8ae0532ff 100644
--- a/gs/src/gzline.h
+++ b/gs/base/gzline.h
diff --git a/gs/src/gzpath.h b/gs/base/gzpath.h
index 7e01b5594..7e01b5594 100644
--- a/gs/src/gzpath.h
+++ b/gs/base/gzpath.h
diff --git a/gs/src/gzspotan.c b/gs/base/gzspotan.c
index 4af16a3b7..4af16a3b7 100644
--- a/gs/src/gzspotan.c
+++ b/gs/base/gzspotan.c
diff --git a/gs/src/gzspotan.h b/gs/base/gzspotan.h
index a58584519..a58584519 100644
--- a/gs/src/gzspotan.h
+++ b/gs/base/gzspotan.h
diff --git a/gs/src/gzstate.h b/gs/base/gzstate.h
index 9063e3799..9063e3799 100644
--- a/gs/src/gzstate.h
+++ b/gs/base/gzstate.h
diff --git a/gs/src/icclib.mak b/gs/base/icclib.mak
index ef4140e11..ef4140e11 100644
--- a/gs/src/icclib.mak
+++ b/gs/base/icclib.mak
diff --git a/gs/src/ijs.mak b/gs/base/ijs.mak
index 6e8ac75e6..6e8ac75e6 100644
--- a/gs/src/ijs.mak
+++ b/gs/base/ijs.mak
diff --git a/gs/src/instcopy b/gs/base/instcopy
index 3e72be9a1..3e72be9a1 100755
--- a/gs/src/instcopy
+++ b/gs/base/instcopy
diff --git a/gs/src/jasper.mak b/gs/base/jasper.mak
index f92ef2f77..f92ef2f77 100644
--- a/gs/src/jasper.mak
+++ b/gs/base/jasper.mak
diff --git a/gs/src/jbig2.mak b/gs/base/jbig2.mak
index 5faa63177..5faa63177 100644
--- a/gs/src/jbig2.mak
+++ b/gs/base/jbig2.mak
diff --git a/gs/src/jerror_.h b/gs/base/jerror_.h
index 5fbd78c1f..5fbd78c1f 100644
--- a/gs/src/jerror_.h
+++ b/gs/base/jerror_.h
diff --git a/gs/src/jpeg.mak b/gs/base/jpeg.mak
index 4cf7b5eee..4cf7b5eee 100644
--- a/gs/src/jpeg.mak
+++ b/gs/base/jpeg.mak
diff --git a/gs/src/ldf_jb2.mak b/gs/base/ldf_jb2.mak
index 52f74ecd9..52f74ecd9 100644
--- a/gs/src/ldf_jb2.mak
+++ b/gs/base/ldf_jb2.mak
diff --git a/gs/src/lib.mak b/gs/base/lib.mak
index 18c5a14ed..18c5a14ed 100644
--- a/gs/src/lib.mak
+++ b/gs/base/lib.mak
diff --git a/gs/src/libpng.mak b/gs/base/libpng.mak
index c2f8b3355..c2f8b3355 100644
--- a/gs/src/libpng.mak
+++ b/gs/base/libpng.mak
diff --git a/gs/src/lwf_jp2.mak b/gs/base/lwf_jp2.mak
index 591f7b4c8..591f7b4c8 100644
--- a/gs/src/lwf_jp2.mak
+++ b/gs/base/lwf_jp2.mak
diff --git a/gs/src/macgenmcpxml.sh b/gs/base/macgenmcpxml.sh
index 4541fa855..4541fa855 100644
--- a/gs/src/macgenmcpxml.sh
+++ b/gs/base/macgenmcpxml.sh
diff --git a/gs/src/macos-fw.mak b/gs/base/macos-fw.mak
index 771f32d81..771f32d81 100644
--- a/gs/src/macos-fw.mak
+++ b/gs/base/macos-fw.mak
diff --git a/gs/src/macos-mcp.mak b/gs/base/macos-mcp.mak
index ead0a40b7..c7318c3f9 100644
--- a/gs/src/macos-mcp.mak
+++ b/gs/base/macos-mcp.mak
@@ -26,10 +26,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=./bin
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./obj
 GLOBJDIR=./obj
-PSSRCDIR=./src
+PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
 PSGENDIR=./obj
diff --git a/gs/src/macos_carbon_d_pre.h b/gs/base/macos_carbon_d_pre.h
index 5da3f31cb..5da3f31cb 100644
--- a/gs/src/macos_carbon_d_pre.h
+++ b/gs/base/macos_carbon_d_pre.h
diff --git a/gs/src/macos_carbon_pre.h b/gs/base/macos_carbon_pre.h
index 4e331c58b..4e331c58b 100644
--- a/gs/src/macos_carbon_pre.h
+++ b/gs/base/macos_carbon_pre.h
diff --git a/gs/src/macos_classic_d_pre.h b/gs/base/macos_classic_d_pre.h
index 6d1903680..6d1903680 100644
--- a/gs/src/macos_classic_d_pre.h
+++ b/gs/base/macos_classic_d_pre.h
diff --git a/gs/src/macosx.mak b/gs/base/macosx.mak
index ef753c764..10c06b802 100644
--- a/gs/src/macosx.mak
+++ b/gs/base/macosx.mak
@@ -22,10 +22,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=./bin
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./obj
 GLOBJDIR=./obj
-PSSRCDIR=./src
+PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
 PSGENDIR=./obj
diff --git a/gs/src/macsystypes.h b/gs/base/macsystypes.h
index c099aa2ff..c099aa2ff 100644
--- a/gs/src/macsystypes.h
+++ b/gs/base/macsystypes.h
diff --git a/gs/src/malloc_.h b/gs/base/malloc_.h
index 550b684e1..550b684e1 100644
--- a/gs/src/malloc_.h
+++ b/gs/base/malloc_.h
diff --git a/gs/src/math_.h b/gs/base/math_.h
index 9f451ee20..9f451ee20 100644
--- a/gs/src/math_.h
+++ b/gs/base/math_.h
diff --git a/gs/src/md5.c b/gs/base/md5.c
index f77a884f8..f77a884f8 100644
--- a/gs/src/md5.c
+++ b/gs/base/md5.c
diff --git a/gs/src/md5.h b/gs/base/md5.h
index df63b0a72..df63b0a72 100644
--- a/gs/src/md5.h
+++ b/gs/base/md5.h
diff --git a/gs/src/md5main.c b/gs/base/md5main.c
index e2f7db133..e2f7db133 100644
--- a/gs/src/md5main.c
+++ b/gs/base/md5main.c
diff --git a/gs/src/memory_.h b/gs/base/memory_.h
index 4aafc29f6..4aafc29f6 100644
--- a/gs/src/memory_.h
+++ b/gs/base/memory_.h
diff --git a/gs/src/mkromfs.c b/gs/base/mkromfs.c
index 65a88023b..65a88023b 100644
--- a/gs/src/mkromfs.c
+++ b/gs/base/mkromfs.c
diff --git a/gs/src/msvccmd.mak b/gs/base/msvccmd.mak
index 443b10c6a..443b10c6a 100644
--- a/gs/src/msvccmd.mak
+++ b/gs/base/msvccmd.mak
diff --git a/gs/src/msvclib.mak b/gs/base/msvclib.mak
index 8d330c1e7..d4f7a5362 100644
--- a/gs/src/msvclib.mak
+++ b/gs/base/msvclib.mak
@@ -97,7 +97,7 @@ GS=gslib
 BINDIR=.\bin
 !endif
 !ifndef GLSRCDIR
-GLSRCDIR=.\src
+GLSRCDIR=.\base
 !ifndef PSRESDIR
 PSRESDIR=.\Resource
 !endif
diff --git a/gs/src/msvctail.mak b/gs/base/msvctail.mak
index b26645ec9..b26645ec9 100644
--- a/gs/src/msvctail.mak
+++ b/gs/base/msvctail.mak
diff --git a/gs/src/mv.bat b/gs/base/mv.bat
index c63313a13..c63313a13 100755
--- a/gs/src/mv.bat
+++ b/gs/base/mv.bat
diff --git a/gs/src/mv.cmd b/gs/base/mv.cmd
index 79e08c26f..79e08c26f 100755
--- a/gs/src/mv.cmd
+++ b/gs/base/mv.cmd
diff --git a/gs/src/openvms.mak b/gs/base/openvms.mak
index 2cd361505..a846102dd 100644
--- a/gs/src/openvms.mak
+++ b/gs/base/openvms.mak
@@ -31,10 +31,10 @@
 # current directory ([]).
 
 BINDIR=[.bin]
-GLSRCDIR=[.src]
+GLSRCDIR=[.base]
 GLGENDIR=[.obj]
 GLOBJDIR=[.obj]
-PSSRCDIR=[.src]
+PSSRCDIR=[.psi]
 PSLIBDIR=[.lib]
 PSGENDIR=[.obj]
 PSOBJDIR=[.obj]
diff --git a/gs/src/openvms.mmk b/gs/base/openvms.mmk
index d0358d964..857fb1f3c 100644
--- a/gs/src/openvms.mmk
+++ b/gs/base/openvms.mmk
@@ -23,17 +23,17 @@
 ###### This section is the only part of the file you should need to edit.
 
 # on the make command line specify:
-#	mmk/descrip=[.src]openvms.mmk/macro=("DECWINDOWS1_2={0,1}")
+#	mmk/descrip=[.base]openvms.mmk/macro=("DECWINDOWS1_2={0,1}")
 
 # Define the directory for the final executable, and the
 # source, generated intermediate file, and object directories
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=[.bin]
-GLSRCDIR=[.src]
+GLSRCDIR=[.base]
 GLGENDIR=[.obj]
 GLOBJDIR=[.obj]
-PSSRCDIR=[.src]
+PSSRCDIR=[.psi]
 PSGENDIR=[.obj]
 PSOBJDIR=[.obj]
 PSLIBDIR=[.lib]
diff --git a/gs/src/os2.mak b/gs/base/os2.mak
index d01fd130a..bc3948000 100644
--- a/gs/src/os2.mak
+++ b/gs/base/os2.mak
@@ -28,10 +28,10 @@
 # This makefile has never been tested with any other values than these,
 # and almost certainly won't work with other values.
 BINDIR=bin
-GLSRCDIR=src
+GLSRCDIR=base
 GLGENDIR=obj
 GLOBJDIR=obj
-PSSRCDIR=src
+PSSRCDIR=psi
 PSLIBDIR=lib
 PSRESDIR=Resource
 PSGENDIR=obj
diff --git a/gs/src/pcwin.mak b/gs/base/pcwin.mak
index 00f82b57d..00f82b57d 100644
--- a/gs/src/pcwin.mak
+++ b/gs/base/pcwin.mak
diff --git a/gs/src/pipe_.h b/gs/base/pipe_.h
index e4b7ffffd..e4b7ffffd 100644
--- a/gs/src/pipe_.h
+++ b/gs/base/pipe_.h
diff --git a/gs/src/png_.h b/gs/base/png_.h
index c641b22b3..c641b22b3 100644
--- a/gs/src/png_.h
+++ b/gs/base/png_.h
diff --git a/gs/src/psromfs.mak b/gs/base/psromfs.mak
index de09309c7..de09309c7 100644
--- a/gs/src/psromfs.mak
+++ b/gs/base/psromfs.mak
diff --git a/gs/src/rinkj/evenbetter-rll.c b/gs/base/rinkj/evenbetter-rll.c
index 5abd2a69e..5abd2a69e 100644
--- a/gs/src/rinkj/evenbetter-rll.c
+++ b/gs/base/rinkj/evenbetter-rll.c
diff --git a/gs/src/rinkj/evenbetter-rll.h b/gs/base/rinkj/evenbetter-rll.h
index 1f6b9eaba..1f6b9eaba 100644
--- a/gs/src/rinkj/evenbetter-rll.h
+++ b/gs/base/rinkj/evenbetter-rll.h
diff --git a/gs/src/rinkj/rinkj-byte-stream.c b/gs/base/rinkj/rinkj-byte-stream.c
index 6158ef18f..6158ef18f 100644
--- a/gs/src/rinkj/rinkj-byte-stream.c
+++ b/gs/base/rinkj/rinkj-byte-stream.c
diff --git a/gs/src/rinkj/rinkj-byte-stream.h b/gs/base/rinkj/rinkj-byte-stream.h
index 4f7c96ff6..4f7c96ff6 100644
--- a/gs/src/rinkj/rinkj-byte-stream.h
+++ b/gs/base/rinkj/rinkj-byte-stream.h
diff --git a/gs/src/rinkj/rinkj-config.c b/gs/base/rinkj/rinkj-config.c
index 0498efe7e..0498efe7e 100644
--- a/gs/src/rinkj/rinkj-config.c
+++ b/gs/base/rinkj/rinkj-config.c
diff --git a/gs/src/rinkj/rinkj-config.h b/gs/base/rinkj/rinkj-config.h
index aeeae505e..aeeae505e 100644
--- a/gs/src/rinkj/rinkj-config.h
+++ b/gs/base/rinkj/rinkj-config.h
diff --git a/gs/src/rinkj/rinkj-device.c b/gs/base/rinkj/rinkj-device.c
index a0acdd1f9..a0acdd1f9 100644
--- a/gs/src/rinkj/rinkj-device.c
+++ b/gs/base/rinkj/rinkj-device.c
diff --git a/gs/src/rinkj/rinkj-device.h b/gs/base/rinkj/rinkj-device.h
index d9b2de3b5..d9b2de3b5 100644
--- a/gs/src/rinkj/rinkj-device.h
+++ b/gs/base/rinkj/rinkj-device.h
diff --git a/gs/src/rinkj/rinkj-dither.c b/gs/base/rinkj/rinkj-dither.c
index 00f0b5b93..00f0b5b93 100644
--- a/gs/src/rinkj/rinkj-dither.c
+++ b/gs/base/rinkj/rinkj-dither.c
diff --git a/gs/src/rinkj/rinkj-dither.h b/gs/base/rinkj/rinkj-dither.h
index ae9babc9d..ae9babc9d 100644
--- a/gs/src/rinkj/rinkj-dither.h
+++ b/gs/base/rinkj/rinkj-dither.h
diff --git a/gs/src/rinkj/rinkj-epson870.c b/gs/base/rinkj/rinkj-epson870.c
index 7e3ac344e..7e3ac344e 100644
--- a/gs/src/rinkj/rinkj-epson870.c
+++ b/gs/base/rinkj/rinkj-epson870.c
diff --git a/gs/src/rinkj/rinkj-epson870.h b/gs/base/rinkj/rinkj-epson870.h
index ecf878342..ecf878342 100644
--- a/gs/src/rinkj/rinkj-epson870.h
+++ b/gs/base/rinkj/rinkj-epson870.h
diff --git a/gs/src/rinkj/rinkj-screen-eb.c b/gs/base/rinkj/rinkj-screen-eb.c
index 5c4397305..5c4397305 100644
--- a/gs/src/rinkj/rinkj-screen-eb.c
+++ b/gs/base/rinkj/rinkj-screen-eb.c
diff --git a/gs/src/rinkj/rinkj-screen-eb.h b/gs/base/rinkj/rinkj-screen-eb.h
index b96ac6a5a..b96ac6a5a 100644
--- a/gs/src/rinkj/rinkj-screen-eb.h
+++ b/gs/base/rinkj/rinkj-screen-eb.h
diff --git a/gs/src/rm.bat b/gs/base/rm.bat
index 1b1ecbb96..1b1ecbb96 100755
--- a/gs/src/rm.bat
+++ b/gs/base/rm.bat
diff --git a/gs/src/rm.cmd b/gs/base/rm.cmd
index 85b5c5be6..85b5c5be6 100755
--- a/gs/src/rm.cmd
+++ b/gs/base/rm.cmd
diff --git a/gs/src/rm_all.com b/gs/base/rm_all.com
index 998fef8ea..998fef8ea 100644
--- a/gs/src/rm_all.com
+++ b/gs/base/rm_all.com
diff --git a/gs/src/rm_one.com b/gs/base/rm_one.com
index 39594ac1d..39594ac1d 100644
--- a/gs/src/rm_one.com
+++ b/gs/base/rm_one.com
diff --git a/gs/src/sa85d.c b/gs/base/sa85d.c
index 693944f89..693944f89 100644
--- a/gs/src/sa85d.c
+++ b/gs/base/sa85d.c
diff --git a/gs/src/sa85d.h b/gs/base/sa85d.h
index 7de0b8d84..7de0b8d84 100644
--- a/gs/src/sa85d.h
+++ b/gs/base/sa85d.h
diff --git a/gs/src/sa85x.h b/gs/base/sa85x.h
index 27f18c044..27f18c044 100644
--- a/gs/src/sa85x.h
+++ b/gs/base/sa85x.h
diff --git a/gs/src/sarc4.c b/gs/base/sarc4.c
index fe75e4a15..fe75e4a15 100644
--- a/gs/src/sarc4.c
+++ b/gs/base/sarc4.c
diff --git a/gs/src/sarc4.h b/gs/base/sarc4.h
index 9b1d927a6..9b1d927a6 100644
--- a/gs/src/sarc4.h
+++ b/gs/base/sarc4.h
diff --git a/gs/src/sbcp.c b/gs/base/sbcp.c
index 169968b74..169968b74 100644
--- a/gs/src/sbcp.c
+++ b/gs/base/sbcp.c
diff --git a/gs/src/sbcp.h b/gs/base/sbcp.h
index a975b2a49..a975b2a49 100644
--- a/gs/src/sbcp.h
+++ b/gs/base/sbcp.h
diff --git a/gs/src/sbhc.c b/gs/base/sbhc.c
index 58c3b03e6..58c3b03e6 100644
--- a/gs/src/sbhc.c
+++ b/gs/base/sbhc.c
diff --git a/gs/src/sbhc.h b/gs/base/sbhc.h
index 38e421b8f..38e421b8f 100644
--- a/gs/src/sbhc.h
+++ b/gs/base/sbhc.h
diff --git a/gs/src/sbtx.h b/gs/base/sbtx.h
index 80aa87e22..80aa87e22 100644
--- a/gs/src/sbtx.h
+++ b/gs/base/sbtx.h
diff --git a/gs/src/sbwbs.c b/gs/base/sbwbs.c
index 384b42d83..384b42d83 100644
--- a/gs/src/sbwbs.c
+++ b/gs/base/sbwbs.c
diff --git a/gs/src/sbwbs.h b/gs/base/sbwbs.h
index 14348ede8..14348ede8 100644
--- a/gs/src/sbwbs.h
+++ b/gs/base/sbwbs.h
diff --git a/gs/src/scanchar.h b/gs/base/scanchar.h
index a8fc1ee9a..a8fc1ee9a 100644
--- a/gs/src/scanchar.h
+++ b/gs/base/scanchar.h
diff --git a/gs/src/scantab.c b/gs/base/scantab.c
index 2c16928dc..2c16928dc 100644
--- a/gs/src/scantab.c
+++ b/gs/base/scantab.c
diff --git a/gs/src/scf.h b/gs/base/scf.h
index cfcc54f33..cfcc54f33 100644
--- a/gs/src/scf.h
+++ b/gs/base/scf.h
diff --git a/gs/src/scfd.c b/gs/base/scfd.c
index 186e62a5b..186e62a5b 100644
--- a/gs/src/scfd.c
+++ b/gs/base/scfd.c
diff --git a/gs/src/scfdgen.c b/gs/base/scfdgen.c
index 08acaf345..08acaf345 100644
--- a/gs/src/scfdgen.c
+++ b/gs/base/scfdgen.c
diff --git a/gs/src/scfdtab.c b/gs/base/scfdtab.c
index 194faf23e..194faf23e 100644
--- a/gs/src/scfdtab.c
+++ b/gs/base/scfdtab.c
diff --git a/gs/src/scfe.c b/gs/base/scfe.c
index 314463ac9..314463ac9 100644
--- a/gs/src/scfe.c
+++ b/gs/base/scfe.c
diff --git a/gs/src/scfetab.c b/gs/base/scfetab.c
index abd0bcc8b..abd0bcc8b 100644
--- a/gs/src/scfetab.c
+++ b/gs/base/scfetab.c
diff --git a/gs/src/scfparam.c b/gs/base/scfparam.c
index 925d43146..925d43146 100644
--- a/gs/src/scfparam.c
+++ b/gs/base/scfparam.c
diff --git a/gs/src/scfx.h b/gs/base/scfx.h
index c1fbf05dd..c1fbf05dd 100644
--- a/gs/src/scfx.h
+++ b/gs/base/scfx.h
diff --git a/gs/src/scommon.h b/gs/base/scommon.h
index 21b5465b8..21b5465b8 100644
--- a/gs/src/scommon.h
+++ b/gs/base/scommon.h
diff --git a/gs/src/sdcparam.c b/gs/base/sdcparam.c
index 3ab3a59b1..3ab3a59b1 100644
--- a/gs/src/sdcparam.c
+++ b/gs/base/sdcparam.c
diff --git a/gs/src/sdcparam.h b/gs/base/sdcparam.h
index 33e1e277b..33e1e277b 100644
--- a/gs/src/sdcparam.h
+++ b/gs/base/sdcparam.h
diff --git a/gs/src/sdct.h b/gs/base/sdct.h
index 973183083..973183083 100644
--- a/gs/src/sdct.h
+++ b/gs/base/sdct.h
diff --git a/gs/src/sdctc.c b/gs/base/sdctc.c
index 0653f87d5..0653f87d5 100644
--- a/gs/src/sdctc.c
+++ b/gs/base/sdctc.c
diff --git a/gs/src/sdctd.c b/gs/base/sdctd.c
index eebecf60f..eebecf60f 100644
--- a/gs/src/sdctd.c
+++ b/gs/base/sdctd.c
diff --git a/gs/src/sdcte.c b/gs/base/sdcte.c
index d7dd868fe..d7dd868fe 100644
--- a/gs/src/sdcte.c
+++ b/gs/base/sdcte.c
diff --git a/gs/src/sddparam.c b/gs/base/sddparam.c
index 2d91919fc..2d91919fc 100644
--- a/gs/src/sddparam.c
+++ b/gs/base/sddparam.c
diff --git a/gs/src/sdeparam.c b/gs/base/sdeparam.c
index 5381c059b..5381c059b 100644
--- a/gs/src/sdeparam.c
+++ b/gs/base/sdeparam.c
diff --git a/gs/src/seexec.c b/gs/base/seexec.c
index 6fab20ba4..6fab20ba4 100644
--- a/gs/src/seexec.c
+++ b/gs/base/seexec.c
diff --git a/gs/src/setjmp_.h b/gs/base/setjmp_.h
index 563fb95b0..563fb95b0 100644
--- a/gs/src/setjmp_.h
+++ b/gs/base/setjmp_.h
diff --git a/gs/src/sfilter.h b/gs/base/sfilter.h
index bbd6785ae..bbd6785ae 100644
--- a/gs/src/sfilter.h
+++ b/gs/base/sfilter.h
diff --git a/gs/src/sfilter2.c b/gs/base/sfilter2.c
index 3497584c8..3497584c8 100644
--- a/gs/src/sfilter2.c
+++ b/gs/base/sfilter2.c
diff --git a/gs/src/sfxboth.c b/gs/base/sfxboth.c
index 17dd37f13..17dd37f13 100644
--- a/gs/src/sfxboth.c
+++ b/gs/base/sfxboth.c
diff --git a/gs/src/sfxcommon.c b/gs/base/sfxcommon.c
index e2857a30c..e2857a30c 100644
--- a/gs/src/sfxcommon.c
+++ b/gs/base/sfxcommon.c
diff --git a/gs/src/sfxfd.c b/gs/base/sfxfd.c
index a672e913f..a672e913f 100644
--- a/gs/src/sfxfd.c
+++ b/gs/base/sfxfd.c
diff --git a/gs/src/sfxstdio.c b/gs/base/sfxstdio.c
index 6d68583a4..6d68583a4 100644
--- a/gs/src/sfxstdio.c
+++ b/gs/base/sfxstdio.c
diff --git a/gs/src/shc.c b/gs/base/shc.c
index 58e3999ed..58e3999ed 100644
--- a/gs/src/shc.c
+++ b/gs/base/shc.c
diff --git a/gs/src/shc.h b/gs/base/shc.h
index 30f7d91c5..30f7d91c5 100644
--- a/gs/src/shc.h
+++ b/gs/base/shc.h
diff --git a/gs/src/shcgen.c b/gs/base/shcgen.c
index 5460590b1..5460590b1 100644
--- a/gs/src/shcgen.c
+++ b/gs/base/shcgen.c
diff --git a/gs/src/shcgen.h b/gs/base/shcgen.h
index 986088869..986088869 100644
--- a/gs/src/shcgen.h
+++ b/gs/base/shcgen.h
diff --git a/gs/src/sidscale.c b/gs/base/sidscale.c
index 63eeb55be..63eeb55be 100644
--- a/gs/src/sidscale.c
+++ b/gs/base/sidscale.c
diff --git a/gs/src/sidscale.h b/gs/base/sidscale.h
index b5aadf19e..b5aadf19e 100644
--- a/gs/src/sidscale.h
+++ b/gs/base/sidscale.h
diff --git a/gs/src/siinterp.c b/gs/base/siinterp.c
index fe72ab213..fe72ab213 100644
--- a/gs/src/siinterp.c
+++ b/gs/base/siinterp.c
diff --git a/gs/src/siinterp.h b/gs/base/siinterp.h
index b99188b1f..b99188b1f 100644
--- a/gs/src/siinterp.h
+++ b/gs/base/siinterp.h
diff --git a/gs/src/simscale.c b/gs/base/simscale.c
index 7b1b22d5e..7b1b22d5e 100644
--- a/gs/src/simscale.c
+++ b/gs/base/simscale.c
diff --git a/gs/src/simscale.h b/gs/base/simscale.h
index a2eddc93e..a2eddc93e 100644
--- a/gs/src/simscale.h
+++ b/gs/base/simscale.h
diff --git a/gs/src/siscale.c b/gs/base/siscale.c
index 2b3e5b51e..2b3e5b51e 100644
--- a/gs/src/siscale.c
+++ b/gs/base/siscale.c
diff --git a/gs/src/siscale.h b/gs/base/siscale.h
index 0dc478b51..0dc478b51 100644
--- a/gs/src/siscale.h
+++ b/gs/base/siscale.h
diff --git a/gs/src/sisparam.h b/gs/base/sisparam.h
index 4197cd9a1..4197cd9a1 100644
--- a/gs/src/sisparam.h
+++ b/gs/base/sisparam.h
diff --git a/gs/src/sjbig2.c b/gs/base/sjbig2.c
index 4716c5ded..4716c5ded 100644
--- a/gs/src/sjbig2.c
+++ b/gs/base/sjbig2.c
diff --git a/gs/src/sjbig2.h b/gs/base/sjbig2.h
index a76efa8c5..a76efa8c5 100644
--- a/gs/src/sjbig2.h
+++ b/gs/base/sjbig2.h
diff --git a/gs/src/sjbig2_luratech.c b/gs/base/sjbig2_luratech.c
index ee8adcd0d..ee8adcd0d 100644
--- a/gs/src/sjbig2_luratech.c
+++ b/gs/base/sjbig2_luratech.c
diff --git a/gs/src/sjbig2_luratech.h b/gs/base/sjbig2_luratech.h
index 15a34d5ff..15a34d5ff 100644
--- a/gs/src/sjbig2_luratech.h
+++ b/gs/base/sjbig2_luratech.h
diff --git a/gs/src/sjpeg.h b/gs/base/sjpeg.h
index a95329263..a95329263 100644
--- a/gs/src/sjpeg.h
+++ b/gs/base/sjpeg.h
diff --git a/gs/src/sjpegc.c b/gs/base/sjpegc.c
index d7a810234..d7a810234 100644
--- a/gs/src/sjpegc.c
+++ b/gs/base/sjpegc.c
diff --git a/gs/src/sjpegd.c b/gs/base/sjpegd.c
index d9193972e..d9193972e 100644
--- a/gs/src/sjpegd.c
+++ b/gs/base/sjpegd.c
diff --git a/gs/src/sjpege.c b/gs/base/sjpege.c
index 70403ab3a..70403ab3a 100644
--- a/gs/src/sjpege.c
+++ b/gs/base/sjpege.c
diff --git a/gs/src/sjpx.c b/gs/base/sjpx.c
index 117c7cd41..117c7cd41 100644
--- a/gs/src/sjpx.c
+++ b/gs/base/sjpx.c
diff --git a/gs/src/sjpx.h b/gs/base/sjpx.h
index 3335ffc21..3335ffc21 100644
--- a/gs/src/sjpx.h
+++ b/gs/base/sjpx.h
diff --git a/gs/src/sjpx_luratech.c b/gs/base/sjpx_luratech.c
index 042f57b8c..042f57b8c 100644
--- a/gs/src/sjpx_luratech.c
+++ b/gs/base/sjpx_luratech.c
diff --git a/gs/src/sjpx_luratech.h b/gs/base/sjpx_luratech.h
index e53fe5294..e53fe5294 100644
--- a/gs/src/sjpx_luratech.h
+++ b/gs/base/sjpx_luratech.h
diff --git a/gs/src/slzwc.c b/gs/base/slzwc.c
index 705f2652f..705f2652f 100644
--- a/gs/src/slzwc.c
+++ b/gs/base/slzwc.c
diff --git a/gs/src/slzwd.c b/gs/base/slzwd.c
index f45b12c50..f45b12c50 100644
--- a/gs/src/slzwd.c
+++ b/gs/base/slzwd.c
diff --git a/gs/src/slzwe.c b/gs/base/slzwe.c
index 771801fd5..771801fd5 100644
--- a/gs/src/slzwe.c
+++ b/gs/base/slzwe.c
diff --git a/gs/src/slzwx.h b/gs/base/slzwx.h
index a48d49276..a48d49276 100644
--- a/gs/src/slzwx.h
+++ b/gs/base/slzwx.h
diff --git a/gs/src/smd5.c b/gs/base/smd5.c
index 2b193d08f..2b193d08f 100644
--- a/gs/src/smd5.c
+++ b/gs/base/smd5.c
diff --git a/gs/src/smd5.h b/gs/base/smd5.h
index 5d97dccea..5d97dccea 100644
--- a/gs/src/smd5.h
+++ b/gs/base/smd5.h
diff --git a/gs/src/smtf.c b/gs/base/smtf.c
index 889dba004..889dba004 100644
--- a/gs/src/smtf.c
+++ b/gs/base/smtf.c
diff --git a/gs/src/smtf.h b/gs/base/smtf.h
index cf0f173b4..cf0f173b4 100644
--- a/gs/src/smtf.h
+++ b/gs/base/smtf.h
diff --git a/gs/src/spdiff.c b/gs/base/spdiff.c
index ce385c613..ce385c613 100644
--- a/gs/src/spdiff.c
+++ b/gs/base/spdiff.c
diff --git a/gs/src/spdiffx.h b/gs/base/spdiffx.h
index 3e908beea..3e908beea 100644
--- a/gs/src/spdiffx.h
+++ b/gs/base/spdiffx.h
diff --git a/gs/src/spngp.c b/gs/base/spngp.c
index 89c05317e..89c05317e 100644
--- a/gs/src/spngp.c
+++ b/gs/base/spngp.c
diff --git a/gs/src/spngpx.h b/gs/base/spngpx.h
index f05b06975..f05b06975 100644
--- a/gs/src/spngpx.h
+++ b/gs/base/spngpx.h
diff --git a/gs/src/spprint.c b/gs/base/spprint.c
index 2f85a54fe..2f85a54fe 100644
--- a/gs/src/spprint.c
+++ b/gs/base/spprint.c
diff --git a/gs/src/spprint.h b/gs/base/spprint.h
index 99cd661c4..99cd661c4 100644
--- a/gs/src/spprint.h
+++ b/gs/base/spprint.h
diff --git a/gs/src/spsdf.c b/gs/base/spsdf.c
index 5eb69bb61..5eb69bb61 100644
--- a/gs/src/spsdf.c
+++ b/gs/base/spsdf.c
diff --git a/gs/src/spsdf.h b/gs/base/spsdf.h
index a7d7d167a..a7d7d167a 100644
--- a/gs/src/spsdf.h
+++ b/gs/base/spsdf.h
diff --git a/gs/src/srdline.h b/gs/base/srdline.h
index 678aa2283..678aa2283 100644
--- a/gs/src/srdline.h
+++ b/gs/base/srdline.h
diff --git a/gs/src/srld.c b/gs/base/srld.c
index afbd4c809..afbd4c809 100644
--- a/gs/src/srld.c
+++ b/gs/base/srld.c
diff --git a/gs/src/srle.c b/gs/base/srle.c
index 194b575ca..194b575ca 100644
--- a/gs/src/srle.c
+++ b/gs/base/srle.c
diff --git a/gs/src/srlx.h b/gs/base/srlx.h
index 8103ed0bc..8103ed0bc 100644
--- a/gs/src/srlx.h
+++ b/gs/base/srlx.h
diff --git a/gs/src/sstring.c b/gs/base/sstring.c
index 1a7daff9f..1a7daff9f 100644
--- a/gs/src/sstring.c
+++ b/gs/base/sstring.c
diff --git a/gs/src/sstring.h b/gs/base/sstring.h
index 9f2b89ac6..9f2b89ac6 100644
--- a/gs/src/sstring.h
+++ b/gs/base/sstring.h
diff --git a/gs/src/stat_.h b/gs/base/stat_.h
index d0d4d20cb..d0d4d20cb 100644
--- a/gs/src/stat_.h
+++ b/gs/base/stat_.h
diff --git a/gs/src/std.h b/gs/base/std.h
index 096a0ab8c..096a0ab8c 100644
--- a/gs/src/std.h
+++ b/gs/base/std.h
diff --git a/gs/src/stdint_.h b/gs/base/stdint_.h
index e32d0f367..e32d0f367 100644
--- a/gs/src/stdint_.h
+++ b/gs/base/stdint_.h
diff --git a/gs/src/stdio_.h b/gs/base/stdio_.h
index 320182005..320182005 100644
--- a/gs/src/stdio_.h
+++ b/gs/base/stdio_.h
diff --git a/gs/src/stdpn.h b/gs/base/stdpn.h
index 0a1019d69..0a1019d69 100644
--- a/gs/src/stdpn.h
+++ b/gs/base/stdpn.h
diff --git a/gs/src/stdpre.h b/gs/base/stdpre.h
index 2ac7de66b..2ac7de66b 100644
--- a/gs/src/stdpre.h
+++ b/gs/base/stdpre.h
diff --git a/gs/src/stream.c b/gs/base/stream.c
index 800498e6d..800498e6d 100644
--- a/gs/src/stream.c
+++ b/gs/base/stream.c
diff --git a/gs/src/stream.h b/gs/base/stream.h
index af1bf03bb..af1bf03bb 100644
--- a/gs/src/stream.h
+++ b/gs/base/stream.h
diff --git a/gs/src/strimpl.h b/gs/base/strimpl.h
index 981eecd57..981eecd57 100644
--- a/gs/src/strimpl.h
+++ b/gs/base/strimpl.h
diff --git a/gs/src/string_.h b/gs/base/string_.h
index 2ba19bb29..2ba19bb29 100644
--- a/gs/src/string_.h
+++ b/gs/base/string_.h
diff --git a/gs/src/strmio.c b/gs/base/strmio.c
index 20a559703..20a559703 100644
--- a/gs/src/strmio.c
+++ b/gs/base/strmio.c
diff --git a/gs/src/strmio.h b/gs/base/strmio.h
index 5921470fa..5921470fa 100644
--- a/gs/src/strmio.h
+++ b/gs/base/strmio.h
diff --git a/gs/src/szlibc.c b/gs/base/szlibc.c
index e8e463ada..e8e463ada 100644
--- a/gs/src/szlibc.c
+++ b/gs/base/szlibc.c
diff --git a/gs/src/szlibd.c b/gs/base/szlibd.c
index a4b2e1e50..a4b2e1e50 100644
--- a/gs/src/szlibd.c
+++ b/gs/base/szlibd.c
diff --git a/gs/src/szlibe.c b/gs/base/szlibe.c
index 64a343007..64a343007 100644
--- a/gs/src/szlibe.c
+++ b/gs/base/szlibe.c
diff --git a/gs/src/szlibx.h b/gs/base/szlibx.h
index 349ccb4cc..349ccb4cc 100644
--- a/gs/src/szlibx.h
+++ b/gs/base/szlibx.h
diff --git a/gs/src/szlibxx.h b/gs/base/szlibxx.h
index f652921ef..f652921ef 100644
--- a/gs/src/szlibxx.h
+++ b/gs/base/szlibxx.h
diff --git a/gs/src/time_.h b/gs/base/time_.h
index 2aed563ab..2aed563ab 100644
--- a/gs/src/time_.h
+++ b/gs/base/time_.h
diff --git a/gs/src/ttcalc.c b/gs/base/ttcalc.c
index efee474e8..efee474e8 100644
--- a/gs/src/ttcalc.c
+++ b/gs/base/ttcalc.c
diff --git a/gs/src/ttcalc.h b/gs/base/ttcalc.h
index 22a27269d..22a27269d 100644
--- a/gs/src/ttcalc.h
+++ b/gs/base/ttcalc.h
diff --git a/gs/src/ttcommon.h b/gs/base/ttcommon.h
index 170358eac..170358eac 100644
--- a/gs/src/ttcommon.h
+++ b/gs/base/ttcommon.h
diff --git a/gs/src/ttconf.h b/gs/base/ttconf.h
index 6c499acb3..6c499acb3 100644
--- a/gs/src/ttconf.h
+++ b/gs/base/ttconf.h
diff --git a/gs/src/ttconfig.h b/gs/base/ttconfig.h
index 8da4b4204..8da4b4204 100644
--- a/gs/src/ttconfig.h
+++ b/gs/base/ttconfig.h
diff --git a/gs/src/ttfinp.c b/gs/base/ttfinp.c
index 4305e98a3..4305e98a3 100644
--- a/gs/src/ttfinp.c
+++ b/gs/base/ttfinp.c
diff --git a/gs/src/ttfinp.h b/gs/base/ttfinp.h
index 62902ca7b..62902ca7b 100644
--- a/gs/src/ttfinp.h
+++ b/gs/base/ttfinp.h
diff --git a/gs/src/ttfmain.c b/gs/base/ttfmain.c
index 7fc42dfca..7fc42dfca 100644
--- a/gs/src/ttfmain.c
+++ b/gs/base/ttfmain.c
diff --git a/gs/src/ttfmemd.c b/gs/base/ttfmemd.c
index ef7bad747..ef7bad747 100644
--- a/gs/src/ttfmemd.c
+++ b/gs/base/ttfmemd.c
diff --git a/gs/src/ttfmemd.h b/gs/base/ttfmemd.h
index 208b87de0..208b87de0 100644
--- a/gs/src/ttfmemd.h
+++ b/gs/base/ttfmemd.h
diff --git a/gs/src/ttfoutl.h b/gs/base/ttfoutl.h
index d59811f16..d59811f16 100644
--- a/gs/src/ttfoutl.h
+++ b/gs/base/ttfoutl.h
diff --git a/gs/src/ttfsfnt.h b/gs/base/ttfsfnt.h
index eeda7572e..eeda7572e 100644
--- a/gs/src/ttfsfnt.h
+++ b/gs/base/ttfsfnt.h
diff --git a/gs/src/ttinterp.c b/gs/base/ttinterp.c
index 2c8f38b28..2c8f38b28 100644
--- a/gs/src/ttinterp.c
+++ b/gs/base/ttinterp.c
diff --git a/gs/src/ttinterp.h b/gs/base/ttinterp.h
index dc0fe54f3..dc0fe54f3 100644
--- a/gs/src/ttinterp.h
+++ b/gs/base/ttinterp.h
diff --git a/gs/src/ttload.c b/gs/base/ttload.c
index 3e5486c20..3e5486c20 100644
--- a/gs/src/ttload.c
+++ b/gs/base/ttload.c
diff --git a/gs/src/ttload.h b/gs/base/ttload.h
index 75d4f9df1..75d4f9df1 100644
--- a/gs/src/ttload.h
+++ b/gs/base/ttload.h
diff --git a/gs/src/ttmisc.h b/gs/base/ttmisc.h
index 967183bc7..967183bc7 100644
--- a/gs/src/ttmisc.h
+++ b/gs/base/ttmisc.h
diff --git a/gs/src/ttobjs.c b/gs/base/ttobjs.c
index 240f214dd..240f214dd 100644
--- a/gs/src/ttobjs.c
+++ b/gs/base/ttobjs.c
diff --git a/gs/src/ttobjs.h b/gs/base/ttobjs.h
index 79d3cbbde..79d3cbbde 100644
--- a/gs/src/ttobjs.h
+++ b/gs/base/ttobjs.h
diff --git a/gs/src/tttables.h b/gs/base/tttables.h
index 2a4564890..2a4564890 100644
--- a/gs/src/tttables.h
+++ b/gs/base/tttables.h
diff --git a/gs/src/tttype.h b/gs/base/tttype.h
index 0feee518c..0feee518c 100644
--- a/gs/src/tttype.h
+++ b/gs/base/tttype.h
diff --git a/gs/src/tttypes.h b/gs/base/tttypes.h
index 8844b6424..8844b6424 100644
--- a/gs/src/tttypes.h
+++ b/gs/base/tttypes.h
diff --git a/gs/src/turboc.cfg b/gs/base/turboc.cfg
index 6f80f44e2..6f80f44e2 100644
--- a/gs/src/turboc.cfg
+++ b/gs/base/turboc.cfg
diff --git a/gs/src/ugcclib.mak b/gs/base/ugcclib.mak
index 1415214b4..286c88081 100644
--- a/gs/src/ugcclib.mak
+++ b/gs/base/ugcclib.mak
@@ -14,7 +14,7 @@
 # makefile for Unix / gcc library testing.
 
 BINDIR=./libobj
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./libobj
 GLOBJDIR=./libobj
 PSRESDIR=./Resource
diff --git a/gs/src/unistd_.h b/gs/base/unistd_.h
index 14c158c49..14c158c49 100644
--- a/gs/src/unistd_.h
+++ b/gs/base/unistd_.h
diff --git a/gs/src/unix-aux.mak b/gs/base/unix-aux.mak
index f9e45a33e..f9e45a33e 100644
--- a/gs/src/unix-aux.mak
+++ b/gs/base/unix-aux.mak
diff --git a/gs/src/unix-dll.mak b/gs/base/unix-dll.mak
index ab6c46639..ab6c46639 100644
--- a/gs/src/unix-dll.mak
+++ b/gs/base/unix-dll.mak
diff --git a/gs/src/unix-end.mak b/gs/base/unix-end.mak
index f00b375bb..f00b375bb 100644
--- a/gs/src/unix-end.mak
+++ b/gs/base/unix-end.mak
diff --git a/gs/src/unix-gcc.mak b/gs/base/unix-gcc.mak
index 9d6c1e40b..6c06f95af 100644
--- a/gs/src/unix-gcc.mak
+++ b/gs/base/unix-gcc.mak
@@ -22,10 +22,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=./bin
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./obj
 GLOBJDIR=./obj
-PSSRCDIR=./src
+PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
 PSGENDIR=./obj
diff --git a/gs/src/unixansi.mak b/gs/base/unixansi.mak
index 73acde425..fce6bba66 100644
--- a/gs/src/unixansi.mak
+++ b/gs/base/unixansi.mak
@@ -22,10 +22,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=./bin
-GLSRCDIR=./src
+GLSRCDIR=./base
 GLGENDIR=./obj
 GLOBJDIR=./obj
-PSSRCDIR=./src
+PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
 PSGENDIR=./obj
diff --git a/gs/src/unixhead.mak b/gs/base/unixhead.mak
index 9509028dc..9509028dc 100644
--- a/gs/src/unixhead.mak
+++ b/gs/base/unixhead.mak
diff --git a/gs/src/unixinst.mak b/gs/base/unixinst.mak
index 97b6e525c..97b6e525c 100644
--- a/gs/src/unixinst.mak
+++ b/gs/base/unixinst.mak
diff --git a/gs/src/unixlink.mak b/gs/base/unixlink.mak
index e268c7d3c..e268c7d3c 100644
--- a/gs/src/unixlink.mak
+++ b/gs/base/unixlink.mak
diff --git a/gs/src/vdtrace.c b/gs/base/vdtrace.c
index 978747e6b..978747e6b 100644
--- a/gs/src/vdtrace.c
+++ b/gs/base/vdtrace.c
diff --git a/gs/src/vdtrace.h b/gs/base/vdtrace.h
index fe2124e97..fe2124e97 100644
--- a/gs/src/vdtrace.h
+++ b/gs/base/vdtrace.h
diff --git a/gs/src/version.mak b/gs/base/version.mak
index 67908cc1b..67908cc1b 100644
--- a/gs/src/version.mak
+++ b/gs/base/version.mak
diff --git a/gs/src/vms_x_fix.h b/gs/base/vms_x_fix.h
index 2ee18eb7b..2ee18eb7b 100644
--- a/gs/src/vms_x_fix.h
+++ b/gs/base/vms_x_fix.h
diff --git a/gs/src/vmsmath.h b/gs/base/vmsmath.h
index 417b02d9f..417b02d9f 100644
--- a/gs/src/vmsmath.h
+++ b/gs/base/vmsmath.h
diff --git a/gs/src/watclib.mak b/gs/base/watclib.mak
index aad8dcebd..88f300bc8 100644
--- a/gs/src/watclib.mak
+++ b/gs/base/watclib.mak
@@ -36,7 +36,7 @@ GS=gslib
 BINDIR=.\debugobj
 !endif
 !ifndef GLSRCDIR
-GLSRCDIR=.\src
+GLSRCDIR=.\base
 !endif
 !ifndef PSRESDIR
 PSRESDIR=.\Resource
diff --git a/gs/src/watcw32.mak b/gs/base/watcw32.mak
index 00d1071f7..9b361c77c 100644
--- a/gs/src/watcw32.mak
+++ b/gs/base/watcw32.mak
@@ -27,10 +27,10 @@
 # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
 
 BINDIR=bin
-GLSRCDIR=src
+GLSRCDIR=base
 GLGENDIR=obj
 GLOBJDIR=obj
-PSSRCDIR=src
+PSSRCDIR=psi
 PSLIBDIR=lib
 PSRESDIR=Resource
 PSGENDIR=obj
diff --git a/gs/src/wccommon.mak b/gs/base/wccommon.mak
index f77e3d368..f77e3d368 100644
--- a/gs/src/wccommon.mak
+++ b/gs/base/wccommon.mak
diff --git a/gs/src/wctail.mak b/gs/base/wctail.mak
index 64e683d18..64e683d18 100644
--- a/gs/src/wctail.mak
+++ b/gs/base/wctail.mak
diff --git a/gs/src/windows_.h b/gs/base/windows_.h
index 93846f8f2..93846f8f2 100644
--- a/gs/src/windows_.h
+++ b/gs/base/windows_.h
diff --git a/gs/src/winlib.mak b/gs/base/winlib.mak
index eef6c9799..eef6c9799 100644
--- a/gs/src/winlib.mak
+++ b/gs/base/winlib.mak
diff --git a/gs/src/winplat.mak b/gs/base/winplat.mak
index 57cdb6f79..57cdb6f79 100644
--- a/gs/src/winplat.mak
+++ b/gs/base/winplat.mak
diff --git a/gs/src/wrfont.c b/gs/base/wrfont.c
index 47c81a321..47c81a321 100644
--- a/gs/src/wrfont.c
+++ b/gs/base/wrfont.c
diff --git a/gs/src/wrfont.h b/gs/base/wrfont.h
index 1acfdb85d..1acfdb85d 100644
--- a/gs/src/wrfont.h
+++ b/gs/base/wrfont.h
diff --git a/gs/src/write_t1.c b/gs/base/write_t1.c
index b32ed4757..b32ed4757 100644
--- a/gs/src/write_t1.c
+++ b/gs/base/write_t1.c
diff --git a/gs/src/write_t1.h b/gs/base/write_t1.h
index 818e082aa..818e082aa 100644
--- a/gs/src/write_t1.h
+++ b/gs/base/write_t1.h
diff --git a/gs/src/write_t2.c b/gs/base/write_t2.c
index 370ec98dc..370ec98dc 100644
--- a/gs/src/write_t2.c
+++ b/gs/base/write_t2.c
diff --git a/gs/src/write_t2.h b/gs/base/write_t2.h
index ee6b60121..ee6b60121 100644
--- a/gs/src/write_t2.h
+++ b/gs/base/write_t2.h
diff --git a/gs/src/wtsimdi.c b/gs/base/wtsimdi.c
index 44ae6c11c..44ae6c11c 100644
--- a/gs/src/wtsimdi.c
+++ b/gs/base/wtsimdi.c
diff --git a/gs/src/x_.h b/gs/base/x_.h
index d44606094..d44606094 100644
--- a/gs/src/x_.h
+++ b/gs/base/x_.h
diff --git a/gs/src/zcie.h b/gs/base/zcie.h
index 5d0d870a0..5d0d870a0 100644
--- a/gs/src/zcie.h
+++ b/gs/base/zcie.h
diff --git a/gs/src/zcolor.h b/gs/base/zcolor.h
index 52069bd7f..52069bd7f 100644
--- a/gs/src/zcolor.h
+++ b/gs/base/zcolor.h
diff --git a/gs/src/zicc.h b/gs/base/zicc.h
index 5625a838d..5625a838d 100644
--- a/gs/src/zicc.h
+++ b/gs/base/zicc.h
diff --git a/gs/src/zlib.mak b/gs/base/zlib.mak
index 008514d8f..008514d8f 100644
--- a/gs/src/zlib.mak
+++ b/gs/base/zlib.mak
diff --git a/gs/doc/API.htm b/gs/doc/API.htm
index 806535987..822b6bd82 100644
--- a/gs/doc/API.htm
+++ b/gs/doc/API.htm
@@ -136,7 +136,7 @@ of the interpreter within a single process.
 
 <p>
 The functions exported by the DLL/shared object are described 
-in the header file <a href="../src/iapi.h"><code>iapi.h</code></a>
+in the header file <a href="../psi/iapi.h"><code>iapi.h</code></a>
 and are summarised below.  Omitted from the summary are
 the calling convention (e.g. __stdcall), details of return 
 values and error handling.
@@ -305,7 +305,7 @@ Set the callback function for polling.
 This is used for handling window events or cooperative
 multitasking.  This function will only be called if
 the Ghostscript interpreter was compiled with <code>CHECK_INTERRUPTS</code>
-as described in <code><a href="../src/gpcheck.h">gpcheck.h</a></code>.
+as described in <code><a href="../base/gpcheck.h">gpcheck.h</a></code>.
 The polling function should return zero if all is well,
 and return negative if it wants ghostscript to abort.
 The polling function must be fast.
@@ -318,7 +318,7 @@ device.  If the <a href="#display">display</a> device is used,
 this must be called after 
 <code>gsapi_new_instance()</code>
 and before <code>gsapi_init_with_args()</code>.
-See <code><a href="../src/gdevdsp.h">gdevdsp.h</a></code>
+See <code><a href="../base/gdevdsp.h">gdevdsp.h</a></code>
 for more details.
 </blockquote>
 
@@ -326,7 +326,7 @@ for more details.
 <blockquote>
 Initialise the interpreter.
 This calls <code>gs_main_init_with_args()</code> in 
-<code><a href="../src/imainarg.c">imainarg.c</a></code>.
+<code><a href="../psi/imainarg.c">imainarg.c</a></code>.
 See below for <a href="#return_codes">return codes</a>.
 The arguments are the same as the "C" main function:
 argv[0] is ignored and the user supplied arguments 
@@ -653,14 +653,14 @@ choice of two standard input/output methods.
 </ul>
 <p>
 The callback functions are described in 
-<a href="../src/iapi.h"><code>iapi.h</code></a>.
+<a href="../psi/iapi.h"><code>iapi.h</code></a>.
 
 
 <h2><a name="display"></a>Display device</h2>
 <p>
 The <code>display</code> device is available for use with
 the Ghostscript interpreter library.  This is described in the file 
-<code><a href="../src/gdevdsp.h">gdevdsp.h</a></code>.
+<code><a href="../base/gdevdsp.h">gdevdsp.h</a></code>.
 This device provides you with access to the raster output of
 Ghostscript.  It is your responsibility to copy this raster
 to a display window or printer.
@@ -695,7 +695,7 @@ Options include
 <li> 16 bits/pixel with 555 or 565 bitfields.
 </ul>
 The format values are described in 
-<code><a href="../src/gdevdsp.h">gdevdsp.h</a></code>.
+<code><a href="../base/gdevdsp.h">gdevdsp.h</a></code>.
 The format is flexible enough to support common Windows, OS/2, Linux
 and Mac raster formats.  To select the display device with a 
 Windows 24-bit RGB raster:
@@ -727,16 +727,16 @@ The display device provides you with the address and size of the
 raster using the <code>display_size()</code> callback.
 You are then responsible for displaying this raster.
 Some examples are in 
-<code><a href="../src/dwmain.c">dwmain.c</a></code> (Windows),
-<code><a href="../src/dpmain.c">dpmain.c</a></code> (OS/2) and  
-<code><a href="../src/dxmain.c">dxmain.c</a></code> (X11/Linux), and  
-<code><a href="../src/dmmain.c">dmmain.c</a></code> (MacOS Classic or Carbon).  
+<code><a href="../psi/dwmain.c">dwmain.c</a></code> (Windows),
+<code><a href="../psi/dpmain.c">dpmain.c</a></code> (OS/2) and  
+<code><a href="../psi/dxmain.c">dxmain.c</a></code> (X11/Linux), and  
+<code><a href="../psi/dmmain.c">dmmain.c</a></code> (MacOS Classic or Carbon).  
 <p>
 On some platforms, the calling convention for the display device callbacks in 
-<code><a href="../src/gdevdsp.h">gdevdsp.h</a></code>
+<code><a href="../base/gdevdsp.h">gdevdsp.h</a></code>
 is not the same as the exported 
 <a href="#Exported_functions "><code>gsapi_*()</code></a>
-functions in <a href="../src/iapi.h"><code>iapi.h</code></a>.
+functions in <a href="../psi/iapi.h"><code>iapi.h</code></a>.
 
 <p>
 
diff --git a/gs/doc/C-style.htm b/gs/doc/C-style.htm
index 52bcea83c..665fd2f10 100644
--- a/gs/doc/C-style.htm
+++ b/gs/doc/C-style.htm
@@ -269,7 +269,7 @@ process of eliminating all of them.
 
 <li>Do not use <code>extern</code> in <code>.c</code> files, only in
 <code>.h</code> files, unless you have a very good reason for it (e.g.,
-as in <a href="../src/iconf.c">iconf.c</a>).  There are too many such
+as in <a href="../psi/iconf.c">iconf.c</a>).  There are too many such
 <code>extern</code>s in the code now: we are eliminating them over time.
 
 <li>Do not declare the same name as both <code>static</code>
@@ -538,7 +538,7 @@ later versions of the standard such as C 9X.
 
 <li>Do not use any features from <code>stdio.h</code> that assume the
 existence of <code>stdin</code>, <code>stdout</code>, or
-<code>stderr</code>.  See <a href="../src/gsio.h">gsio.h</a> for the full
+<code>stderr</code>.  See <a href="../base/gsio.h">gsio.h</a> for the full
 list.  Instead, use <code>gs_stdin</code> et al.
 
 </ul>
@@ -574,7 +574,7 @@ produce multiple closed copies, causing duplicate name errors at link time.
 <code>inline</code> procedures in header files, regardless of compiler.
 Unfortunately, the only way we've found to make this fully portable involves
 a fair amount of boilerplate.  For details, please see <a
-href="../src/stdpre.h">stdpre.h</a>.
+href="../base/stdpre.h">stdpre.h</a>.
 
 </dl>
 
@@ -1260,8 +1260,8 @@ A value to be returned from a procedure:
 <tr valign=top>	<td align=right>&lt; 0
 	<td>&nbsp;&nbsp;&nbsp;&nbsp;
 	<td>An error code defined in
-<a href="../src/gserrors.h">gserrors.h</a>
-(or <a href="../src/ierrors.h">ierrors.h</a>)
+<a href="../base/gserrors.h">gserrors.h</a>
+(or <a href="../psi/ierrors.h">ierrors.h</a>)
 <tr valign=top>	<td align=right>0
 	<td>&nbsp;
 	<td>Normal return
@@ -1281,7 +1281,7 @@ A value returned from a stream procedure:
 <tr valign=top>	<td align=right>&lt; 0
 	<td>&nbsp;&nbsp;&nbsp;&nbsp;
 	<td>An exceptional condition as defined in
-<a href="../src/scommon.h">scommon.h</a>
+<a href="../base/scommon.h">scommon.h</a>
 <tr valign=top>	<td align=right>0
 	<td>&nbsp;
 	<td>Normal return (or, from the "<code>process</code>" procedure, means that more input is needed)
@@ -1498,7 +1498,7 @@ typedef struct gx_device_null_s {<br>
 Note that the above example is <strong>not</strong> the actual definition of
 the <code>gx_device</code> structure type: the actual type has some
 additional complications because it has a finalization procedure.  See <a
-href="../src/gxdevcli.h">src/gxdevcli.h</a> for the details.
+href="../base/gxdevcli.h">base/gxdevcli.h</a> for the details.
 
 <p>
 If you add members to a root class (such as <code>gx_device</code> in
@@ -1556,7 +1556,7 @@ file and line: this is often helpful for identifying the original cause of
 an error.
 
 <p>
-See the file <a href="../src/gserrors.h">src/gserrors.h</a> for the error
+See the file <a href="../base/gserrors.h">base/gserrors.h</a> for the error
 return codes used by the graphics library, most of which correspond directly
 to PostScript error conditions.
 
diff --git a/gs/doc/Develop.htm b/gs/doc/Develop.htm
index 7512fe39a..dbc52488c 100644
--- a/gs/doc/Develop.htm
+++ b/gs/doc/Develop.htm
@@ -429,8 +429,8 @@ source files.
 The libctx provides pointers to memory, stdio, and various other runtime 
 portablility services.
 <dd>
-<a href="../src/gslibctx.h">src/gslibctx.h</a>,
-<a href="../src/gslibctx.c">src/gslibctx.c</a>.
+<a href="../base/gslibctx.h">base/gslibctx.h</a>,
+<a href="../base/gslibctx.c">base/gslibctx.c</a>.
 </dl>
 
 <h4>Memory manager</h4>
@@ -445,18 +445,18 @@ See <a href="#Memory_management">below</a>.
 <dt>
 Framework, file and string streams:
 <dd>
-<a href="../src/gsdsrc.c">src/gsdsrc.c</a>,
-<a href="../src/gsdsrc.h">src/gsdsrc.h</a>,
-<a href="../src/scommon.h">src/scommon.h</a>,
-<a href="../src/strmio.c">src/strmio.c</a>,
-<a href="../src/strmio.h">src/strmio.h</a>,
-<a href="../src/sfxboth.c">src/sfxboth.c</a>,
-<a href="../src/sfxfd.c">src/sfxfd.c</a>,
-<a href="../src/sfxstdio.c">src/sfxstdio.c</a>,
-<a href="../src/sfxcommon.c">src/sfxcommon.c</a>,
-<a href="../src/stream.h">src/stream.h</a>,
-<a href="../src/stream.c">src/stream.c</a>,
-<a href="../src/strimpl.h">src/strimpl.h</a>.
+<a href="../base/gsdsrc.c">base/gsdsrc.c</a>,
+<a href="../base/gsdsrc.h">base/gsdsrc.h</a>,
+<a href="../base/scommon.h">base/scommon.h</a>,
+<a href="../base/strmio.c">base/strmio.c</a>,
+<a href="../base/strmio.h">base/strmio.h</a>,
+<a href="../base/sfxboth.c">base/sfxboth.c</a>,
+<a href="../base/sfxfd.c">base/sfxfd.c</a>,
+<a href="../base/sfxstdio.c">base/sfxstdio.c</a>,
+<a href="../base/sfxcommon.c">base/sfxcommon.c</a>,
+<a href="../base/stream.h">base/stream.h</a>,
+<a href="../base/stream.c">base/stream.c</a>,
+<a href="../base/strimpl.h">base/strimpl.h</a>.
 
 <dt>
 Standard filters:
@@ -467,129 +467,129 @@ Standard filters:
 <dt>
 CCITTFax:
 <dd>
-<a href="../src/scf.h">src/scf.h</a>,
-<a href="../src/scfd.c">src/scfd.c</a>,
-<a href="../src/scfdgen.c">src/scfdgen.c</a>,
-<a href="../src/scfdtab.c">src/scfdtab.c</a>,
-<a href="../src/scfe.c">src/scfe.c</a>,
-<a href="../src/scfetab.c">src/scfetab.c</a>,
-<a href="../src/scfparam.c">src/scfparam.c</a>,
-<a href="../src/scfx.h">src/scfx.h</a>.
+<a href="../base/scf.h">base/scf.h</a>,
+<a href="../base/scfd.c">base/scfd.c</a>,
+<a href="../base/scfdgen.c">base/scfdgen.c</a>,
+<a href="../base/scfdtab.c">base/scfdtab.c</a>,
+<a href="../base/scfe.c">base/scfe.c</a>,
+<a href="../base/scfetab.c">base/scfetab.c</a>,
+<a href="../base/scfparam.c">base/scfparam.c</a>,
+<a href="../base/scfx.h">base/scfx.h</a>.
 
 <dt>
 DCT (JPEG):
 <dd>
-<a href="../src/gsjconf.h">src/gsjconf.h</a>,
-<a href="../src/gsjmorec.h">src/gsjmorec.h</a>,
-<a href="../src/sdcparam.c">src/sdcparam.c</a>,
-<a href="../src/sdcparam.h">src/sdcparam.h</a>,
-<a href="../src/sdct.h">src/sdct.h</a>,
-<a href="../src/sdctc.c">src/sdctc.c</a>,
-<a href="../src/sdctd.c">src/sdctd.c</a>,
-<a href="../src/sdcte.c">src/sdcte.c</a>,
-<a href="../src/sddparam.c">src/sddparam.c</a>,
-<a href="../src/sdeparam.c">src/sdeparam.c</a>,
-<a href="../src/sjpeg.h">src/sjpeg.h</a>,
-<a href="../src/sjpegc.c">src/sjpegc.c</a>,
-<a href="../src/sjpegd.c">src/sjpegd.c</a>,
-<a href="../src/sjpege.c">src/sjpege.c</a>.
+<a href="../psi/gs.conf.h">psi/gs.conf.h</a>,
+<a href="../base/gsjmorec.h">base/gsjmorec.h</a>,
+<a href="../base/sdcparam.c">base/sdcparam.c</a>,
+<a href="../base/sdcparam.h">base/sdcparam.h</a>,
+<a href="../base/sdct.h">base/sdct.h</a>,
+<a href="../base/sdctc.c">base/sdctc.c</a>,
+<a href="../base/sdctd.c">base/sdctd.c</a>,
+<a href="../base/sdcte.c">base/sdcte.c</a>,
+<a href="../base/sddparam.c">base/sddparam.c</a>,
+<a href="../base/sdeparam.c">base/sdeparam.c</a>,
+<a href="../base/sjpeg.h">base/sjpeg.h</a>,
+<a href="../base/sjpegc.c">base/sjpegc.c</a>,
+<a href="../base/sjpegd.c">base/sjpegd.c</a>,
+<a href="../base/sjpege.c">base/sjpege.c</a>.
 
 <dt>
 JBIG2:
-<a href="../src/sjbig2.h">src/sjbig2.h</a>,
-<a href="../src/sjbig2.c">src/sjbig2.c</a>
+<a href="../base/sjbig2.h">base/sjbig2.h</a>,
+<a href="../base/sjbig2.c">base/sjbig2.c</a>
 or
-<a href="../src/sjbig2_luratech.h">src/sjbig2_luratech.h</a>,
-<a href="../src/sjbig2_luratech.c">src/sjbig2_luratech.c</a>.
+<a href="../base/sjbig2_luratech.h">base/sjbig2_luratech.h</a>,
+<a href="../base/sjbig2_luratech.c">base/sjbig2_luratech.c</a>.
 
 <dt>
 JPX (JPEG 2000):
-<a href="../src/sjpx.h">src/sjpx.h</a>,
-<a href="../src/sjpx.c">src/sjpx.c</a>
+<a href="../base/sjpx.h">base/sjpx.h</a>,
+<a href="../base/sjpx.c">base/sjpx.c</a>
 or
-<a href="../src/sjpx_luratech.h">src/sjpx_luratech.h</a>,
-<a href="../src/sjpx_luratech.c">src/sjpx_luratech.c</a>.
+<a href="../base/sjpx_luratech.h">base/sjpx_luratech.h</a>,
+<a href="../base/sjpx_luratech.c">base/sjpx_luratech.c</a>.
 <dt>
 Other compression/decompression:
 <dd>
-<a href="../src/slzwc.c">src/slzwc.c</a>,
-<a href="../src/slzwd.c">src/slzwd.c</a>,
-<a href="../src/slzwe.c">src/slzwe.c</a>,
-<a href="../src/slzwx.h">src/slzwx.h</a>,
-<a href="../src/srld.c">src/srld.c</a>,
-<a href="../src/srle.c">src/srle.c</a>,
-<a href="../src/srlx.h">src/srlx.h</a>.
+<a href="../base/slzwc.c">base/slzwc.c</a>,
+<a href="../base/slzwd.c">base/slzwd.c</a>,
+<a href="../base/slzwe.c">base/slzwe.c</a>,
+<a href="../base/slzwx.h">base/slzwx.h</a>,
+<a href="../base/srld.c">base/srld.c</a>,
+<a href="../base/srle.c">base/srle.c</a>,
+<a href="../base/srlx.h">base/srlx.h</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/sa85d.c">src/sa85d.c</a>,
-<a href="../src/sa85d.h">src/sa85d.h</a>,
-<a href="../src/sa85x.h">src/sa85x.h</a>,
-<a href="../src/sfilter1.c">src/sfilter1.c</a>,
-<a href="../src/sfilter2.c">src/sfilter2.c</a>,
-<a href="../src/sstring.c">src/sstring.c</a>,
-<a href="../src/sstring.h">src/sstring.h</a>.
+<a href="../base/sa85d.c">base/sa85d.c</a>,
+<a href="../base/sa85d.h">base/sa85d.h</a>,
+<a href="../base/sa85x.h">base/sa85x.h</a>,
+<a href="../psi/sfilter1.c">psi/sfilter1.c</a>,
+<a href="../base/sfilter2.c">base/sfilter2.c</a>,
+<a href="../base/sstring.c">base/sstring.c</a>,
+<a href="../base/sstring.h">base/sstring.h</a>.
 
 </dl>
 
 <dt>
 Non-standard filters used to implement standard filters:
 <dd>
-<a href="../src/seexec.c">src/seexec.c</a>,
-<a href="../src/sfilter.h">src/sfilter.h</a>,
-<a href="../src/shc.c">src/shc.c</a>,
-<a href="../src/shc.h">src/shc.h</a>,
-<a href="../src/shcgen.c">src/shcgen.c</a>,
-<a href="../src/shcgen.h">src/shcgen.h</a>,
-<a href="../src/spdiff.c">src/spdiff.c</a>,
-<a href="../src/spdiffx.h">src/spdiffx.h</a>,
-<a href="../src/spngp.c">src/spngp.c</a>,
-<a href="../src/spngpx.h">src/spngpx.h</a>,
-<a href="../src/szlibc.c">src/szlibc.c</a>,
-<a href="../src/szlibd.c">src/szlibd.c</a>,
-<a href="../src/szlibe.c">src/szlibe.c</a>,
-<a href="../src/szlibx.h">src/szlibx.h</a>,
-<a href="../src/szlibxx.h">src/szlibxx.h</a>.
+<a href="../base/seexec.c">base/seexec.c</a>,
+<a href="../base/sfilter.h">base/sfilter.h</a>,
+<a href="../base/shc.c">base/shc.c</a>,
+<a href="../base/shc.h">base/shc.h</a>,
+<a href="../base/shcgen.c">base/shcgen.c</a>,
+<a href="../base/shcgen.h">base/shcgen.h</a>,
+<a href="../base/spdiff.c">base/spdiff.c</a>,
+<a href="../base/spdiffx.h">base/spdiffx.h</a>,
+<a href="../base/spngp.c">base/spngp.c</a>,
+<a href="../base/spngpx.h">base/spngpx.h</a>,
+<a href="../base/szlibc.c">base/szlibc.c</a>,
+<a href="../base/szlibd.c">base/szlibd.c</a>,
+<a href="../base/szlibe.c">base/szlibe.c</a>,
+<a href="../base/szlibx.h">base/szlibx.h</a>,
+<a href="../base/szlibxx.h">base/szlibxx.h</a>.
 
 <dt>
 Non-standard filters:
 <dd>
-<a href="../src/sbcp.c">src/sbcp.c</a>,
-<a href="../src/sbcp.h">src/sbcp.h</a>,
-<a href="../src/sbhc.c">src/sbhc.c</a>,
-<a href="../src/sbhc.h">src/sbhc.h</a>,
-<a href="../src/sbtx.h">src/sbtx.h</a>,
-<a href="../src/sbwbs.c">src/sbwbs.c</a>,
-<a href="../src/sbwbs.h">src/sbwbs.h</a>,
-<a href="../src/smd5.c">src/smd5.c</a>,
-<a href="../src/smd5.h">src/smd5.h</a>,
-<a href="../src/saes.c">src/saes.c</a>,
-<a href="../src/saes.h">src/saes.h</a>,
-<a href="../src/sarc4.c">src/sarc4.c</a>,
-<a href="../src/sarc4.h">src/sarc4.h</a>,
-<a href="../src/smtf.c">src/smtf.c</a>,
-<a href="../src/smtf.h">src/smtf.h</a>.
+<a href="../base/sbcp.c">base/sbcp.c</a>,
+<a href="../base/sbcp.h">base/sbcp.h</a>,
+<a href="../base/sbhc.c">base/sbhc.c</a>,
+<a href="../base/sbhc.h">base/sbhc.h</a>,
+<a href="../base/sbtx.h">base/sbtx.h</a>,
+<a href="../base/sbwbs.c">base/sbwbs.c</a>,
+<a href="../base/sbwbs.h">base/sbwbs.h</a>,
+<a href="../base/smd5.c">base/smd5.c</a>,
+<a href="../base/smd5.h">base/smd5.h</a>,
+<a href="../base/saes.c">base/saes.c</a>,
+<a href="../base/saes.h">base/saes.h</a>,
+<a href="../base/sarc4.c">base/sarc4.c</a>,
+<a href="../base/sarc4.h">base/sarc4.h</a>,
+<a href="../base/smtf.c">base/smtf.c</a>,
+<a href="../base/smtf.h">base/smtf.h</a>.
 
 <dt>
 Internal filters:
 <dd>
-<a href="../src/siinterp.c">src/siinterp.c</a>,
-<a href="../src/siinterp.h">src/siinterp.h</a>,
-<a href="../src/siscale.c">src/siscale.c</a>,
-<a href="../src/siscale.h">src/siscale.h</a>,
-<a href="../src/sidscale.c">src/sidscale.c</a>,
-<a href="../src/sidscale.h">src/sidscale.h</a>,
-<a href="../src/sisparam.h">src/sisparam.h</a>.
+<a href="../base/siinterp.c">base/siinterp.c</a>,
+<a href="../base/siinterp.h">base/siinterp.h</a>,
+<a href="../base/siscale.c">base/siscale.c</a>,
+<a href="../base/siscale.h">base/siscale.h</a>,
+<a href="../base/sidscale.c">base/sidscale.c</a>,
+<a href="../base/sidscale.h">base/sidscale.h</a>,
+<a href="../base/sisparam.h">base/sisparam.h</a>.
 
 <dt>
 Higher-level stream support:
 <dd>
-<a href="../src/spprint.c">src/spprint.c</a>,
-<a href="../src/spprint.h">src/spprint.h</a>,
-<a href="../src/spsdf.c">src/spsdf.c</a>,
-<a href="../src/spsdf.h">src/spsdf.h</a>,
-<a href="../src/srdline.h">src/srdline.h</a>.
+<a href="../base/spprint.c">base/spprint.c</a>,
+<a href="../base/spprint.h">base/spprint.h</a>,
+<a href="../base/spsdf.c">base/spsdf.c</a>,
+<a href="../base/spsdf.h">base/spsdf.h</a>,
+<a href="../base/srdline.h">base/srdline.h</a>.
 
 </dl>
 
@@ -604,56 +604,55 @@ See <a href="#Cross_platform_APIs">below</a>.
 <dt>
 Library top level:
 <dd>
-<a href="../src/gsinit.c">src/gsinit.c</a>,
-<a href="../src/gslib.h">src/gslib.h</a>.
+<a href="../base/gsinit.c">base/gsinit.c</a>,
+<a href="../base/gslib.h">base/gslib.h</a>.
 
 <dt>
 Configuration-related:
 <dd>
-<a href="../src/gconf.c">src/gconf.c</a>,
-<a href="../src/gconf.h">src/gconf.h</a>,
-<a href="../src/gscdef.c">src/gscdef.c</a>,
-<a href="../src/gscdefs.h">src/gscdefs.h</a>,
-<a href="../src/gsromfs0.c">src/gsromfs0.c</a>.
+<a href="../base/gconf.c">base/gconf.c</a>,
+<a href="../base/gconf.h">base/gconf.h</a>,
+<a href="../base/gscdef.c">base/gscdef.c</a>,
+<a href="../base/gscdefs.h">base/gscdefs.h</a>,
+<a href="../base/gsromfs0.c">base/gsromfs0.c</a>.
 
 <dt>
 Arithmetic:
 <dd>
-<a href="../src/gsfemu.c">src/gsfemu.c</a>,
-<a href="../src/gxarith.h">src/gxarith.h</a>,
-<a href="../src/gxdda.h">src/gxdda.h</a>,
-<a href="../src/gxfarith.h">src/gxfarith.h</a>,
-<a href="../src/gxfixed.h">src/gxfixed.h</a>,
-<a href="../src/gxfrac.h">src/gxfrac.h</a>.
+<a href="../base/gxarith.h">base/gxarith.h</a>,
+<a href="../base/gxdda.h">base/gxdda.h</a>,
+<a href="../base/gxfarith.h">base/gxfarith.h</a>,
+<a href="../base/gxfixed.h">base/gxfixed.h</a>,
+<a href="../base/gxfrac.h">base/gxfrac.h</a>.
 
 <dt>
 Operating system interface:
 <dd>
-<a href="../src/gserror.h">src/gserror.h</a>,
-<a href="../src/gsexit.h">src/gsexit.h</a>,
-<a href="../src/gxstdio.h">src/gxstdio.h</a>,
-<a href="../src/gxsync.c">src/gxsync.c</a>,
-<a href="../src/gxsync.h">src/gxsync.h</a>.
+<a href="../base/gserror.h">base/gserror.h</a>,
+<a href="../base/gsexit.h">base/gsexit.h</a>,
+<a href="../base/gxstdio.h">base/gxstdio.h</a>,
+<a href="../base/gxsync.c">base/gxsync.c</a>,
+<a href="../base/gxsync.h">base/gxsync.h</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/gsargs.c">src/gsargs.c</a>,
-<a href="../src/gsargs.h">src/gsargs.h</a>,
-<a href="../src/gserrors.h">src/gserrors.h</a>,
-<a href="../src/gsnotify.c">src/gsnotify.c</a>,
-<a href="../src/gsnotify.h">src/gsnotify.h</a>,
-<a href="../src/gsrect.h">src/gsrect.h</a>,
-<a href="../src/gstypes.h">src/gstypes.h</a>,
-<a href="../src/gsuid.h">src/gsuid.h</a>,
-<a href="../src/gsutil.h">src/gsutil.h</a>,
-<a href="../src/gsutil.c">src/gsutil.c</a>,
-<a href="../src/gx.h">src/gx.h</a>,
-<a href="../src/md5.c">src/md5.c</a>,
-<a href="../src/md5.h">src/md5.h</a>,
-<a href="../src/md5main.c">src/md5main.c</a>,
-<a href="../src/aes.c">src/aes.c</a>,
-<a href="../src/aes.h">src/aes.h</a>.
+<a href="../base/gsargs.c">base/gsargs.c</a>,
+<a href="../base/gsargs.h">base/gsargs.h</a>,
+<a href="../base/gserrors.h">base/gserrors.h</a>,
+<a href="../base/gsnotify.c">base/gsnotify.c</a>,
+<a href="../base/gsnotify.h">base/gsnotify.h</a>,
+<a href="../base/gsrect.h">base/gsrect.h</a>,
+<a href="../base/gstypes.h">base/gstypes.h</a>,
+<a href="../base/gsuid.h">base/gsuid.h</a>,
+<a href="../base/gsutil.h">base/gsutil.h</a>,
+<a href="../base/gsutil.c">base/gsutil.c</a>,
+<a href="../base/gx.h">base/gx.h</a>,
+<a href="../base/md5.c">base/md5.c</a>,
+<a href="../base/md5.h">base/md5.h</a>,
+<a href="../base/md5main.c">base/md5main.c</a>,
+<a href="../base/aes.c">base/aes.c</a>,
+<a href="../base/aes.h">base/aes.h</a>.
 
 </dl>
 
@@ -666,58 +665,58 @@ Other:
 <dt>
 Bitmap processing:
 <dd>
-<a href="../src/gsbitcom.c">src/gsbitcom.c</a>,
-<a href="../src/gsbitmap.h">src/gsbitmap.h</a>,
-<a href="../src/gsbitops.c">src/gsbitops.c</a>,
-<a href="../src/gsbitops.h">src/gsbitops.h</a>,
-<a href="../src/gsbittab.c">src/gsbittab.c</a>,
-<a href="../src/gsbittab.h">src/gsbittab.h</a>,
-<a href="../src/gsflip.c">src/gsflip.c</a>,
-<a href="../src/gsflip.h">src/gsflip.h</a>,
-<a href="../src/gxbitmap.h">src/gxbitmap.h</a>,
-<a href="../src/gxbitops.h">src/gxbitops.h</a>,
-<a href="../src/gxsample.c">src/gxsample.c</a>,
-<a href="../src/gxsample.h">src/gxsample.h</a>.
-<a href="../src/gxsamplp.h">src/gxsamplp.h</a>.
+<a href="../base/gsbitcom.c">base/gsbitcom.c</a>,
+<a href="../base/gsbitmap.h">base/gsbitmap.h</a>,
+<a href="../base/gsbitops.c">base/gsbitops.c</a>,
+<a href="../base/gsbitops.h">base/gsbitops.h</a>,
+<a href="../base/gsbittab.c">base/gsbittab.c</a>,
+<a href="../base/gsbittab.h">base/gsbittab.h</a>,
+<a href="../base/gsflip.c">base/gsflip.c</a>,
+<a href="../base/gsflip.h">base/gsflip.h</a>,
+<a href="../base/gxbitmap.h">base/gxbitmap.h</a>,
+<a href="../base/gxbitops.h">base/gxbitops.h</a>,
+<a href="../base/gxsample.c">base/gxsample.c</a>,
+<a href="../base/gxsample.h">base/gxsample.h</a>.
+<a href="../base/gxsamplp.h">base/gxsamplp.h</a>.
 
 <dt>
 Functions:
 <dd>
-<a href="../src/gsfunc.c">src/gsfunc.c</a>,
-<a href="../src/gsfunc.h">src/gsfunc.h</a>,
-<a href="../src/gsfunc0.c">src/gsfunc0.c</a>,
-<a href="../src/gsfunc0.h">src/gsfunc0.h</a>,
-<a href="../src/gsfunc3.c">src/gsfunc3.c</a>,
-<a href="../src/gsfunc3.h">src/gsfunc3.h</a>,
-<a href="../src/gsfunc4.c">src/gsfunc4.c</a>,
-<a href="../src/gsfunc4.h">src/gsfunc4.h</a>,
-<a href="../src/gxfunc.h">src/gxfunc.h</a>.
+<a href="../base/gsfunc.c">base/gsfunc.c</a>,
+<a href="../base/gsfunc.h">base/gsfunc.h</a>,
+<a href="../base/gsfunc0.c">base/gsfunc0.c</a>,
+<a href="../base/gsfunc0.h">base/gsfunc0.h</a>,
+<a href="../base/gsfunc3.c">base/gsfunc3.c</a>,
+<a href="../base/gsfunc3.h">base/gsfunc3.h</a>,
+<a href="../base/gsfunc4.c">base/gsfunc4.c</a>,
+<a href="../base/gsfunc4.h">base/gsfunc4.h</a>,
+<a href="../base/gxfunc.h">base/gxfunc.h</a>.
 
 <dt>
 Parameter lists:
 <dd>
-<a href="../src/gscparam.c">src/gscparam.c</a>,
-<a href="../src/gsparam.c">src/gsparam.c</a>,
-<a href="../src/gsparam.h">src/gsparam.h</a>,
-<a href="../src/gsparam2.c">src/gsparam2.c</a> (not used),
-<a href="../src/gsparams.c">src/gsparams.c</a>,
-<a href="../src/gsparams.h">src/gsparams.h</a>,
-<a href="../src/gsparamx.c">src/gsparamx.c</a>,
-<a href="../src/gsparamx.h">src/gsparamx.h</a>.
+<a href="../base/gscparam.c">base/gscparam.c</a>,
+<a href="../base/gsparam.c">base/gsparam.c</a>,
+<a href="../base/gsparam.h">base/gsparam.h</a>,
+<a href="../base/gsparam2.c">base/gsparam2.c</a> (not used),
+<a href="../base/gsparams.c">base/gsparams.c</a>,
+<a href="../base/gsparams.h">base/gsparams.h</a>,
+<a href="../base/gsparamx.c">base/gsparamx.c</a>,
+<a href="../base/gsparamx.h">base/gsparamx.h</a>.
 
 <dt>
 I/O-related:
 <dd>
-<a href="../src/gdevpipe.c">src/gdevpipe.c</a>,
-<a href="../src/gsfname.c">src/gsfname.c</a>,
-<a href="../src/gsfname.h">src/gsfname.h</a>,
-<a href="../src/gsio.h">src/gsio.h</a>,
-<a href="../src/gsiodev.c">src/gsiodev.c</a>,
-<a href="../src/gsiodevs.c">src/gsiodevs.c</a>,
-<a href="../src/gsiodisk.c">src/gsiodisk.c</a>,
-<a href="../src/gsiorom.c">src/gsiorom.c</a>.
-<a href="../src/gsiorom.h">src/gsiorom.h</a>.
-<a href="../src/gxiodev.h">src/gxiodev.h</a>.
+<a href="../base/gdevpipe.c">base/gdevpipe.c</a>,
+<a href="../base/gsfname.c">base/gsfname.c</a>,
+<a href="../base/gsfname.h">base/gsfname.h</a>,
+<a href="../base/gsio.h">base/gsio.h</a>,
+<a href="../base/gsiodev.c">base/gsiodev.c</a>,
+<a href="../base/gsiodevs.c">base/gsiodevs.c</a>,
+<a href="../base/gsiodisk.c">base/gsiodisk.c</a>,
+<a href="../base/gsiorom.c">base/gsiorom.c</a>.
+<a href="../base/gsiorom.h">base/gsiorom.h</a>.
+<a href="../base/gxiodev.h">base/gxiodev.h</a>.
 
 </dl>
 
@@ -728,53 +727,53 @@ I/O-related:
 <dt>
 Coordinate transformation:
 <dd>
-<a href="../src/gscoord.c">src/gscoord.c</a>,
-<a href="../src/gscoord.h">src/gscoord.h</a>,
-<a href="../src/gsmatrix.c">src/gsmatrix.c</a>,
-<a href="../src/gsmatrix.h">src/gsmatrix.h</a>,
-<a href="../src/gxcoord.h">src/gxcoord.h</a>,
-<a href="../src/gxmatrix.h">src/gxmatrix.h</a>.
+<a href="../base/gscoord.c">base/gscoord.c</a>,
+<a href="../base/gscoord.h">base/gscoord.h</a>,
+<a href="../base/gsmatrix.c">base/gsmatrix.c</a>,
+<a href="../base/gsmatrix.h">base/gsmatrix.h</a>,
+<a href="../base/gxcoord.h">base/gxcoord.h</a>,
+<a href="../base/gxmatrix.h">base/gxmatrix.h</a>.
 
 <dt>
 Path building:
 <dd>
-<a href="../src/gsdps1.c">src/gsdps1.c</a>,
-<a href="../src/gspath.c">src/gspath.c</a>,
-<a href="../src/gspath.h">src/gspath.h</a>,
-<a href="../src/gspath1.c">src/gspath1.c</a>,
-<a href="../src/gspath2.h">src/gspath2.h</a>,
-<a href="../src/gxpath.c">src/gxpath.c</a>,
-<a href="../src/gxpath.h">src/gxpath.h</a>,
-<a href="../src/gxpath2.c">src/gxpath2.c</a>,
-<a href="../src/gxpcopy.c">src/gxpcopy.c</a>,
-<a href="../src/gxpdash.c">src/gxpdash.c</a>,
-<a href="../src/gxpflat.c">src/gxpflat.c</a>,
-<a href="../src/gzpath.h">src/gzpath.h</a>.
+<a href="../base/gsdps1.c">base/gsdps1.c</a>,
+<a href="../base/gspath.c">base/gspath.c</a>,
+<a href="../base/gspath.h">base/gspath.h</a>,
+<a href="../base/gspath1.c">base/gspath1.c</a>,
+<a href="../base/gspath2.h">base/gspath2.h</a>,
+<a href="../base/gxpath.c">base/gxpath.c</a>,
+<a href="../base/gxpath.h">base/gxpath.h</a>,
+<a href="../base/gxpath2.c">base/gxpath2.c</a>,
+<a href="../base/gxpcopy.c">base/gxpcopy.c</a>,
+<a href="../base/gxpdash.c">base/gxpdash.c</a>,
+<a href="../base/gxpflat.c">base/gxpflat.c</a>,
+<a href="../base/gzpath.h">base/gzpath.h</a>.
 
 <dt>
 Path rendering:
 <dd>
-<a href="../src/gdevddrw.c">src/gdevddrw.c</a>,
-<a href="../src/gdevddrw.h">src/gdevddrw.h</a>,
-<a href="../src/gxdtfill.h">src/gxdtfill.h</a>,
-<a href="../src/gsdps1.c">src/gsdps1.c</a>,
-<a href="../src/gspaint.c">src/gspaint.c</a>,
-<a href="../src/gspaint.h">src/gspaint.h</a>,
-<a href="../src/gspenum.h">src/gspenum.h</a>,
-<a href="../src/gxfill.c">src/gxfill.c</a>,
-<a href="../src/gxfill.h">src/gxfill.h</a>,
-<a href="../src/gxfillsl.h">src/gxfills1.h</a>,
-<a href="../src/gxfilltr.h">src/gxfilltr.h</a>,
-<a href="../src/gxfillts.h">src/gxfillts.h</a>,
-<a href="../src/gximask.c">src/gximask.c</a>,
-<a href="../src/gximask.h">src/gximask.h</a>,
-<a href="../src/gxfdrop.c">src/gxdrop.c</a>,
-<a href="../src/gxfdrop.h">src/gxdrop.h</a>,
-<a href="../src/gxpaint.c">src/gxpaint.c</a>,
-<a href="../src/gxpaint.h">src/gxpaint.h</a>,
-<a href="../src/gxstroke.c">src/gxstroke.c</a>,
-<a href="../src/gzspotan.c">src/gzspotan.c</a>,
-<a href="../src/gzspotan.h">src/gzspotan.h</a>.
+<a href="../base/gdevddrw.c">base/gdevddrw.c</a>,
+<a href="../base/gdevddrw.h">base/gdevddrw.h</a>,
+<a href="../base/gxdtfill.h">base/gxdtfill.h</a>,
+<a href="../base/gsdps1.c">base/gsdps1.c</a>,
+<a href="../base/gspaint.c">base/gspaint.c</a>,
+<a href="../base/gspaint.h">base/gspaint.h</a>,
+<a href="../base/gspenum.h">base/gspenum.h</a>,
+<a href="../base/gxfill.c">base/gxfill.c</a>,
+<a href="../base/gxfill.h">base/gxfill.h</a>,
+<a href="../base/gxfillsl.h">base/gxfillsl.h</a>,
+<a href="../base/gxfilltr.h">base/gxfilltr.h</a>,
+<a href="../base/gxfillts.h">base/gxfillts.h</a>,
+<a href="../base/gximask.c">base/gximask.c</a>,
+<a href="../base/gximask.h">base/gximask.h</a>,
+<a href="../base/gxfdrop.c">base/gxfdrop.c</a>,
+<a href="../base/gxfdrop.h">base/gxfdrop.h</a>,
+<a href="../base/gxpaint.c">base/gxpaint.c</a>,
+<a href="../base/gxpaint.h">base/gxpaint.h</a>,
+<a href="../base/gxstroke.c">base/gxstroke.c</a>,
+<a href="../base/gzspotan.c">base/gzspotan.c</a>,
+<a href="../base/gzspotan.h">base/gzspotan.h</a>.
 
 <dt>
 Clipping:
@@ -790,76 +789,72 @@ See under <a href="#Clipping">Clipping</a> below.
 <dt>
 Fonts, generic:
 <dd>
-<a href="../src/gsfont.c">src/gsfont.c</a>,
-<a href="../src/gsfont.h">src/gsfont.h</a>,
-<a href="../src/gxfcopy.c">src/gxfcopy.c</a>,
-<a href="../src/gxfcopy.h">src/gxfcopy.h</a>,
-<a href="../src/gxfont.h">src/gxfont.h</a>.
+<a href="../base/gsfont.c">base/gsfont.c</a>,
+<a href="../base/gsfont.h">base/gsfont.h</a>,
+<a href="../base/gxfcopy.c">base/gxfcopy.c</a>,
+<a href="../base/gxfcopy.h">base/gxfcopy.h</a>,
+<a href="../base/gxfont.h">base/gxfont.h</a>.
 
 <dt>
 Fonts, specific FontTypes:
 <dd>
-<a href="../src/gsfcid.c">src/gsfcid.c</a>,
-<a href="../src/gsfcid2.c">src/gsfcid.c</a>,
-<a href="../src/gsfcmap.c">src/gsfcmap.c</a>,
-<a href="../src/gsfcmap1.c">src/gsfcmap1.c</a>,
-<a href="../src/gsfcmap.h">src/gsfcmap.h</a>,
-<a href="../src/gsfont0.c">src/gsfont0.c</a>,
-<a href="../src/gsfont0c.c">src/gsfont0.c</a>,
-<a href="../src/gxcid.h">src/gxcid.h</a>,
-<a href="../src/gxfcid.h">src/gxfcid.h</a>,
-<a href="../src/gxfcmap.h">src/gxfcmap.h</a>,
-<a href="../src/gxfcmap1.h">src/gxfcmap1.h</a>,
-<a href="../src/gxfont0.h">src/gxfont0.h</a>,
-<a href="../src/gxfont0c.h">src/gxfont0c.h</a>,
-<a href="../src/gxfont1.h">src/gxfont1.h</a>,
-<a href="../src/gxfont42.h">src/gxfont42.h</a>,
-<a href="../src/gxftype.h">src/gxftype.h</a>,
-<a href="../src/gxttf.h">src/gxttf.h</a>.
+<a href="../psi/gs.cid.c">psi/gs.cid.c</a>,
+<a href="../psi/gs.cid2.c">psi/gs.cid.c</a>,
+<a href="../psi/gs.cmap.c">psi/gs.cmap.c</a>,
+<a href="../psi/gs.cmap1.c">psi/gs.cmap1.c</a>,
+<a href="../psi/gs.cmap.h">psi/gs.cmap.h</a>,
+<a href="../base/gsfont0.c">base/gsfont0.c</a>,
+<a href="../base/gsfont0c.c">base/gsfont0.c</a>,
+<a href="../base/gxcid.h">base/gxcid.h</a>,
+<a href="../base/gxfcid.h">base/gxfcid.h</a>,
+<a href="../base/gxfcmap.h">base/gxfcmap.h</a>,
+<a href="../base/gxfcmap1.h">base/gxfcmap1.h</a>,
+<a href="../base/gxfont0.h">base/gxfont0.h</a>,
+<a href="../base/gxfont0c.h">base/gxfont0c.h</a>,
+<a href="../base/gxfont1.h">base/gxfont1.h</a>,
+<a href="../base/gxfont42.h">base/gxfont42.h</a>,
+<a href="../base/gxftype.h">base/gxftype.h</a>,
+<a href="../base/gxttf.h">base/gxttf.h</a>.
 
 <dt>
 Character rendering + font cache, generic:
 <dd>
-<a href="../src/gsccode.h">src/gsccode.h</a>,
-<a href="../src/gschar.c">src/gschar.c</a>,
-<a href="../src/gschar.h">src/gschar.h</a>,
-<a href="../src/gscpm.h">src/gscpm.h</a>,
-<a href="../src/gsgdata.c">src/gsgdata.c</a>,
-<a href="../src/gsgdata.h">src/gsgdata.h</a>,
-<a href="../src/gsgcache.c">src/gsgcache.c</a>,
-<a href="../src/gsgcache.h">src/gsgcache.h</a>,
-<a href="../src/gstext.c">src/gstext.c</a>,
-<a href="../src/gstext.h">src/gstext.h</a>,
-<a href="../src/gxbcache.c">src/gxbcache.c</a>,
-<a href="../src/gxbcache.h">src/gxbcache.h</a>,
-<a href="../src/gxccache.c">src/gxccache.c</a>,
-<a href="../src/gxccman.c">src/gxccman.c</a>,
-<a href="../src/gxchar.c">src/gxchar.c</a>,
-<a href="../src/gxchar.h">src/gxchar.h</a>,
-<a href="../src/gxfcache.h">src/gxfcache.h</a>,
-<a href="../src/gxtext.h">src/gxtext.h</a>.
+<a href="../psi/gs.code.h">psi/gs.code.h</a>,
+<a href="../base/gschar.c">base/gschar.c</a>,
+<a href="../base/gschar.h">base/gschar.h</a>,
+<a href="../base/gscpm.h">base/gscpm.h</a>,
+<a href="../base/gsgdata.c">base/gsgdata.c</a>,
+<a href="../base/gsgdata.h">base/gsgdata.h</a>,
+<a href="../psi/gs.cache.c">psi/gs.cache.c</a>,
+<a href="../psi/gs.cache.h">psi/gs.cache.h</a>,
+<a href="../base/gstext.c">base/gstext.c</a>,
+<a href="../base/gstext.h">base/gstext.h</a>,
+<a href="../base/gxbcache.c">base/gxbcache.c</a>,
+<a href="../base/gxbcache.h">base/gxbcache.h</a>,
+<a href="../base/gxccache.c">base/gxccache.c</a>,
+<a href="../base/gxccman.c">base/gxccman.c</a>,
+<a href="../base/gxchar.c">base/gxchar.c</a>,
+<a href="../base/gxchar.h">base/gxchar.h</a>,
+<a href="../base/gxfcache.h">base/gxfcache.h</a>,
+<a href="../base/gxtext.h">base/gxtext.h</a>.
 
 <dt>
 Character rendering, specific FontTypes:
 <dd>
-<a href="../src/gschar0.c">src/gschar0.c</a>,
-<a href="../src/gscrypt1.c">src/gscrypt1.c</a>,
-<a href="../src/gscrypt1.h">src/gscrypt1.h</a>,
-<a href="../src/gstype1.c">src/gstype1.c</a>,
-<a href="../src/gstype1.h">src/gstype1.h</a>,
-<a href="../src/gstype2.c">src/gstype2.c</a>,
-<a href="../src/gstype42.c">src/gstype42.c</a>,
-<a href="../src/gxchrout.c">src/gxchrout.c</a>,
-<a href="../src/gxchrout.h">src/gxchrout.h</a>,
-<a href="../src/gxhint1.c">src/gxhint1.c</a>,
-<a href="../src/gxhint2.c">src/gxhint2.c</a>,
-<a href="../src/gxhint3.c">src/gxhint3.c</a>,
-<a href="../src/gxhintn.h">src/gxhintn.h</a>,
-<a href="../src/gxhintn.c">src/gxhintn.c</a>,
-<a href="../src/gxhintn1.c">src/gxhintn1.c</a>,
-<a href="../src/gxop1.h">src/gxop1.h</a>,
-<a href="../src/gxtype1.c">src/gxtype1.c</a>,
-<a href="../src/gxtype1.h">src/gxtype1.h</a>.
+<a href="../base/gschar0.c">base/gschar0.c</a>,
+<a href="../base/gscrypt1.c">base/gscrypt1.c</a>,
+<a href="../base/gscrypt1.h">base/gscrypt1.h</a>,
+<a href="../base/gstype1.c">base/gstype1.c</a>,
+<a href="../base/gstype1.h">base/gstype1.h</a>,
+<a href="../base/gstype2.c">base/gstype2.c</a>,
+<a href="../base/gstype42.c">base/gstype42.c</a>,
+<a href="../base/gxchrout.c">base/gxchrout.c</a>,
+<a href="../base/gxchrout.h">base/gxchrout.h</a>,
+<a href="../base/gxhintn.h">base/gxhintn.h</a>,
+<a href="../base/gxhintn.c">base/gxhintn.c</a>,
+<a href="../base/gxhintn1.c">base/gxhintn1.c</a>,
+<a href="../base/gxtype1.c">base/gxtype1.c</a>,
+<a href="../base/gxtype1.h">base/gxtype1.h</a>.
 
 </dl>
 
@@ -870,17 +865,17 @@ Character rendering, specific FontTypes:
 <dt>
 Buffered API (mostly for PostScript interpreter):
 <dd>
-<a href="../src/gsimage.c">src/gsimage.c</a>,
-<a href="../src/gsimage.h">src/gsimage.h</a>.
+<a href="../base/gsimage.c">base/gsimage.c</a>,
+<a href="../base/gsimage.h">base/gsimage.h</a>.
 
 <dt>
 Generic support:
 <dd>
-<a href="../src/gsiparam.h">src/gsiparam.h</a>,
-<a href="../src/gxiclass.h">src/gxiclass.h</a>,
-<a href="../src/gximage.c">src/gximage.c</a>,
-<a href="../src/gximage.h">src/gximage.h</a>,
-<a href="../src/gxiparam.h">src/gxiparam.h</a>.
+<a href="../base/gsiparam.h">base/gsiparam.h</a>,
+<a href="../base/gxiclass.h">base/gxiclass.h</a>,
+<a href="../base/gximage.c">base/gximage.c</a>,
+<a href="../base/gximage.h">base/gximage.h</a>,
+<a href="../base/gxiparam.h">base/gxiparam.h</a>.
 
 <dt>
 Type 1 and 4 images:
@@ -891,48 +886,48 @@ Type 1 and 4 images:
 <dt>
 Setup:
 <dd>
-<a href="../src/gsiparm4.h">src/gsiparm4.h</a>,
-<a href="../src/gximage1.c">src/gximage1.c</a>,
-<a href="../src/gximage4.c">src/gximage4.c</a>.
+<a href="../base/gsiparm4.h">base/gsiparm4.h</a>,
+<a href="../base/gximage1.c">base/gximage1.c</a>,
+<a href="../base/gximage4.c">base/gximage4.c</a>.
 
 <dt>
 Rendering:
 <dd>
-<a href="../src/gxi12bit.c">src/gxi12bit.c</a>,
-<a href="../src/gxi16bit.c">src/gxi16bit.c</a>,
-<a href="../src/gxicolor.c">src/gxicolor.c</a>,
-<a href="../src/gxidata.c">src/gxidata.c</a>,
-<a href="../src/gxifast.c">src/gxifast.c</a>,
-<a href="../src/gximono.c">src/gximono.c</a>,
-<a href="../src/gxino12b.c">src/gxino12b.c</a>,
-<a href="../src/gxino16b.c">src/gxino16b.c</a>,
-<a href="../src/gxipixel.c">src/gxipixel.c</a>,
-<a href="../src/gxiscale.c">src/gxiscale.c</a>.
+<a href="../base/gxi12bit.c">base/gxi12bit.c</a>,
+<a href="../base/gxi16bit.c">base/gxi16bit.c</a>,
+<a href="../base/gxicolor.c">base/gxicolor.c</a>,
+<a href="../base/gxidata.c">base/gxidata.c</a>,
+<a href="../base/gxifast.c">base/gxifast.c</a>,
+<a href="../base/gximono.c">base/gximono.c</a>,
+<a href="../base/gxino12b.c">base/gxino12b.c</a>,
+<a href="../base/gxino16b.c">base/gxino16b.c</a>,
+<a href="../base/gxipixel.c">base/gxipixel.c</a>,
+<a href="../base/gxiscale.c">base/gxiscale.c</a>.
 
 </dl>
 
 <dt>
 Type 2 images (Display PostScript):
 <dd>
-<a href="../src/gsiparm2.h">src/gsiparm2.h</a>,
-<a href="../src/gximage2.c">src/gximage2.c</a>.
+<a href="../base/gsiparm2.h">base/gsiparm2.h</a>,
+<a href="../base/gximage2.c">base/gximage2.c</a>.
 
 <dt>
 Type 3 images:
 <dd>
-<a href="../src/gsipar3x.h">src/gsipar3x.h</a>,
-<a href="../src/gsiparm3.h">src/gsiparm3.h</a>,
-<a href="../src/gximag3x.c">src/gximag3x.c</a>,
-<a href="../src/gximag3x.h">src/gximag3x.h</a>,
-<a href="../src/gximage3.c">src/gximage3.c</a>,
-<a href="../src/gximage3.h">src/gximage3.h</a>.
+<a href="../base/gsipar3x.h">base/gsipar3x.h</a>,
+<a href="../base/gsiparm3.h">base/gsiparm3.h</a>,
+<a href="../base/gximag3x.c">base/gximag3x.c</a>,
+<a href="../base/gximag3x.h">base/gximag3x.h</a>,
+<a href="../base/gximage3.c">base/gximage3.c</a>,
+<a href="../base/gximage3.h">base/gximage3.h</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/gsimpath.c">src/gsimpath.c</a>,
-<a href="../src/simscale.c">src/simscale.c</a>,
-<a href="../src/simscale.h">src/simscale.h</a>.
+<a href="../base/gsimpath.c">base/gsimpath.c</a>,
+<a href="../base/simscale.c">base/simscale.c</a>,
+<a href="../base/simscale.h">base/simscale.h</a>.
 .
 
 </dl>
@@ -947,14 +942,14 @@ the order in which they occur in the rendering pipeline.
 
 <li>Clients of the graphics library normally specify colors using the
 <em>client color</em> structure (<code>gs_client_color</code>, defined in
-<a href="../src/gsccolor.h">src/gsccolor.h</a>), consisting of one or more
+<a href="../psi/gs.color.h">psi/gs.color.h</a>), consisting of one or more
 numeric values and/or a pointer to a Pattern instance.  This corresponds
 directly to the values that would be passed to the PostScript
 <code>setcolor</code> operator: one or more (floating-point) numeric
 components and/or a Pattern.  Client colors are interpreted relative to a
 color space (<code>gs_color_space</code>, defined in <a
-href="../src/gscspace.h">src/gscspace.h</a> and <a
-href="../src/gxcspace.h">src/gxcspace.h</a>, with specific color spaces
+href="../base/gscspace.h">base/gscspace.h</a> and <a
+href="../base/gxcspace.h">base/gxcspace.h</a>, with specific color spaces
 defined in other files).  Client colors do not explicitly reference the
 color space in which they are are interpreted: <code>setcolor</code> uses
 the color space in the graphics state, while images and shadings explicitly
@@ -969,21 +964,21 @@ confusion here between color spaces and color models will have to be cleaned
 up when we implement native Separation/DeviceN colors.)  Concrete colors are
 like the numeric values in a client color, except that they are represented
 by arrays of <code>frac</code> values (defined in <a
-href="../src/gxfrac.h">src/gxfrac.h</a>) rather than floats.  The procedure
+href="../base/gxfrac.h">base/gxfrac.h</a>) rather than floats.  The procedure
 for this step is the virtual <code>concretize_color</code> and
 <code>concrete_space</code> procedures in the (original) color space.
 This step reduces Indexed colors, CIEBased colors, and Separation and
 DeviceN colors that use the alternate space.
 
 <li>The final step requires mapping a concrete color to the device's color
-model, done by procedures in <a href="../src/gxcmap.c">src/gxcmap.c</a>.
+model, done by procedures in <a href="../base/gxcmap.c">base/gxcmap.c</a>.
 These procedures combine the following three conceptual sub-steps:
 
 <ul>
 
 <li>A possible mapping between Device color spaces, possibly involving black
 generation and undercolor removal.  The non-trivial cases are implemented in
-<a href="../src/gxdcconv.c">src/gxdcconv.c</a>.
+<a href="../base/gxdcconv.c">base/gxdcconv.c</a>.
 
 <li>Application of the transfer function(s) (done in-line).
 
@@ -993,8 +988,8 @@ generation and undercolor removal.  The non-trivial cases are implemented in
 
 The result is called (inappropriately) a <em>device color</em>
 (<code>gx_device_color</code>, defined in <a
-href="../src/gsdcolor.h">src/gsdcolor.h</a> and <a
-href="../src/gxdcolor.h">src/gxdcolor.h</a>).  For ordinary non-Pattern
+href="../psi/gs.color.h">psi/gs.color.h</a> and <a
+href="../base/gxdcolor.h">base/gxdcolor.h</a>).  For ordinary non-Pattern
 colors, a device color is either a pure color, or a halftone.  The device
 and color model associated with a device color are implicit.  The procedure
 for this step is the virtual <code>remap_concrete_color</code> procedure
@@ -1002,12 +997,12 @@ in the color space.
 
 <li>The pure colors that underlie a device color are opaque <em>pixel
 values</em> defined by the device (misnamed <code>gx_color_index</code>,
-defined in <a href="../src/gscindex.h">src/gscindex.h</a>).  The device with
+defined in <a href="../base/gscindex.h">base/gscindex.h</a>).  The device with
 which they are associated is implicit.  Although the format and
 interpretation of a pixel value are known only to the device, the device's
 color model and color representation capabilities are public, defined by a
 <code>gx_color_info</code> structure stored in the device (defined in <a
-href="../src/gxdevcli.h">src/gxdevcli.h</a>).  Virtual procedures of the
+href="../base/gxdevcli.h">base/gxdevcli.h</a>).  Virtual procedures of the
 device driver map between pixel values and RGB or CMYK.  (This area is
 untidy and will need to be cleaned up when we implement native
 Separation/DeviceN colors.)
@@ -1043,67 +1038,66 @@ that involve a RasterOp, do something more complicated.
 <dt>
 Color specification:
 <dd>
-<a href="../src/gsccolor.h">src/gsccolor.h</a>,
-<a href="../src/gscolor.c">src/gscolor.c</a>,
-<a href="../src/gscolor.h">src/gscolor.h</a>,
-<a href="../src/gscolor1.c">src/gscolor1.c</a>,
-<a href="../src/gscolor1.h">src/gscolor1.h</a>,
-<a href="../src/gscolor2.c">src/gscolor2.c</a>,
-<a href="../src/gscolor2.h">src/gscolor2.h</a>,
-<a href="../src/gscolor3.c">src/gscolor3.c</a>,
-<a href="../src/gscolor3.h">src/gscolor3.h</a>,
-<a href="../src/gshsb.c">src/gshsb.c</a>,
-<a href="../src/gshsb.h">src/gshsb.h</a>,
-<a href="../src/gxcolor2.h">src/gxcolor2.h</a>,
-<a href="../src/gxcvalue.h">src/gxcvalue.h</a>.
+<a href="../psi/gs.color.h">psi/gs.color.h</a>,
+<a href="../base/gscolor.c">base/gscolor.c</a>,
+<a href="../base/gscolor.h">base/gscolor.h</a>,
+<a href="../base/gscolor1.c">base/gscolor1.c</a>,
+<a href="../base/gscolor1.h">base/gscolor1.h</a>,
+<a href="../base/gscolor2.c">base/gscolor2.c</a>,
+<a href="../base/gscolor2.h">base/gscolor2.h</a>,
+<a href="../base/gscolor3.c">base/gscolor3.c</a>,
+<a href="../base/gscolor3.h">base/gscolor3.h</a>,
+<a href="../base/gshsb.c">base/gshsb.c</a>,
+<a href="../base/gshsb.h">base/gshsb.h</a>,
+<a href="../base/gxcolor2.h">base/gxcolor2.h</a>,
+<a href="../base/gxcvalue.h">base/gxcvalue.h</a>.
 
 <dt>
 Color spaces:
 <dd>
-<a href="../src/gscdevn.c">src/gscdevn.c</a>,
-<a href="../src/gscdevn.h">src/gscdevn.h</a>,
-<a href="../src/gscie.c">src/gscie.c</a>,
-<a href="../src/gscie.h">src/gscie.h</a>,
-<a href="../src/gscpixel.c">src/gscpixel.c</a>,
-<a href="../src/gscpixel.h">src/gscpixel.h</a>,
-<a href="../src/gscscie.c">src/gscscie.c</a>,
-<a href="../src/gscsepnm.h">src/gscsepnm.h</a>,
-<a href="../src/gscsepr.c">src/gscsepr.c</a>,
-<a href="../src/gscsepr.h">src/gscsepr.h</a>,
-<a href="../src/gscspace.c">src/gscspace.c</a>,
-<a href="../src/gscspace.h">src/gscspace.h</a>,
-<a href="../src/gscssub.c">src/gscssub.c</a>,
-<a href="../src/gscssub.h">src/gscssub.h</a>,
-<a href="../src/gxcdevn.h">src/gxcdevn.h</a>,
-<a href="../src/gxcie.h">src/gxcie.h</a>,
-<a href="../src/gxcspace.h">src/gxcspace.h</a>.
+<a href="../base/gscdevn.c">base/gscdevn.c</a>,
+<a href="../base/gscdevn.h">base/gscdevn.h</a>,
+<a href="../base/gscie.c">base/gscie.c</a>,
+<a href="../base/gscie.h">base/gscie.h</a>,
+<a href="../base/gscpixel.c">base/gscpixel.c</a>,
+<a href="../base/gscpixel.h">base/gscpixel.h</a>,
+<a href="../base/gscscie.c">base/gscscie.c</a>,
+<a href="../base/gscsepr.c">base/gscsepr.c</a>,
+<a href="../base/gscsepr.h">base/gscsepr.h</a>,
+<a href="../base/gscspace.c">base/gscspace.c</a>,
+<a href="../base/gscspace.h">base/gscspace.h</a>,
+<a href="../base/gscssub.c">base/gscssub.c</a>,
+<a href="../base/gscssub.h">base/gscssub.h</a>,
+<a href="../base/gxcdevn.h">base/gxcdevn.h</a>,
+<a href="../base/gxcie.h">base/gxcie.h</a>,
+<a href="../base/gxcspace.h">base/gxcspace.h</a>.
 
 <dt>
 Color mapping:
 <dd>
-<a href="../src/gsciemap.c">src/gsciemap.c</a>,
-<a href="../src/gscindex.h">src/gscindex.h</a>,
-<a href="../src/gscrd.c">src/gscrd.c</a>,
-<a href="../src/gscrd.h">src/gscrd.h</a>,
-<a href="../src/gscrdp.c">src/gscrdp.c</a>,
-<a href="../src/gscrdp.h">src/gscrdp.h</a>,
-<a href="../src/gscsel.h">src/gscsel.h</a>,
-<a href="../src/gsdcolor.h">src/gsdcolor.h</a>,
-<a href="../src/gxcindex.h">src/gxcindex.h</a>,
-<a href="../src/gxcmap.c">src/gxcmap.c</a>,
-<a href="../src/gxcmap.h">src/gxcmap.h</a>,
-<a href="../src/gxctable.c">src/gxctable.c</a>,
-<a href="../src/gxctable.h">src/gxctable.h</a>,
-<a href="../src/gxdcconv.c">src/gxdcconv.c</a>,
-<a href="../src/gxdcconv.h">src/gxdcconv.h</a>,
-<a href="../src/gxdcolor.c">src/gxdcolor.c</a>,
-<a href="../src/gxdcolor.h">src/gxdcolor.h</a>,
-<a href="../src/gxdevndi.c">src/gevndi.c</a>,
-<a href="../src/gxdevndi.h">src/gxdevndi.h</a>,
-<a href="../src/gxdither.h">src/gxdither.h</a>,
-<a href="../src/gxfmap.h">src/gxfmap.h</a>,
-<a href="../src/gxlum.h">src/gxlum.h</a>,
-<a href="../src/gxtmap.h">src/gxtmap.h</a>.
+<a href="../base/gsciemap.c">base/gsciemap.c</a>,
+<a href="../base/gscindex.h">base/gscindex.h</a>,
+<a href="../base/gscrd.c">base/gscrd.c</a>,
+<a href="../base/gscrd.h">base/gscrd.h</a>,
+<a href="../base/gscrdp.c">base/gscrdp.c</a>,
+<a href="../base/gscrdp.h">base/gscrdp.h</a>,
+<a href="../base/gscsel.h">base/gscsel.h</a>,
+<a href="../psi/gs.color.h">psi/gs.color.h</a>,
+<a href="../base/gxcindex.h">base/gxcindex.h</a>,
+<a href="../base/gxcmap.c">base/gxcmap.c</a>,
+<a href="../base/gxcmap.h">base/gxcmap.h</a>,
+<a href="../base/gxctable.c">base/gxctable.c</a>,
+<a href="../base/gxctable.h">base/gxctable.h</a>,
+<a href="../base/gxdcconv.c">base/gxdcconv.c</a>,
+<a href="../base/gxdcconv.h">base/gxdcconv.h</a>,
+<a href="../base/gxdcolor.c">base/gxdcolor.c</a>,
+<a href="../base/gxdcolor.h">base/gxdcolor.h</a>,
+<a href="../base/gxdevndi.c">base/gxdevndi.c</a>,
+<a href="../base/gxdevndi.h">base/gxdevndi.h</a>,
+<a href="../base/gxdither.h">base/gxdither.h</a>,
+<a href="../base/gxfmap.h">base/gxfmap.h</a>,
+<a href="../base/gxlum.h">base/gxlum.h</a>,
+<a href="../base/gxtmap.h">base/gxtmap.h</a>.
 
 <p>
 ICC profiles are in some ways a special case of color mapping, but are
@@ -1111,8 +1105,8 @@ not standard in PostScript.
 
 <dt>
 <dd>
-<a href="../src/gsicc.c">src/gsicc.c</a>,
-<a href="../src/gsicc.h">src/gsicc.h</a>,
+<a href="../psi/gs.cc.c">psi/gs.cc.c</a>,
+<a href="../psi/gs.cc.h">psi/gs.cc.h</a>,
 
 <p>
 The following files provide a callback mechanism to allow a client program 
@@ -1121,11 +1115,11 @@ color spaces. Among other uses this can be used to provide special handling for
 PANTONE colors.
 <dt>
 <dd>
-<a href="../src/gsnamecl.c">src/gsnamecl.c</a>,
-<a href="../src/gsnamecl.h">src/gsnamecl.h</a>,
-<a href="../src/gsncdummy.c">src/gsncdummy.c</a>,
-<a href="../src/gsncdummy.h">src/gsncdummy.h</a>,
-<a href="../src/zncdummy.c">src/zncdummy.c</a>,
+<a href="../base/gsnamecl.c">base/gsnamecl.c</a>,
+<a href="../base/gsnamecl.h">base/gsnamecl.h</a>,
+<a href="../psi/gs.cdummy.c">psi/gs.cdummy.c</a>,
+<a href="../psi/gs.cdummy.h">psi/gs.cdummy.h</a>,
+<a href="../psi/zncdummy.c">psi/zncdummy.c</a>,
 
 </dl>
 
@@ -1170,41 +1164,41 @@ pixel, and stores the color into the fully rendered halftone.
 
 <p>
 The halftone level for rendering a color is computed in <a
-href="../src/gxdevndi.c">src/gxdevndi.c</a>; the actual halftone mask or
-tile is computed either in <a href="../src/gxcht.c">src/gxcht.c</a> (for
-multi-plane halftones), or in <a href="../src/gxht.c">src/gxht.c</a> and <a
-href="../src/gxhtbit.c">src/gxhtbit.c</a> (for binary halftones).
+href="../base/gxdevndi.c">base/gxdevndi.c</a>; the actual halftone mask or
+tile is computed either in <a href="../base/gxcht.c">base/gxcht.c</a> (for
+multi-plane halftones), or in <a href="../base/gxht.c">base/gxht.c</a> and <a
+href="../base/gxhtbit.c">base/gxhtbit.c</a> (for binary halftones).
 
 <dl>
 
 <dt>
 Halftoning:
 <dd>
-<a href="../src/gsht.c">src/gsht.c</a>,
-<a href="../src/gsht.h">src/gsht.h</a>,
-<a href="../src/gsht1.c">src/gsht1.c</a>,
-<a href="../src/gsht1.h">src/gsht1.h</a>,
-<a href="../src/gshtscr.c">src/gshtscr.c</a>,
-<a href="../src/gshtx.c">src/gshtx.c</a>,
-<a href="../src/gshtx.h">src/gshtx.h</a>,
-<a href="../src/gxcht.c">src/gxcht.c</a>,
-<a href="../src/gxdht.h">src/gxdht.h</a>,
-<a href="../src/gxdhtres.h">src/gxdhtres.h</a>,
-<a href="../src/gxht.c">src/gxht.c</a>,
-<a href="../src/gxht.h">src/gxht.h</a>,
-<a href="../src/gxhtbit.c">src/gxhtbit.c</a>,
-<a href="../src/gxhttile.h">src/gxhttile.h</a>,
-<a href="../src/gxhttype.h">src/gxhttype.h</a>,
-<a href="../src/gzht.h">src/gzht.h</a>.
+<a href="../base/gsht.c">base/gsht.c</a>,
+<a href="../base/gsht.h">base/gsht.h</a>,
+<a href="../base/gsht1.c">base/gsht1.c</a>,
+<a href="../base/gsht1.h">base/gsht1.h</a>,
+<a href="../base/gsht.cr.c">base/gsht.cr.c</a>,
+<a href="../base/gshtx.c">base/gshtx.c</a>,
+<a href="../base/gshtx.h">base/gshtx.h</a>,
+<a href="../base/gxcht.c">base/gxcht.c</a>,
+<a href="../base/gxdht.h">base/gxdht.h</a>,
+<a href="../base/gxdhtres.h">base/gxdhtres.h</a>,
+<a href="../base/gxht.c">base/gxht.c</a>,
+<a href="../base/gxht.h">base/gxht.h</a>,
+<a href="../base/gxhtbit.c">base/gxhtbit.c</a>,
+<a href="../base/gxhttile.h">base/gxhttile.h</a>,
+<a href="../base/gxhttype.h">base/gxhttype.h</a>,
+<a href="../base/gzht.h">base/gzht.h</a>.
 
 <dt>
 Well tempered screening:
 <dd>
-<a href="../src/gswts.h">src/gswts.h</a>,
-<a href="../src/gswts.c">src/gswts.c</a>,
-<a href="../src/gxwts.h">src/gxwts.h</a>,
-<a href="../src/gxwts.c">src/gxwts.c</a>,
-<a href="../src/wtsimdi.c">src/wtsimdi.c</a>.
+<a href="../base/gswts.h">base/gswts.h</a>,
+<a href="../base/gswts.c">base/gswts.c</a>,
+<a href="../base/gxwts.h">base/gxwts.h</a>,
+<a href="../base/gxwts.c">base/gxwts.c</a>,
+<a href="../base/wtsimdi.c">base/wtsimdi.c</a>.
 </dl>
 
 <p>
@@ -1226,15 +1220,15 @@ operator.
 <dt>
 Patterns:
 <dd>
-<a href="../src/gspcolor.c">src/gspcolor.c</a>,
-<a href="../src/gspcolor.h">src/gspcolor.h</a>,
-<a href="../src/gsptype1.c">src/gsptype1.c</a>,
-<a href="../src/gsptype1.h">src/gsptype1.h</a>,
-<a href="../src/gxp1fill.c">src/gxp1fill.c</a>,
-<a href="../src/gxp1impl.h">src/gxp1impl.h</a>,
-<a href="../src/gxpcache.h">src/gxpcache.h</a>,
-<a href="../src/gxpcmap.c">src/gxpcmap.c</a>,
-<a href="../src/gxpcolor.h">src/gxpcolor.h</a>.
+<a href="../psi/gs.color.c">psi/gs.color.c</a>,
+<a href="../psi/gs.color.h">psi/gs.color.h</a>,
+<a href="../base/gsptype1.c">base/gsptype1.c</a>,
+<a href="../base/gsptype1.h">base/gsptype1.h</a>,
+<a href="../base/gxp1fill.c">base/gxp1fill.c</a>,
+<a href="../base/gxp1impl.h">base/gxp1impl.h</a>,
+<a href="../base/gxpcache.h">base/gxpcache.h</a>,
+<a href="../base/gxpcmap.c">base/gxpcmap.c</a>,
+<a href="../base/gxpcolor.h">base/gxpcolor.h</a>.
 
 </dl>
 
@@ -1248,18 +1242,18 @@ shading runs the shading algorithm every time.
 <dt>
 Shading:
 <dd>
-<a href="../src/gsptype2.c">src/gsptype2.c</a>,
-<a href="../src/gsptype2.h">src/gsptype2.h</a>,
-<a href="../src/gsshade.c">src/gsshade.c</a>,
-<a href="../src/gsshade.h">src/gsshade.h</a>,
-<a href="../src/gxshade.c">src/gxshade.c</a>,
-<a href="../src/gxshade.h">src/gxshade.h</a>,
-<a href="../src/gxshade1.c">src/gxshade1.c</a>,
-<a href="../src/gxshade4.c">src/gxshade4.c</a>,
-<a href="../src/gxshade4.h">src/gxshade4.h</a>,
-<a href="../src/gxshade6.c">src/gxshade6.c</a>,
-<a href="../src/gscicach.h">src/gscicach.h</a>,
-<a href="../src/gscicach.c">src/gscicach.c</a>.
+<a href="../base/gsptype2.c">base/gsptype2.c</a>,
+<a href="../base/gsptype2.h">base/gsptype2.h</a>,
+<a href="../base/gsshade.c">base/gsshade.c</a>,
+<a href="../base/gsshade.h">base/gsshade.h</a>,
+<a href="../base/gx.hade.c">base/gx.hade.c</a>,
+<a href="../base/gx.hade.h">base/gx.hade.h</a>,
+<a href="../base/gx.hade1.c">base/gx.hade1.c</a>,
+<a href="../base/gx.hade4.c">base/gx.hade4.c</a>,
+<a href="../base/gx.hade4.h">base/gx.hade4.h</a>,
+<a href="../base/gx.hade6.c">base/gx.hade6.c</a>,
+<a href="../base/gscicach.h">base/gscicach.h</a>,
+<a href="../base/gscicach.c">base/gscicach.c</a>.
 
 </dl>
 
@@ -1274,50 +1268,49 @@ Shading:
 <dt>
 Compositing architecture:
 <dd>
-<a href="../src/gscompt.h">src/gscompt.h</a>,
-<a href="../src/gxcomp.h">src/gxcomp.h</a>.
+<a href="../base/gscompt.h">base/gscompt.h</a>,
+<a href="../base/gxcomp.h">base/gxcomp.h</a>.
 
 <dt>
 RasterOp:
 <dd>
-<a href="../src/gdevdrop.c">src/gdevdrop.c</a>,
-<a href="../src/gdevrops.c">src/gdevrops.c</a>,
-<a href="../src/gsnorop.c">src/gsnorop.c</a>,
-<a href="../src/gsrop.c">src/gsrop.c</a>,
-<a href="../src/gsrop.h">src/gsrop.h</a>,
-<a href="../src/gsropt.h">src/gsropt.h</a>,
-<a href="../src/gsroptab.c">src/gsroptab.c</a>,
-<a href="../src/gxdevrop.h">src/gxdevrop.h</a>.
+<a href="../base/gdevdrop.c">base/gdevdrop.c</a>,
+<a href="../base/gdevrops.c">base/gdevrops.c</a>,
+<a href="../base/gsnorop.c">base/gsnorop.c</a>,
+<a href="../base/gsrop.c">base/gsrop.c</a>,
+<a href="../base/gsrop.h">base/gsrop.h</a>,
+<a href="../base/gsropt.h">base/gsropt.h</a>,
+<a href="../base/gsroptab.c">base/gsroptab.c</a>,
+<a href="../base/gxdevrop.h">base/gxdevrop.h</a>.
 
 <dt>
 Alpha channel and compositing:
 <dd>
-<a href="../src/gsalpha.c">src/gsalpha.c</a>,
-<a href="../src/gsalpha.h">src/gsalpha.h</a>,
-<a href="../src/gsalphac.c">src/gsalphac.c</a>,
-<a href="../src/gsalphac.h">src/gsalphac.h</a>,
-<a href="../src/gsdpnext.h">src/gsdpnext.h</a>,
-<a href="../src/gxalpha.h">src/gxalpha.h</a>.
+<a href="../base/gsalpha.c">base/gsalpha.c</a>,
+<a href="../base/gsalpha.h">base/gsalpha.h</a>,
+<a href="../base/gsalphac.c">base/gsalphac.c</a>,
+<a href="../base/gsalphac.h">base/gsalphac.h</a>,
+<a href="../base/gsdpnext.h">base/gsdpnext.h</a>,
+<a href="../base/gxalpha.h">base/gxalpha.h</a>.
 
 <dt>
 Advanced transparency:
 <dd>
-<a href="../src/gstparam.h">src/gstparam.h</a>,
-<a href="../src/gstrans.c">src/gstrans.c</a>,
-<a href="../src/gstrans.h">src/gstrans.h</a>,
-<a href="../src/gxblend.c">src/gxblend.c</a>,
-<a href="../src/gxblend.h">src/gxblend.h</a>,
-<a href="../src/gdevp14.c">src/gdevp14.c</a>,
-<a href="../src/gdevp14.h">src/gdevp14.h</a>,
-<a href="../src/gdevpnga.c">src/gdevpnga.c</a>.
+<a href="../base/gstparam.h">base/gstparam.h</a>,
+<a href="../base/gstrans.c">base/gstrans.c</a>,
+<a href="../base/gstrans.h">base/gstrans.h</a>,
+<a href="../base/gxblend.c">base/gxblend.c</a>,
+<a href="../base/gxblend.h">base/gxblend.h</a>,
+<a href="../base/gdevp14.c">base/gdevp14.c</a>,
+<a href="../base/gdevp14.h">base/gdevp14.h</a>.
 
 <dt>
 Overprint and Overprint mode:
 <dd>
-<a href="../src/gsovrc.c">src/gsovrc.c</a>,
-<a href="../src/gsovrc.h">src/gsovrc.h</a>,
-<a href="../src/gxoprect.c">src/gxoprect.c</a>,
-<a href="../src/gxoprect.h">src/gxoprect.h</a>.
+<a href="../base/gsovrc.c">base/gsovrc.c</a>,
+<a href="../base/gsovrc.h">base/gsovrc.h</a>,
+<a href="../base/gxoprect.c">base/gxoprect.c</a>,
+<a href="../base/gxoprect.h">base/gxoprect.h</a>.
 There is support for both overprint and overprint mode. There is a general
 compositor based implementation of these features for all devices. In addition,
 the memory devices implement a higher speed set of special fill routines to
@@ -1342,7 +1335,7 @@ Region/path clipping
 <dd>
 This corresponds to the PostScript concept of a clipping path.  The clipping
 region is specified either by a list of rectangles (subject to the
-constraints documented in <a href="../src/gxcpath.h">src/gxcpath.h</a>), or
+constraints documented in <a href="../base/gxcpath.h">base/gxcpath.h</a>), or
 by a path that is converted to such a list of rectangles.
 
 <dt>
@@ -1369,7 +1362,7 @@ Note that simply scan-converting a clipping path in the usual way does not
 produce a succession of rectangles that can simply be stored as the list for
 region-based clipping: in general, the rectangles do not satisfy the
 constraint for rectangle lists specified in <a
-href="../src/gxcpath.h">src/gxcpath.h</a>, since they may overlap in X, Y,
+href="../base/gxcpath.h">base/gxcpath.h</a>, since they may overlap in X, Y,
 or both.  A non-trivial "clipping list accumulator" device is needed to
 produce a rectangle list that does satisfy the constraint.
 
@@ -1378,39 +1371,39 @@ produce a rectangle list that does satisfy the constraint.
 <dt>
 Clipping support:
 <dd>
-<a href="../src/gxclip.c">src/gxclip.c</a>,
-<a href="../src/gxclip.h">src/gxclip.h</a>.
+<a href="../base/gxclip.c">base/gxclip.c</a>,
+<a href="../base/gxclip.h">base/gxclip.h</a>.
 
 <dt>
 Region/path clipping:
 <dd>
-<a href="../src/gxcpath.c">src/gxcpath.c</a>,
-<a href="../src/gxcpath.h">src/gxcpath.h</a>,
-<a href="../src/gzcpath.h">src/gzcpath.h</a>.
+<a href="../base/gxcpath.c">base/gxcpath.c</a>,
+<a href="../base/gxcpath.h">base/gxcpath.h</a>,
+<a href="../base/gzcpath.h">base/gzcpath.h</a>.
 
 <dt>
 Clipping list accumulator:
 <dd>
-<a href="../src/gxacpath.c">src/gxacpath.c</a>,
-<a href="../src/gzacpath.h">src/gzacpath.h</a>.
+<a href="../base/gxacpath.c">base/gxacpath.c</a>,
+<a href="../base/gzacpath.h">base/gzacpath.h</a>.
 
 <dt>
 Mask clipping support:
 <dd>
-<a href="../src/gxmclip.c">src/gxmclip.c</a>,
-<a href="../src/gxmclip.h">src/gxmclip.h</a>.
+<a href="../base/gxmclip.c">base/gxmclip.c</a>,
+<a href="../base/gxmclip.h">base/gxmclip.h</a>.
 
 <dt>
 Stationary mask clipping:
 <dd>
-<a href="../src/gxclipm.c">src/gxclipm.c</a>,
-<a href="../src/gxclipm.h">src/gxclipm.h</a>.
+<a href="../base/gxclipm.c">base/gxclipm.c</a>,
+<a href="../base/gxclipm.h">base/gxclipm.h</a>.
 
 <dt>
 Tiled mask clipping:
 <dd>
-<a href="../src/gxclip2.c">src/gxclip2.c</a>,
-<a href="../src/gxclip2.h">src/gxclip2.h</a>.
+<a href="../base/gxclip2.c">base/gxclip2.c</a>,
+<a href="../base/gxclip2.h">base/gxclip2.h</a>.
 
 </dl>
 
@@ -1421,25 +1414,25 @@ Tiled mask clipping:
 <dt>
 Miscellaneous graphics state:
 <dd>
-<a href="../src/gsclipsr.c">src/gsclipsr.c</a>,
-<a href="../src/gsclipsr.h">src/gsclipsr.h</a>,
-<a href="../src/gsdps.c">src/gsdps.c</a>,
-<a href="../src/gsdps.h">src/gsdps.h</a>,
-<a href="../src/gsdps1.c">src/gsdps1.c</a>,
-<a href="../src/gsistate.c">src/gsistate.c</a>,
-<a href="../src/gsline.c">src/gsline.c</a>,
-<a href="../src/gsline.h">src/gsline.h</a>,
-<a href="../src/gslparam.h">src/gslparam.h</a>,
-<a href="../src/gsstate.c">src/gsstate.c</a>,
-<a href="../src/gsstate.h">src/gsstate.h</a>,
-<a href="../src/gstrap.c">src/gstrap.c</a>,
-<a href="../src/gstrap.h">src/gstrap.h</a>,
-<a href="../src/gxclipsr.h">src/gxclipsr.h</a>,
-<a href="../src/gxistate.h">src/gxistate.h</a>,
-<a href="../src/gxline.h">src/gxline.h</a>,
-<a href="../src/gxstate.h">src/gxstate.h</a>,
-<a href="../src/gzline.h">src/gzline.h</a>,
-<a href="../src/gzstate.h">src/gzstate.h</a>.
+<a href="../base/gsclipsr.c">base/gsclipsr.c</a>,
+<a href="../base/gsclipsr.h">base/gsclipsr.h</a>,
+<a href="../base/gsdps.c">base/gsdps.c</a>,
+<a href="../base/gsdps.h">base/gsdps.h</a>,
+<a href="../base/gsdps1.c">base/gsdps1.c</a>,
+<a href="../base/gsistate.c">base/gsistate.c</a>,
+<a href="../base/gsline.c">base/gsline.c</a>,
+<a href="../base/gsline.h">base/gsline.h</a>,
+<a href="../base/gslparam.h">base/gslparam.h</a>,
+<a href="../base/gsstate.c">base/gsstate.c</a>,
+<a href="../base/gsstate.h">base/gsstate.h</a>,
+<a href="../base/gstrap.c">base/gstrap.c</a>,
+<a href="../base/gstrap.h">base/gstrap.h</a>,
+<a href="../base/gxclipsr.h">base/gxclipsr.h</a>,
+<a href="../base/gxistate.h">base/gxistate.h</a>,
+<a href="../base/gxline.h">base/gxline.h</a>,
+<a href="../base/gxstate.h">base/gxstate.h</a>,
+<a href="../base/gzline.h">base/gzline.h</a>,
+<a href="../base/gzstate.h">base/gzstate.h</a>.
 
 </dl>
 
@@ -1450,8 +1443,8 @@ Miscellaneous graphics state:
 <dt>
 UFST bridge:
 <dd>
-<a href="../src/gxfapiu.c">src/gxfapiu.c</a>,
-<a href="../src/gxfapiu.h">src/gxfapiu.h</a>.
+<a href="../base/gxfapiu.c">base/gxfapiu.c</a>,
+<a href="../base/gxfapiu.h">base/gxfapiu.h</a>.
 </dl>
 
 
@@ -1462,84 +1455,84 @@ UFST bridge:
 <dt>
 Generic driver support:
 <dd>
-<a href="../src/gdevdcrd.c">src/gdevdcrd.c</a>,
-<a href="../src/gdevdcrd.h">src/gdevdcrd.h</a>,
-<a href="../src/gdevdsha.c">src/gdevdsha.c</a>,
-<a href="../src/gdevemap.c">src/gdevemap.c</a>,
-<a href="../src/gsdevice.c">src/gsdevice.c</a>,
-<a href="../src/gsdevice.h">src/gsdevice.h</a>,
-<a href="../src/gsdparam.c">src/gsdparam.c</a>,
-<a href="../src/gsxfont.h">src/gsxfont.h</a>,
-<a href="../src/gxdevbuf.h">src/gxdevbuf.h</a>,
-<a href="../src/gxdevcli.h">src/gxdevcli.h</a>,
-<a href="../src/gxdevice.h">src/gxdevice.h</a>,
-<a href="../src/gxrplane.h">src/gxrplane.h</a>,
-<a href="../src/gxxfont.h">src/gxxfont.h</a>.
+<a href="../base/gdevdcrd.c">base/gdevdcrd.c</a>,
+<a href="../base/gdevdcrd.h">base/gdevdcrd.h</a>,
+<a href="../base/gdevdsha.c">base/gdevdsha.c</a>,
+<a href="../base/gdevemap.c">base/gdevemap.c</a>,
+<a href="../base/gsdevice.c">base/gsdevice.c</a>,
+<a href="../base/gsdevice.h">base/gsdevice.h</a>,
+<a href="../base/gsdparam.c">base/gsdparam.c</a>,
+<a href="../base/gsxfont.h">base/gsxfont.h</a>,
+<a href="../base/gxdevbuf.h">base/gxdevbuf.h</a>,
+<a href="../base/gxdevcli.h">base/gxdevcli.h</a>,
+<a href="../base/gxdevice.h">base/gxdevice.h</a>,
+<a href="../base/gxrplane.h">base/gxrplane.h</a>,
+<a href="../base/gxxfont.h">base/gxxfont.h</a>.
 
 <dt>
 Accessing rendered bits:
 <dd>
-<a href="../src/gdevdbit.c">src/gdevdbit.c</a>,
-<a href="../src/gdevdgbr.c">src/gdevdgbr.c</a>,
-<a href="../src/gxbitfmt.h">src/gxbitfmt.h</a>,
-<a href="../src/gxgetbit.h">src/gxgetbit.h</a>.
+<a href="../base/gdevdbit.c">base/gdevdbit.c</a>,
+<a href="../base/gdevdgbr.c">base/gdevdgbr.c</a>,
+<a href="../base/gxbitfmt.h">base/gxbitfmt.h</a>,
+<a href="../base/gxgetbit.h">base/gxgetbit.h</a>.
 
 <dt>
 "Printer" driver support:
 <dd>
-<a href="../src/gdevmeds.c">src/gdevmeds.c</a>,
-<a href="../src/gdevmeds.h">src/gdevmeds.h</a>,
-<a href="../src/gdevppla.c">src/gdevppla.c</a>,
-<a href="../src/gdevppla.h">src/gdevppla.h</a>,
-<a href="../src/gdevprn.c">src/gdevprn.c</a>,
-<a href="../src/gdevprn.h">src/gdevprn.h</a>,
-<a href="../src/gdevprna.c">src/gdevprna.c</a>,
-<a href="../src/gdevprna.h">src/gdevprna.h</a>,
-<a href="../src/gxband.h">src/gxband.h</a>,
-<a href="../src/gxpageq.c">src/gxpageq.c</a>,
-<a href="../src/gxpageq.h">src/gxpageq.h</a>.
+<a href="../base/gdevmeds.c">base/gdevmeds.c</a>,
+<a href="../base/gdevmeds.h">base/gdevmeds.h</a>,
+<a href="../base/gdevppla.c">base/gdevppla.c</a>,
+<a href="../base/gdevppla.h">base/gdevppla.h</a>,
+<a href="../base/gdevprn.c">base/gdevprn.c</a>,
+<a href="../base/gdevprn.h">base/gdevprn.h</a>,
+<a href="../base/gdevprna.c">base/gdevprna.c</a>,
+<a href="../base/gdevprna.h">base/gdevprna.h</a>,
+<a href="../base/gxband.h">base/gxband.h</a>,
+<a href="../base/gxpageq.c">base/gxpageq.c</a>,
+<a href="../base/gxpageq.h">base/gxpageq.h</a>.
 
 <dt>
 High-level device support:
 <dd>
-<a href="../src/gdevvec.c">src/gdevvec.c</a>,
-<a href="../src/gdevvec.h">src/gdevvec.h</a>,
-<a href="../src/gxhldevc.c">src/gxhldevc.c</a>,
-<a href="../src/gxhldevc.h">src/gxhldevc.h</a>.
+<a href="../base/gdevvec.c">base/gdevvec.c</a>,
+<a href="../base/gdevvec.h">base/gdevvec.h</a>,
+<a href="../base/gxhldevc.c">base/gxhldevc.c</a>,
+<a href="../base/gxhldevc.h">base/gxhldevc.h</a>.
 
 <dt>
 Banding:
 <dd>
-<a href="../src/gxclbits.c">src/gxclbits.c</a>,
-<a href="../src/gxcldev.h">src/gxcldev.h</a>,
-<a href="../src/gxclfile.c">src/gxclfile.c</a>,
-<a href="../src/gxclimag.c">src/gxclimag.c</a>,
-<a href="../src/gxclio.h">src/gxclio.h</a>,
-<a href="../src/gxclist.c">src/gxclist.c</a>,
-<a href="../src/gxclist.h">src/gxclist.h</a>,
-<a href="../src/gxcllzw.c">src/gxcllzw.c</a>,
-<a href="../src/gxclmem.c">src/gxclmem.c</a>,
-<a href="../src/gxclmem.h">src/gxclmem.h</a>,
-<a href="../src/gxclpage.c">src/gxclpage.c</a>,
-<a href="../src/gxclpage.h">src/gxclpage.h</a>,
-<a href="../src/gxclpath.c">src/gxclpath.c</a>,
-<a href="../src/gxclpath.h">src/gxclpath.h</a>,
-<a href="../src/gxclrast.c">src/gxclrast.c</a>,
-<a href="../src/gxclread.c">src/gxclread.c</a>,
-<a href="../src/gxclrect.c">src/gxclrect.c</a>,
-<a href="../src/gxclthrd.c">src/gxclthrd.c</a>,
-<a href="../src/gxclthrd.h">src/gxclthrd.h</a>,
-<a href="../src/gxclutil.c">src/gxclutil.c</a>,
-<a href="../src/gxclzlib.c">src/gxclzlib.c</a>,
-<a href="../src/gxdhtserial.c">src/gxdhtserial.c</a>,
-<a href="../src/gxdhtserial.h">src/gxdhtserial.h</a>,
-<a href="../src/gsserial.c">src/gsserial.c</a>,
-<a href="../src/gsserial.h">src/gsserial.h</a>.
+<a href="../base/gxclbits.c">base/gxclbits.c</a>,
+<a href="../base/gxcldev.h">base/gxcldev.h</a>,
+<a href="../base/gxclfile.c">base/gxclfile.c</a>,
+<a href="../base/gxclimag.c">base/gxclimag.c</a>,
+<a href="../base/gxclio.h">base/gxclio.h</a>,
+<a href="../base/gxclist.c">base/gxclist.c</a>,
+<a href="../base/gxclist.h">base/gxclist.h</a>,
+<a href="../base/gxcllzw.c">base/gxcllzw.c</a>,
+<a href="../base/gxclmem.c">base/gxclmem.c</a>,
+<a href="../base/gxclmem.h">base/gxclmem.h</a>,
+<a href="../base/gxclpage.c">base/gxclpage.c</a>,
+<a href="../base/gxclpage.h">base/gxclpage.h</a>,
+<a href="../base/gxclpath.c">base/gxclpath.c</a>,
+<a href="../base/gxclpath.h">base/gxclpath.h</a>,
+<a href="../base/gxclrast.c">base/gxclrast.c</a>,
+<a href="../base/gxclread.c">base/gxclread.c</a>,
+<a href="../base/gxclrect.c">base/gxclrect.c</a>,
+<a href="../base/gxclthrd.c">base/gxclthrd.c</a>,
+<a href="../base/gxclthrd.h">base/gxclthrd.h</a>,
+<a href="../base/gxclutil.c">base/gxclutil.c</a>,
+<a href="../base/gxclzlib.c">base/gxclzlib.c</a>,
+<a href="../base/gxdhtserial.c">base/gxdhtserial.c</a>,
+<a href="../base/gxdhtserial.h">base/gxdhtserial.h</a>,
+<a href="../base/gsserial.c">base/gsserial.c</a>,
+<a href="../base/gsserial.h">base/gsserial.h</a>.
 
 <dt>
 Color mapping:
 <dd>
-<a href="../src/gdevimdi.c">src/gdevimdi.c</a>.
+<a href="../base/gdevimdi.c">base/gdevimdi.c</a>.
 
 </dl>
 
@@ -1550,8 +1543,8 @@ Color mapping:
 <dt>
 Visual Trace support :
 <dd>
-<a href="../src/vdtrace.h">src/vdtrace.h</a>,
-<a href="../src/vdtrace.c">src/vdtrace.c</a>.
+<a href="../base/vdtrace.h">base/vdtrace.h</a>,
+<a href="../base/vdtrace.c">base/vdtrace.c</a>.
 </dl>
 
 See <a href="Lib.htm">doc/Lib.htm</a> for extensive documentation on
@@ -1583,46 +1576,46 @@ device pipelines.  The rendering targets are:
 <dt>
 Memory devices, depth-independent:
 <dd>
-<a href="../src/gdevmem.c">src/gdevmem.c</a>,
-<a href="../src/gdevmem.h">src/gdevmem.h</a>,
-<a href="../src/gdevmpla.c">src/gdevmpla.c</a>,
-<a href="../src/gdevmpla.h">src/gdevmpla.h</a>,
-<a href="../src/gdevmrop.h">src/gdevmrop.h</a>,
-<a href="../src/gsdevmem.c">src/gsdevmem.c</a>,
-<a href="../src/gxdevmem.h">src/gxdevmem.h</a>.
+<a href="../base/gdevmem.c">base/gdevmem.c</a>,
+<a href="../base/gdevmem.h">base/gdevmem.h</a>,
+<a href="../base/gdevmpla.c">base/gdevmpla.c</a>,
+<a href="../base/gdevmpla.h">base/gdevmpla.h</a>,
+<a href="../base/gdevmrop.h">base/gdevmrop.h</a>,
+<a href="../base/gsdevmem.c">base/gsdevmem.c</a>,
+<a href="../base/gxdevmem.h">base/gxdevmem.h</a>.
 
 <dt>
 Memory devices, specific depths:
 <dd>
-<a href="../src/gdevm1.c">src/gdevm1.c</a>,
-<a href="../src/gdevm2.c">src/gdevm2.c</a>,
-<a href="../src/gdevm4.c">src/gdevm4.c</a>,
-<a href="../src/gdevm8.c">src/gdevm8.c</a>,
-<a href="../src/gdevm16.c">src/gdevm16.c</a>,
-<a href="../src/gdevm24.c">src/gdevm24.c</a>,
-<a href="../src/gdevm32.c">src/gdevm32.c</a>,
-<a href="../src/gdevm40.c">src/gdevm40.c</a>,
-<a href="../src/gdevm48.c">src/gdevm48.c</a>,
-<a href="../src/gdevm56.c">src/gdevm56.c</a>,
-<a href="../src/gdevm64.c">src/gdevm64.c</a>,
-<a href="../src/gdevmr1.c">src/gdevmr1.c</a>,
-<a href="../src/gdevmr2n.c">src/gdevmr2n.c</a>,
-<a href="../src/gdevmr8n.c">src/gdevmr8n.c</a>.
+<a href="../base/gdevm1.c">base/gdevm1.c</a>,
+<a href="../base/gdevm2.c">base/gdevm2.c</a>,
+<a href="../base/gdevm4.c">base/gdevm4.c</a>,
+<a href="../base/gdevm8.c">base/gdevm8.c</a>,
+<a href="../base/gdevm16.c">base/gdevm16.c</a>,
+<a href="../base/gdevm24.c">base/gdevm24.c</a>,
+<a href="../base/gdevm32.c">base/gdevm32.c</a>,
+<a href="../base/gdevm40.c">base/gdevm40.c</a>,
+<a href="../base/gdevm48.c">base/gdevm48.c</a>,
+<a href="../base/gdevm56.c">base/gdevm56.c</a>,
+<a href="../base/gdevm64.c">base/gdevm64.c</a>,
+<a href="../base/gdevmr1.c">base/gdevmr1.c</a>,
+<a href="../base/gdevmr2n.c">base/gdevmr2n.c</a>,
+<a href="../base/gdevmr8n.c">base/gdevmr8n.c</a>.
 
 <dt>
 Alpha-related devices:
 <dd>
-<a href="../src/gdevabuf.c">src/gdevabuf.c</a>.
+<a href="../base/gdevabuf.c">base/gdevabuf.c</a>.
 
 <dt>
 Other devices:
 <dd>
-<a href="../src/gdevdflt.c">src/gdevdflt.c</a>,
-<a href="../src/gdevhit.c">src/gdevhit.c</a>,
-<a href="../src/gdevmrun.c">src/gdevmrun.c</a>,
-<a href="../src/gdevmrun.h">src/gdevmrun.h</a>,
-<a href="../src/gdevplnx.c">src/gdevplnx.c</a>,
-<a href="../src/gdevplnx.h">src/gdevplnx.h</a>.
+<a href="../base/gdevdflt.c">base/gdevdflt.c</a>,
+<a href="../base/gdevhit.c">base/gdevhit.c</a>,
+<a href="../base/gdevmrun.c">base/gdevmrun.c</a>,
+<a href="../base/gdevmrun.h">base/gdevmrun.h</a>,
+<a href="../base/gdevplnx.c">base/gdevplnx.c</a>,
+<a href="../base/gdevplnx.h">base/gdevplnx.h</a>.
 </dl>
 
 <p>
@@ -1633,8 +1626,8 @@ The forwarding devices meant for use in pipelines are:
 <dt>
 The bounding box device:
 <dd>
-<a href="../src/gdevbbox.h">src/gdevbbox.h</a>,
-<a href="../src/gdevbbox.c">src/gdevbbox.c</a>.
+<a href="../base/gdevbbox.h">base/gdevbbox.h</a>,
+<a href="../base/gdevbbox.c">base/gdevbbox.c</a>.
 
 <dt>
 Clipping devices:
@@ -1644,13 +1637,13 @@ See under <a href="#Clipping">Clipping</a> above.
 <dt>
 Device filter stack:
 <dd>
-<a href="../src/gsdfilt.c">src/gsdfilt.c</a>,
-<a href="../src/gsdfilt.h">src/gsdfilt.h</a>.
+<a href="../base/gsdfilt.c">base/gsdfilt.c</a>,
+<a href="../base/gsdfilt.h">base/gsdfilt.h</a>.
 
 <dt>
 Other devices:
 <dd>
-<a href="../src/gdevnfwd.c">src/gdevnfwd.c</a>.
+<a href="../base/gdevnfwd.c">base/gdevnfwd.c</a>.
 
 </dl>
 
@@ -1671,7 +1664,7 @@ rewrite in June 2002 was intended to make it more robust and somewhat easier
 to understand, but also increased its size by about 40%, contrary to the
 expectation that it would shrink.  Currently both sets of code are in the
 code base, with compatible APIs, selected by a line in <a
-href="../src/devs.mak">src/devs.mak</a>.
+href="../base/devs.mak">base/devs.mak</a>.
 
 <dl>
 
@@ -1683,36 +1676,36 @@ Shared support:
 <dt>
 Writing fonts:
 <dd>
-<a href="../src/gdevpsf.h">src/gdevpsf.h</a>,
-<a href="../src/gdevpsf1.c">src/gdevpsf1.c</a>,
-<a href="../src/gdevpsf2.c">src/gdevpsf2.c</a>,
-<a href="../src/gdevpsfm.c">src/gdevpsfm.c</a>,
-<a href="../src/gdevpsft.c">src/gdevpsft.c</a>,
-<a href="../src/gdevpsfu.c">src/gdevpsfu.c</a>,
-<a href="../src/gdevpsfx.c">src/gdevpsfx.c</a>,
-<a href="../src/gscedata.c">src/gscedata.c</a>,
-<a href="../src/gscedata.h">src/gscedata.h</a>,
-<a href="../src/gscencs.c">src/gscencs.c</a>,
-<a href="../src/gscencs.h">src/gscencs.h</a>.
+<a href="../base/gdevpsf.h">base/gdevpsf.h</a>,
+<a href="../base/gdevpsf1.c">base/gdevpsf1.c</a>,
+<a href="../base/gdevpsf2.c">base/gdevpsf2.c</a>,
+<a href="../base/gdevpsfm.c">base/gdevpsfm.c</a>,
+<a href="../base/gdevpsft.c">base/gdevpsft.c</a>,
+<a href="../base/gdevpsfu.c">base/gdevpsfu.c</a>,
+<a href="../base/gdevpsfx.c">base/gdevpsfx.c</a>,
+<a href="../base/gscedata.c">base/gscedata.c</a>,
+<a href="../base/gscedata.h">base/gscedata.h</a>,
+<a href="../base/gscencs.c">base/gscencs.c</a>,
+<a href="../base/gscencs.h">base/gscencs.h</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/gdevpsdf.h">src/gdevpsdf.h</a>,
-<a href="../src/gdevpsdi.c">src/gdevpsdi.c</a>,
-<a href="../src/gdevpsdp.c">src/gdevpsdp.c</a>,
-<a href="../src/gdevpsds.c">src/gdevpsds.c</a>,
-<a href="../src/gdevpsds.h">src/gdevpsds.h</a>,
-<a href="../src/gdevpsdu.c">src/gdevpsdu.c</a>.
+<a href="../base/gdevpsdf.h">base/gdevpsdf.h</a>,
+<a href="../base/gdevpsdi.c">base/gdevpsdi.c</a>,
+<a href="../base/gdevpsdp.c">base/gdevpsdp.c</a>,
+<a href="../base/gdevpsds.c">base/gdevpsds.c</a>,
+<a href="../base/gdevpsds.h">base/gdevpsds.h</a>,
+<a href="../base/gdevpsdu.c">base/gdevpsdu.c</a>.
 
 </dl>
 
 <dt>
 PostScript output driver ([e]pswrite):
 <dd>
-<a href="../src/gdevps.c">src/gdevps.c</a>,
-<a href="../src/gdevpsu.c">src/gdevpsu.c</a>,
-<a href="../src/gdevpsu.h">src/gdevpsu.h</a>.
+<a href="../base/gdevps.c">base/gdevps.c</a>,
+<a href="../base/gdevpsu.c">base/gdevpsu.c</a>,
+<a href="../base/gdevpsu.h">base/gdevpsu.h</a>.
 
 <dt>
 PDF output driver (pdfwrite):
@@ -1722,76 +1715,71 @@ PDF output driver (pdfwrite):
 <dt>
 Substrate:
 <dd>
-<a href="../src/gdevpdfo.c">src/gdevpdfo.c</a>,
-<a href="../src/gdevpdfo.h">src/gdevpdfo.h</a>,
-<a href="../src/gdevpdfr.c">src/gdevpdfr.c</a>,
-<a href="../src/gdevpdfu.c">src/gdevpdfu.c</a>.
+<a href="../base/gdevpdfo.c">base/gdevpdfo.c</a>,
+<a href="../base/gdevpdfo.h">base/gdevpdfo.h</a>,
+<a href="../base/gdevpdfr.c">base/gdevpdfr.c</a>,
+<a href="../base/gdevpdfu.c">base/gdevpdfu.c</a>.
 
 <dt>
 Old text and fonts:
 <dd>
-<a href="../src/gdevpdfe.c">src/gdevpdfe.c</a>,
-<a href="../src/gdevpdff.c">src/gdevpdff.c</a>,
-<a href="../src/gdevpdff.h">src/gdevpdff.h</a>,
-<a href="../src/gdevpdfs.c">src/gdevpdfs.c</a>,
-<a href="../src/gdevpdft.c">src/gdevpdft.c</a>,
-<a href="../src/gdevpdft.h">src/gdevpdft.h</a>,
-<a href="../src/gdevpdfw.c">src/gdevpdfw.c</a>.
+<a href="../base/gdevpdfe.c">base/gdevpdfe.c</a>,
+<a href="../base/gdevpdft.c">base/gdevpdft.c</a>.
 
 <dt>
 New text and fonts:
 <dd>
-<a href="../src/gdevpdt.c">src/gdevpdt.c</a>,
-<a href="../src/gdevpdt.h">src/gdevpdt.h</a>,
-<a href="../src/gdevpdtb.c">src/gdevpdtb.c</a>,
-<a href="../src/gdevpdtb.h">src/gdevpdtb.h</a>,
-<a href="../src/gdevpdtc.c">src/gdevpdtc.c</a>,
-<a href="../src/gdevpdtd.c">src/gdevpdtd.c</a>,
-<a href="../src/gdevpdtd.h">src/gdevpdtd.h</a>,
-<a href="../src/gdevpdte.c">src/gdevpdte.c</a>,
-<a href="../src/gdevpdtf.c">src/gdevpdtf.c</a>,
-<a href="../src/gdevpdtf.h">src/gdevpdtf.h</a>,
-<a href="../src/gdevpdti.c">src/gdevpdti.c</a>,
-<a href="../src/gdevpdti.h">src/gdevpdti.h</a>,
-<a href="../src/gdevpdts.c">src/gdevpdts.c</a>,
-<a href="../src/gdevpdts.h">src/gdevpdts.h</a>,
-<a href="../src/gdevpdtt.c">src/gdevpdtt.c</a>,
-<a href="../src/gdevpdtt.h">src/gdevpdtt.h</a>,
-<a href="../src/gdevpdtv.c">src/gdevpdtv.c</a>,
-<a href="../src/gdevpdtv.h">src/gdevpdtv.h</a>,
-<a href="../src/gdevpdtw.c">src/gdevpdtw.c</a>,
-<a href="../src/gdevpdtw.h">src/gdevpdtw.h</a>,
-<a href="../src/gdevpdtx.h">src/gdevpdtx.h</a>.
-<a href="../src/ConvertUTF.h">src/ConvertUTF.h</a>,
-<a href="../src/ConvertUTF.c">src/ConvertUTF.c</a>,
+<a href="../base/gdevpdt.c">base/gdevpdt.c</a>,
+<a href="../base/gdevpdt.h">base/gdevpdt.h</a>,
+<a href="../base/gdevpdtb.c">base/gdevpdtb.c</a>,
+<a href="../base/gdevpdtb.h">base/gdevpdtb.h</a>,
+<a href="../base/gdevpdtc.c">base/gdevpdtc.c</a>,
+<a href="../base/gdevpdtd.c">base/gdevpdtd.c</a>,
+<a href="../base/gdevpdtd.h">base/gdevpdtd.h</a>,
+<a href="../base/gdevpdte.c">base/gdevpdte.c</a>,
+<a href="../base/gdevpdtf.c">base/gdevpdtf.c</a>,
+<a href="../base/gdevpdtf.h">base/gdevpdtf.h</a>,
+<a href="../base/gdevpdti.c">base/gdevpdti.c</a>,
+<a href="../base/gdevpdti.h">base/gdevpdti.h</a>,
+<a href="../base/gdevpdts.c">base/gdevpdts.c</a>,
+<a href="../base/gdevpdts.h">base/gdevpdts.h</a>,
+<a href="../base/gdevpdtt.c">base/gdevpdtt.c</a>,
+<a href="../base/gdevpdtt.h">base/gdevpdtt.h</a>,
+<a href="../base/gdevpdtv.c">base/gdevpdtv.c</a>,
+<a href="../base/gdevpdtv.h">base/gdevpdtv.h</a>,
+<a href="../base/gdevpdtw.c">base/gdevpdtw.c</a>,
+<a href="../base/gdevpdtw.h">base/gdevpdtw.h</a>,
+<a href="../base/gdevpdtx.h">base/gdevpdtx.h</a>.
+<a href="../base/ConvertUTF.h">base/ConvertUTF.h</a>,
+<a href="../base/ConvertUTF.c">base/ConvertUTF.c</a>,
 
 <dt>
 Graphics:
 <dd>
-<a href="../src/gdevpdfc.c">src/gdevpdfc.c</a>,
-<a href="../src/gdevpdfc.h">src/gdevpdfc.h</a>,
-<a href="../src/gdevpdfd.c">src/gdevpdfd.c</a>,
-<a href="../src/gdevpdfg.c">src/gdevpdfg.c</a>,
-<a href="../src/gdevpdfg.h">src/gdevpdfg.h</a>,
-<a href="../src/gdevpdfk.c">src/gdevpdfk.c</a>,
-<a href="../src/gdevpdft.c">src/gdevpdft.c</a>.
-<a href="../src/gdevpdfv.c">src/gdevpdfv.c</a>.
+<a href="../base/gdevpdfc.c">base/gdevpdfc.c</a>,
+<a href="../base/gdevpdfc.h">base/gdevpdfc.h</a>,
+<a href="../base/gdevpdfd.c">base/gdevpdfd.c</a>,
+<a href="../base/gdevpdfg.c">base/gdevpdfg.c</a>,
+<a href="../base/gdevpdfg.h">base/gdevpdfg.h</a>,
+<a href="../base/gdevpdfk.c">base/gdevpdfk.c</a>,
+<a href="../base/gdevpdft.c">base/gdevpdft.c</a>.
+<a href="../base/gdevpdfv.c">base/gdevpdfv.c</a>.
 
 <dt>
 Images:
 <dd>
-<a href="../src/gdevpdfb.c">src/gdevpdfb.c</a>,
-<a href="../src/gdevpdfi.c">src/gdevpdfi.c</a>,
-<a href="../src/gdevpdfj.c">src/gdevpdfj.c</a>.
+<a href="../base/gdevpdfb.c">base/gdevpdfb.c</a>,
+<a href="../base/gdevpdfi.c">base/gdevpdfi.c</a>,
+<a href="../base/gdevpdfj.c">base/gdevpdfj.c</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/gdevpdf.c">src/gdevpdf.c</a>,
-<a href="../src/gdevpdfm.c">src/gdevpdfm.c</a>,
-<a href="../src/gdevpdfp.c">src/gdevpdfp.c</a>,
-<a href="../src/gdevpdfx.h">src/gdevpdfx.h</a>.
-<a href="../src/gdevpdfb.h">src/gdevpdfb.h</a>.
+<a href="../base/gdevpdf.c">base/gdevpdf.c</a>,
+<a href="../base/gdevpdfm.c">base/gdevpdfm.c</a>,
+<a href="../base/gdevpdfp.c">base/gdevpdfp.c</a>,
+<a href="../base/gdevpdfx.h">base/gdevpdfx.h</a>.
+<a href="../base/gdevpdfb.h">base/gdevpdfb.h</a>.
 
 </dl>
 
@@ -1808,18 +1796,18 @@ CGM in the future, this driver should be upgraded to a higher level.
 <dt>
 PCL XL output device (pxlmono, pxlcolor):
 <dd>
-<a href="../src/gdevpx.c">src/gdevpx.c</a>,
-<a href="../src/gdevpxat.h">src/gdevpxat.h</a>,
-<a href="../src/gdevpxen.h">src/gdevpxen.h</a>,
-<a href="../src/gdevpxop.h">src/gdevpxop.h</a>,
-<a href="../src/gdevpxut.c">src/gdevpxut.c</a>,
-<a href="../src/gdevpxut.h">src/gdevpxut.h</a>.
+<a href="../base/gdevpx.c">base/gdevpx.c</a>,
+<a href="../base/gdevpxat.h">base/gdevpxat.h</a>,
+<a href="../base/gdevpxen.h">base/gdevpxen.h</a>,
+<a href="../base/gdevpxop.h">base/gdevpxop.h</a>,
+<a href="../base/gdevpxut.c">base/gdevpxut.c</a>,
+<a href="../base/gdevpxut.h">base/gdevpxut.h</a>.
 
 <dt>
 Cairo and SVG output devices (cairo, svgwrite):
 <dd>
-<a href="../src/gdevcairo.c">src/gdevcairo.c</a>,
-<a href="../src/gdevsvg.c">src/gdevsvg.c</a>.
+<a href="../base/gdevcairo.c">base/gdevcairo.c</a>,
+<a href="../base/gdevsvg.c">base/gdevsvg.c</a>.
 
 <p>
 The svgwrite device produces SVG only. The cairo device uses the cairo 
@@ -1829,12 +1817,12 @@ requested filename extension.
 <dt>
 Text extraction:
 <dd>
-<a href="../src/gdevtxtw.c">src/gdevtxtw.c</a>.
+<a href="../base/gdevtxtw.c">base/gdevtxtw.c</a>.
 
 <dt>
 Other high-level devices:
 <dd>
-<a href="../src/gdevtrac.c">src/gdevtrac.c</a>.
+<a href="../base/gdevtrac.c">base/gdevtrac.c</a>.
 
 </dl>
 
@@ -1850,19 +1838,19 @@ sense as the Ghostscript core code.
 <dt>
 Display drivers:
 <dd>
-<a href="../src/gdev8bcm.c">src/gdev8bcm.c</a>,
-<a href="../src/gdev8bcm.h">src/gdev8bcm.h</a>,
-<a href="../src/gdevevga.c">src/gdevevga.c</a>,
-<a href="../src/gdevl256.c">src/gdevl256.c</a>,
-<a href="../src/gdevpccm.c">src/gdevpccm.c</a>,
-<a href="../src/gdevpccm.h">src/gdevpccm.h</a>,
-<a href="../src/gdevpcfb.c">src/gdevpcfb.c</a>,
-<a href="../src/gdevpcfb.h">src/gdevpcfb.h</a>,
-<a href="../src/gdevs3ga.c">src/gdevs3ga.c</a>,
-<a href="../src/gdevsco.c">src/gdevsco.c</a>,
-<a href="../src/gdevsvga.c">src/gdevsvga.c</a>,
-<a href="../src/gdevsvga.h">src/gdevsvga.h</a>,
-<a href="../src/gdevvglb.c">src/gdevvglb.c</a>.
+<a href="../base/gdev8bcm.c">base/gdev8bcm.c</a>,
+<a href="../base/gdev8bcm.h">base/gdev8bcm.h</a>,
+<a href="../base/gdevevga.c">base/gdevevga.c</a>,
+<a href="../base/gdevl256.c">base/gdevl256.c</a>,
+<a href="../base/gdevpccm.c">base/gdevpccm.c</a>,
+<a href="../base/gdevpccm.h">base/gdevpccm.h</a>,
+<a href="../base/gdevpcfb.c">base/gdevpcfb.c</a>,
+<a href="../base/gdevpcfb.h">base/gdevpcfb.h</a>,
+<a href="../base/gdevs3ga.c">base/gdevs3ga.c</a>,
+<a href="../base/gdevsco.c">base/gdevsco.c</a>,
+<a href="../base/gdevsvga.c">base/gdevsvga.c</a>,
+<a href="../base/gdevsvga.h">base/gdevsvga.h</a>,
+<a href="../base/gdevvglb.c">base/gdevvglb.c</a>.
 
 <dt>
 Window system drivers:
@@ -1873,31 +1861,31 @@ Window system drivers:
 <dt>
 X Windows:
 <dd>
-<a href="../src/gdevx.c">src/gdevx.c</a>,
-<a href="../src/gdevx.h">src/gdevx.h</a>,
-<a href="../src/gdevxalt.c">src/gdevxalt.c</a>,
-<a href="../src/gdevxcmp.c">src/gdevxcmp.c</a>,
-<a href="../src/gdevxcmp.h">src/gdevxcmp.h</a>,
-<a href="../src/gdevxini.c">src/gdevxini.c</a>,
-<a href="../src/gdevxres.c">src/gdevxres.c</a>,
-<a href="../src/gdevxxf.c">src/gdevxxf.c</a>.
+<a href="../base/gdevx.c">base/gdevx.c</a>,
+<a href="../base/gdevx.h">base/gdevx.h</a>,
+<a href="../base/gdevxalt.c">base/gdevxalt.c</a>,
+<a href="../base/gdevxcmp.c">base/gdevxcmp.c</a>,
+<a href="../base/gdevxcmp.h">base/gdevxcmp.h</a>,
+<a href="../base/gdevxini.c">base/gdevxini.c</a>,
+<a href="../base/gdevxres.c">base/gdevxres.c</a>,
+<a href="../base/gdevxxf.c">base/gdevxxf.c</a>.
 
 <dt>
 Microsoft Windows:
 <dd>
-<a href="../src/gdevmswn.c">src/gdevmswn.c</a>,
-<a href="../src/gdevmswn.h">src/gdevmswn.h</a>,
-<a href="../src/gdevmsxf.c">src/gdevmsxf.c</a>,
-<a href="../src/gdevwddb.c">src/gdevwddb.c</a>,
-<a href="../src/gdevwdib.c">src/gdevwdib.c</a>.
+<a href="../base/gdevmswn.c">base/gdevmswn.c</a>,
+<a href="../base/gdevmswn.h">base/gdevmswn.h</a>,
+<a href="../base/gdevmsxf.c">base/gdevmsxf.c</a>,
+<a href="../base/gdevwddb.c">base/gdevwddb.c</a>,
+<a href="../base/gdevwdib.c">base/gdevwdib.c</a>.
 
 <dt>
 OS/2 Presentation Manager:
 <dd>
-<a href="../src/gdevpm.c">src/gdevpm.c</a>,
-<a href="../src/gdevpm.h">src/gdevpm.h</a>,
-<a href="../src/gspmdrv.c">src/gspmdrv.c</a>,
-<a href="../src/gspmdrv.h">src/gspmdrv.h</a>.
+<a href="../base/gdevpm.c">base/gdevpm.c</a>,
+<a href="../base/gdevpm.h">base/gdevpm.h</a>,
+<a href="../base/gspmdrv.c">base/gspmdrv.c</a>,
+<a href="../base/gspmdrv.h">base/gspmdrv.h</a>.
 
 </dl>
 
@@ -1910,47 +1898,47 @@ Raster file output drivers:
 <dt>
 Fax and TIFF:
 <dd>
-<a href="../src/gdevfax.c">src/gdevfax.c</a>,
-<a href="../src/gdevfax.h">src/gdevfax.h</a>,
-<a href="../src/gdevtfax.c">src/gdevtfax.c</a>,
-<a href="../src/gdevtfax.h">src/gdevtfax.h</a>,
-<a href="../src/gdevtifs.c">src/gdevtifs.c</a>,
-<a href="../src/gdevtifs.h">src/gdevtifs.h</a>,
-<a href="../src/gdevtfnx.c">src/gdevtfnx.c</a>.
-<a href="../src/gdevtsep.c">src/gdevtsep.c</a>.
+<a href="../base/gdevfax.c">base/gdevfax.c</a>,
+<a href="../base/gdevfax.h">base/gdevfax.h</a>,
+<a href="../base/gdevtfax.c">base/gdevtfax.c</a>,
+<a href="../base/gdevtfax.h">base/gdevtfax.h</a>,
+<a href="../base/gdevtifs.c">base/gdevtifs.c</a>,
+<a href="../base/gdevtifs.h">base/gdevtifs.h</a>,
+<a href="../base/gdevtfnx.c">base/gdevtfnx.c</a>.
+<a href="../base/gdevtsep.c">base/gdevtsep.c</a>.
 
 <dt>
 (Low-level) CGM:
 <dd>
-<a href="../src/gdevcgm.c">src/gdevcgm.c</a>,
-<a href="../src/gdevcgml.c">src/gdevcgml.c</a>,
-<a href="../src/gdevcgml.h">src/gdevcgml.h</a>,
-<a href="../src/gdevcgmx.h">src/gdevcgmx.h</a>.
+<a href="../base/gdevcgm.c">base/gdevcgm.c</a>,
+<a href="../base/gdevcgml.c">base/gdevcgml.c</a>,
+<a href="../base/gdevcgml.h">base/gdevcgml.h</a>,
+<a href="../base/gdevcgmx.h">base/gdevcgmx.h</a>.
 
 <dt>
 Example DeviceN devices:
 <dd>
-<a href="../src/gdevdevn.c">src/gdevdevn.c</a>,
-<a href="../src/gdevdevn.h">src/gdevdevn.h</a>,
-<a href="../src/gdevxcf.c">src/gdevxcf.c</a>,
-<a href="../src/gdevpsd.c">src/gdevpsd.c</a>,
-<a href="../src/gdevperm.c">src/gdevperm.c</a>.
+<a href="../base/gdevdevn.c">base/gdevdevn.c</a>,
+<a href="../base/gdevdevn.h">base/gdevdevn.h</a>,
+<a href="../base/gdevxcf.c">base/gdevxcf.c</a>,
+<a href="../base/gdevpsd.c">base/gdevpsd.c</a>,
+<a href="../base/gdevperm.c">base/gdevperm.c</a>.
 
 <dt>
 Other raster file formats:
 <dd>
-<a href="../src/gdevbit.c">src/gdevbit.c</a>,
-<a href="../src/gdevbmp.c">src/gdevbmp.c</a>,
-<a href="../src/gdevbmp.h">src/gdevbmp.h</a>,
-<a href="../src/gdevbmpa.c">src/gdevbmpa.c</a>,
-<a href="../src/gdevbmpc.c">src/gdevbmpc.c</a>,
-<a href="../src/gdevjpeg.c">src/gdevjpeg.c</a>,
-<a href="../src/gdevmiff.c">src/gdevmiff.c</a>,
-<a href="../src/gdevp2up.c">src/gdevp2up.c</a>,
-<a href="../src/gdevpcx.c">src/gdevpcx.c</a>,
-<a href="../src/gdevpbm.c">src/gdevpbm.c</a>,
-<a href="../src/gdevpng.c">src/gdevpng.c</a>,
-<a href="../src/gdevpsim.c">src/gdevpsim.c</a>.
+<a href="../base/gdevbit.c">base/gdevbit.c</a>,
+<a href="../base/gdevbmp.c">base/gdevbmp.c</a>,
+<a href="../base/gdevbmp.h">base/gdevbmp.h</a>,
+<a href="../base/gdevbmpa.c">base/gdevbmpa.c</a>,
+<a href="../base/gdevbmpc.c">base/gdevbmpc.c</a>,
+<a href="../base/gdevjpeg.c">base/gdevjpeg.c</a>,
+<a href="../base/gdevmiff.c">base/gdevmiff.c</a>,
+<a href="../base/gdevp2up.c">base/gdevp2up.c</a>,
+<a href="../base/gdevpcx.c">base/gdevpcx.c</a>,
+<a href="../base/gdevpbm.c">base/gdevpbm.c</a>,
+<a href="../base/gdevpng.c">base/gdevpng.c</a>,
+<a href="../base/gdevpsim.c">base/gdevpsim.c</a>.
 
 </dl>
 
@@ -1963,22 +1951,22 @@ Printer drivers:
 <dt>
 Operating system printer services:
 <dd>
-<a href="../src/gdevos2p.c">src/gdevos2p.c</a>,
-<a href="../src/gdevwpr2.c">src/gdevwpr2.c</a>,
-<a href="../src/gdevwprn.c">src/gdevwprn.c</a>.
+<a href="../base/gdevos2p.c">base/gdevos2p.c</a>,
+<a href="../base/gdevwpr2.c">base/gdevwpr2.c</a>,
+<a href="../base/gdevwprn.c">base/gdevwprn.c</a>.
 
 <dt>
 H-P monochrome printers:
 <dd>
-<a href="../src/gdevdljm.c">src/gdevdljm.c</a>,
-<a href="../src/gdevdljm.h">src/gdevdljm.h</a>,
-<a href="../src/gdevdjet.c">src/gdevdjet.c</a>,
-<a href="../src/gdevlj56.c">src/gdevlj56.c</a>.
+<a href="../base/gdevdljm.c">base/gdevdljm.c</a>,
+<a href="../base/gdevdljm.h">base/gdevdljm.h</a>,
+<a href="../base/gdevdjet.c">base/gdevdjet.c</a>,
+<a href="../base/gdevlj56.c">base/gdevlj56.c</a>.
 
 <dt>
 Other printers:
 <dd>
-<a href="../src/gdevatx.c">src/gdevatx.c</a>.
+<a href="../base/gdevatx.c">base/gdevatx.c</a>.
 
 </dl>
 
@@ -1988,33 +1976,33 @@ Other printers:
 
 <p>
 This list is likely to be incomplete and inaccurate: see <a
-href="../src/contrib.mak">src/contrib.mak</a> for the real one.
+href="../base/contrib.mak">base/contrib.mak</a> for the real one.
 
 <dl>
 
 <dt>
 Display and window system drivers:
 <dd>
-<a href="../src/gdev3b1.c">src/gdev3b1.c</a>,
-<a href="../src/gdevherc.c">src/gdevherc.c</a>,
-<a href="../src/gdevpe.c">src/gdevpe.c</a>,
-<a href="../src/gdevsnfb.c">src/gdevsnfb.c</a>,
-<a href="../src/gdevsun.c">src/gdevsun.c</a>.
+<a href="../base/gdev3b1.c">base/gdev3b1.c</a>,
+<a href="../base/gdevherc.c">base/gdevherc.c</a>,
+<a href="../base/gdevpe.c">base/gdevpe.c</a>,
+<a href="../base/gdevsnfb.c">base/gdevsnfb.c</a>,
+<a href="../base/gdevsun.c">base/gdevsun.c</a>.
 
 <dt>
 Raster file output drivers:
 <dd>
-<a href="../src/gdevcfax.c">src/gdevcfax.c</a>,
-<a href="../src/gdevcif.c">src/gdevcif.c</a>,
-<a href="../src/gdevdfax.c">src/gdevdfax.c</a>,
-<a href="../src/gdevifno.c">src/gdevifno.c</a>,
-<a href="../src/gdevmgr.c">src/gdevmgr.c</a>,
-<a href="../src/gdevmgr.h">src/gdevmgr.h</a>,
-<a href="../src/gdevsgi.c">src/gdevsgi.c</a>,
-<a href="../src/gdevsgi.h">src/gdevsgi.h</a>,
-<a href="../src/gdevsunr.c">src/gdevsunr.c</a>,
-<a href="../src/gdevjbig2.c">src/gdevjbig2.c</a>,
-<a href="../src/gdevjpx.c">src/gdevjpx.c</a>.
+<a href="../base/gdevcfax.c">base/gdevcfax.c</a>,
+<a href="../base/gdevcif.c">base/gdevcif.c</a>,
+<a href="../base/gdevdfax.c">base/gdevdfax.c</a>,
+<a href="../base/gdevifno.c">base/gdevifno.c</a>,
+<a href="../base/gdevmgr.c">base/gdevmgr.c</a>,
+<a href="../base/gdevmgr.h">base/gdevmgr.h</a>,
+<a href="../base/gdevsgi.c">base/gdevsgi.c</a>,
+<a href="../base/gdevsgi.h">base/gdevsgi.h</a>,
+<a href="../base/gdevsunr.c">base/gdevsunr.c</a>,
+<a href="../base/gdevjbig2.c">base/gdevjbig2.c</a>,
+<a href="../base/gdevjpx.c">base/gdevjpx.c</a>.
 
 <dt>
 Printer drivers:
@@ -2022,77 +2010,77 @@ Printer drivers:
 <a href="../lib/bj8.rpd">lib/bj8.rpd</a>,
 <a href="../lib/cbjc600.ppd">lib/cbjc600.ppd</a>,
 <a href="../lib/cbjc800.ppd">lib/cbjc800.ppd</a>,
-<a href="../src/gdev3852.c">src/gdev3852.c</a>,
-<a href="../src/gdev4081.c">src/gdev4081.c</a>,
-<a href="../src/gdev4693.c">src/gdev4693.c</a>,
-<a href="../src/gdev8510.c">src/gdev8510.c</a>,
-<a href="../src/gdevadmp.c">src/gdevadmp.c</a>,
-<a href="../src/gdevbj10.c">src/gdevbj10.c</a>,
-<a href="../src/gdevbjc.h">src/gdevbjc.h</a>,
-<a href="../src/gdevbjcl.c">src/gdevbjcl.c</a>,
-<a href="../src/gdevbjcl.h">src/gdevbjcl.h</a>,
-<a href="../src/gdevccr.c">src/gdevccr.c</a>,
-<a href="../src/gdevcdj.c">src/gdevcdj.c</a>,
-<a href="../src/gdevclj.c">src/gdevclj.c</a>,
-<a href="../src/gdevcljc.c">src/gdevcljc.c</a>,
-<a href="../src/gdevcp50.c">src/gdevcp50.c</a>,
-<a href="../src/gdevcslw.c">src/gdevcslw.c</a>,
-<a href="../src/gdevdjtc.c">src/gdevdjtc.c</a>,
-<a href="../src/gdevdm24.c">src/gdevdm24.c</a>,
-<a href="../src/gdevepsc.c">src/gdevepsc.c</a>,
-<a href="../src/gdevepsn.c">src/gdevepsn.c</a>,
-<a href="../src/gdevescp.c">src/gdevescp.c</a>,
-<a href="../src/gdevhl7x.c">src/gdevhl7x.c</a>,
-<a href="../src/gdevijs.c">src/gdevijs.c</a>,
-<a href="../src/gdevimgn.c">src/gdevimgn.c</a>,
-<a href="../src/gdevl31s.c">src/gdevl31s.c</a>,
-<a href="../src/gdevlbp8.c">src/gdevlbp8.c</a>,
-<a href="../src/gdevlp8k.c">src/gdevlp8k.c</a>,
-<a href="../src/gdevlxm.c">src/gdevlxm.c</a>,
-<a href="../src/gdevn533.c">src/gdevn533.c</a>,
-<a href="../src/gdevo182.c">src/gdevo182.c</a>,
-<a href="../src/gdevokii.c">src/gdevokii.c</a>,
-<a href="../src/gdevpcl.c">src/gdevpcl.c</a>,
-<a href="../src/gdevpcl.h">src/gdevpcl.h</a>,
-<a href="../src/gdevphex.c">src/gdevphex.c</a>,
-<a href="../src/gdevpjet.c">src/gdevpjet.c</a>,
-<a href="../src/gdevsj48.c">src/gdevsj48.c</a>,
-<a href="../src/gdevsppr.c">src/gdevsppr.c</a>,
-<a href="../src/gdevstc.c">src/gdevstc.c</a>,
-<a href="../src/gdevstc.h">src/gdevstc.h</a>,
-<a href="../src/gdevstc1.c">src/gdevstc1.c</a>,
-<a href="../src/gdevstc2.c">src/gdevstc2.c</a>,
-<a href="../src/gdevstc3.c">src/gdevstc3.c</a>,
-<a href="../src/gdevstc4.c">src/gdevstc4.c</a>,
-<a href="../src/gdevtknk.c">src/gdevtknk.c</a>,
-<a href="../src/gdevupd.c">src/gdevupd.c</a>.
+<a href="../base/gdev3852.c">base/gdev3852.c</a>,
+<a href="../base/gdev4081.c">base/gdev4081.c</a>,
+<a href="../base/gdev4693.c">base/gdev4693.c</a>,
+<a href="../base/gdev8510.c">base/gdev8510.c</a>,
+<a href="../base/gdevadmp.c">base/gdevadmp.c</a>,
+<a href="../base/gdevbj10.c">base/gdevbj10.c</a>,
+<a href="../base/gdevbjc.h">base/gdevbjc.h</a>,
+<a href="../base/gdevbjcl.c">base/gdevbjcl.c</a>,
+<a href="../base/gdevbjcl.h">base/gdevbjcl.h</a>,
+<a href="../base/gdevccr.c">base/gdevccr.c</a>,
+<a href="../base/gdevcdj.c">base/gdevcdj.c</a>,
+<a href="../base/gdevclj.c">base/gdevclj.c</a>,
+<a href="../base/gdevcljc.c">base/gdevcljc.c</a>,
+<a href="../base/gdevcp50.c">base/gdevcp50.c</a>,
+<a href="../base/gdevcslw.c">base/gdevcslw.c</a>,
+<a href="../base/gdevdjtc.c">base/gdevdjtc.c</a>,
+<a href="../base/gdevdm24.c">base/gdevdm24.c</a>,
+<a href="../base/gdevepsc.c">base/gdevepsc.c</a>,
+<a href="../base/gdevepsn.c">base/gdevepsn.c</a>,
+<a href="../base/gdevescp.c">base/gdevescp.c</a>,
+<a href="../base/gdevhl7x.c">base/gdevhl7x.c</a>,
+<a href="../base/gdevijs.c">base/gdevijs.c</a>,
+<a href="../base/gdevimgn.c">base/gdevimgn.c</a>,
+<a href="../base/gdevl31s.c">base/gdevl31s.c</a>,
+<a href="../base/gdevlbp8.c">base/gdevlbp8.c</a>,
+<a href="../base/gdevlp8k.c">base/gdevlp8k.c</a>,
+<a href="../base/gdevlxm.c">base/gdevlxm.c</a>,
+<a href="../base/gdevn533.c">base/gdevn533.c</a>,
+<a href="../base/gdevo182.c">base/gdevo182.c</a>,
+<a href="../base/gdevokii.c">base/gdevokii.c</a>,
+<a href="../base/gdevpcl.c">base/gdevpcl.c</a>,
+<a href="../base/gdevpcl.h">base/gdevpcl.h</a>,
+<a href="../base/gdevphex.c">base/gdevphex.c</a>,
+<a href="../base/gdevpjet.c">base/gdevpjet.c</a>,
+<a href="../base/gdevsj48.c">base/gdevsj48.c</a>,
+<a href="../base/gdevsppr.c">base/gdevsppr.c</a>,
+<a href="../base/gdevstc.c">base/gdevstc.c</a>,
+<a href="../base/gdevstc.h">base/gdevstc.h</a>,
+<a href="../base/gdevstc1.c">base/gdevstc1.c</a>,
+<a href="../base/gdevstc2.c">base/gdevstc2.c</a>,
+<a href="../base/gdevstc3.c">base/gdevstc3.c</a>,
+<a href="../base/gdevstc4.c">base/gdevstc4.c</a>,
+<a href="../base/gdevtknk.c">base/gdevtknk.c</a>,
+<a href="../base/gdevupd.c">base/gdevupd.c</a>.
 
 <dt>
 The special <tt>rinkj</tt> high-quality inkjet driver:
 <dd>
-<a href="../src/gdevrinkj.c">src/gdevrinkj.c</a>,
-<a href="../src/gsequivc.c">src/gsequivc.c</a>,
-<a href="../src/gsequivc.h">src/gsequivc.h</a>,
-<a href="../src/rinkj/evenbetter-rll.c">src/rinkj/evenbetter-rll.c</a>,
-<a href="../src/rinkj/evenbetter-rll.h">src/rinkj/evenbetter-rll.h</a>,
-<a href="../src/rinkj/rinkj-byte-stream.c">src/rinkj/rinkj-byte-stream.c</a>,
-<a href="../src/rinkj/rinkj-byte-stream.h">src/rinkj/rinkj-byte-stream.h</a>,
-<a href="../src/rinkj/rinkj-config.c">src/rinkj/rinkj-config.c</a>,
-<a href="../src/rinkj/rinkj-config.h">src/rinkj/rinkj-config.h</a>,
-<a href="../src/rinkj/rinkj-device.c">src/rinkj/rinkj-device.c</a>,
-<a href="../src/rinkj/rinkj-device.h">src/rinkj/rinkj-device.h</a>,
-<a href="../src/rinkj/rinkj-dither.c">src/rinkj/rinkj-dither.c</a>,
-<a href="../src/rinkj/rinkj-dither.h">src/rinkj/rinkj-dither.h</a>,
-<a href="../src/rinkj/rinkj-epson870.c">src/rinkj/rinkj-epson870.c</a>,
-<a href="../src/rinkj/rinkj-epson870.h">src/rinkj/rinkj-epson870.h</a>,
-<a href="../src/rinkj/rinkj-screen-eb.c">src/rinkj/rinkj-screen-eb.c</a>,
-<a href="../src/rinkj/rinkj-screen-eb.h">src/rinkj/rinkj-screen-eb.h</a>,
+<a href="../base/gdevrinkj.c">base/gdevrinkj.c</a>,
+<a href="../base/gsequivc.c">base/gsequivc.c</a>,
+<a href="../base/gsequivc.h">base/gsequivc.h</a>,
+<a href="../base/rinkj/evenbetter-rll.c">base/rinkj/evenbetter-rll.c</a>,
+<a href="../base/rinkj/evenbetter-rll.h">base/rinkj/evenbetter-rll.h</a>,
+<a href="../base/rinkj/rinkj-byte-stream.c">base/rinkj/rinkj-byte-stream.c</a>,
+<a href="../base/rinkj/rinkj-byte-stream.h">base/rinkj/rinkj-byte-stream.h</a>,
+<a href="../base/rinkj/rinkj-config.c">base/rinkj/rinkj-config.c</a>,
+<a href="../base/rinkj/rinkj-config.h">base/rinkj/rinkj-config.h</a>,
+<a href="../base/rinkj/rinkj-device.c">base/rinkj/rinkj-device.c</a>,
+<a href="../base/rinkj/rinkj-device.h">base/rinkj/rinkj-device.h</a>,
+<a href="../base/rinkj/rinkj-dither.c">base/rinkj/rinkj-dither.c</a>,
+<a href="../base/rinkj/rinkj-dither.h">base/rinkj/rinkj-dither.h</a>,
+<a href="../base/rinkj/rinkj-epson870.c">base/rinkj/rinkj-epson870.c</a>,
+<a href="../base/rinkj/rinkj-epson870.h">base/rinkj/rinkj-epson870.h</a>,
+<a href="../base/rinkj/rinkj-screen-eb.c">base/rinkj/rinkj-screen-eb.c</a>,
+<a href="../base/rinkj/rinkj-screen-eb.h">base/rinkj/rinkj-screen-eb.h</a>,
 <a href="../lib/rinkj-2200-setup">lib/rinkj-2200-setup</a>.
 
 <dt>
 A device implementing Well Tempered Screening and IMDI color correction:
 <dd>
-<a href="../src/gdevwts.c">src/gdevwts.c</a>.
+<a href="../base/gdevwts.c">base/gdevwts.c</a>.
 </dl>
 
 <h3><a name="PostScript_interpreter"></a>PostScript interpreter</h3>
@@ -2119,7 +2107,7 @@ means that any C code that logically needs to call the interpreter must
 instead push a continuation (including all necessary state information) on
 the PostScript execution stack, followed by the PostScript object to be
 executed, and then <em>return</em> to the interpreter.  (See <a
-href="../src/estack.h">src/estack.h</a> for more details about
+href="../psi/estack.h">psi/estack.h</a> for more details about
 continuations.)  Unfortunately, since PostScript Level 2 introduces streams
 whose data source can be a PostScript procedure, any code that reads or
 writes stream data must be prepared to suspend itself, storing all necessary
@@ -2169,18 +2157,16 @@ bodies of client code.
 <dt>
 Files:
 <dd>
-<a href="../src/gs.c">src/gs.c</a>,
-<a href="../src/gserver.c">src/gserver.c</a>,
-<a href="../src/iccinit0.c">src/iccinit0.c</a>(COMPILE_INITS=0),
-<a href="../src/iccinit1.c">src/iccinit1.c</a>(COMPILE_INITS=1),
-<a href="../src/iinit.c">src/iinit.c</a>,
-<a href="../src/iinit.h">src/iinit.h</a>,
-<a href="../src/imain.c">src/imain.c</a>,
-<a href="../src/imain.h">src/imain.h</a>,
-<a href="../src/imainarg.c">src/imainarg.c</a>,
-<a href="../src/imainarg.h">src/imainarg.h</a>,
-<a href="../src/iminst.h">src/iminst.h</a>,
-<a href="../src/main.h">src/main.h</a>.
+<a href="../psi/gs.c">psi/gs.c</a>,
+<a href="../psi/gserver.c">psi/gserver.c</a>,
+<a href="../psi/iinit.c">psi/iinit.c</a>,
+<a href="../psi/iinit.h">psi/iinit.h</a>,
+<a href="../psi/imain.c">psi/imain.c</a>,
+<a href="../psi/imain.h">psi/imain.h</a>,
+<a href="../psi/imainarg.c">psi/imainarg.c</a>,
+<a href="../psi/imainarg.h">psi/imainarg.h</a>,
+<a href="../psi/iminst.h">psi/iminst.h</a>,
+<a href="../psi/main.h">psi/main.h</a>.
 
 </dl>
 
@@ -2223,28 +2209,28 @@ the former can be compiled into the executable and shared or put in ROM.
 <dt>
 Contexts:
 <dd>
-<a href="../src/icontext.c">src/icontext.c</a>,
-<a href="../src/icontext.h">src/icontext.h</a>,
-<a href="../src/icstate.h">src/icstate.h</a>.
+<a href="../psi/icontext.c">psi/icontext.c</a>,
+<a href="../psi/icontext.h">psi/icontext.h</a>,
+<a href="../psi/icstate.h">psi/icstate.h</a>.
 
 <dt>
 Dictionaries:
 <dd>
-<a href="../src/iddict.h">src/iddict.h</a>,
-<a href="../src/idict.h">src/idict.h</a>,
-<a href="../src/idict.c">src/idict.c</a>,
-<a href="../src/idictdef.h">src/idictdef.h</a>,
-<a href="../src/idicttpl.h">src/idicttpl.h</a>.
+<a href="../psi/iddict.h">psi/iddict.h</a>,
+<a href="../psi/idict.h">psi/idict.h</a>,
+<a href="../psi/idict.c">psi/idict.c</a>,
+<a href="../psi/idictdef.h">psi/idictdef.h</a>,
+<a href="../psi/idicttpl.h">psi/idicttpl.h</a>.
 
 <dt>
 Names:
 <dd>
-<a href="../src/iname.c">src/iname.c</a>,
-<a href="../src/iname.h">src/iname.h</a>,
-<a href="../src/inamedef.h">src/inamedef.h</a>,
-<a href="../src/inameidx.h">src/inameidx.h</a>,
-<a href="../src/inames.h">src/inames.h</a>,
-<a href="../src/inamestr.h">src/inamestr.h</a>.
+<a href="../psi/iname.c">psi/iname.c</a>,
+<a href="../psi/iname.h">psi/iname.h</a>,
+<a href="../psi/inamedef.h">psi/inamedef.h</a>,
+<a href="../psi/inameidx.h">psi/inameidx.h</a>,
+<a href="../psi/inames.h">psi/inames.h</a>,
+<a href="../psi/inamestr.h">psi/inamestr.h</a>.
 
 </dl>
 
@@ -2257,17 +2243,17 @@ access their operands and produce their results using indexing rather than
 an access procedure.  This is implemented by ensuring that all the operands
 of an operator are in the topmost block of the stack, using guard entries
 that cause an internal error if the condition isn't met.  See <a
-href="../src/iostack.h">src/iostack.h</a> for more details.
+href="../psi/iostack.h">psi/iostack.h</a> for more details.
 
 <dl>
 
 <dt>
 Generic stacks:
 <dd>
-<a href="../src/isdata.h">src/isdata.h</a>,
-<a href="../src/istack.c">src/istack.c</a>,
-<a href="../src/istack.h">src/istack.h</a>,
-<a href="../src/istkparm.h">src/istkparm.h</a>.
+<a href="../psi/isdata.h">psi/isdata.h</a>,
+<a href="../psi/istack.c">psi/istack.c</a>,
+<a href="../psi/istack.h">psi/istack.h</a>,
+<a href="../psi/istkparm.h">psi/istkparm.h</a>.
 
 <dt>
 Specific stacks:
@@ -2278,25 +2264,25 @@ Specific stacks:
 <dt>
 Dictionary stack:
 <dd>
-<a href="../src/dstack.h">src/dstack.h</a>,
-<a href="../src/iddstack.h">src/iddstack.h</a>,
-<a href="../src/idsdata.h">src/idsdata.h</a>,
-<a href="../src/idstack.c">src/idstack.c</a>,
-<a href="../src/idstack.h">src/idstack.h</a>.
+<a href="../psi/dstack.h">psi/dstack.h</a>,
+<a href="../psi/iddstack.h">psi/iddstack.h</a>,
+<a href="../psi/idsdata.h">psi/idsdata.h</a>,
+<a href="../psi/idstack.c">psi/idstack.c</a>,
+<a href="../psi/idstack.h">psi/idstack.h</a>.
 
 <dt>
 Execution stack:
 <dd>
-<a href="../src/estack.h">src/estack.h</a>,
-<a href="../src/iesdata.h">src/iesdata.h</a>,
-<a href="../src/iestack.h">src/iestack.h</a>.
+<a href="../psi/estack.h">psi/estack.h</a>,
+<a href="../psi/iesdata.h">psi/iesdata.h</a>,
+<a href="../psi/iestack.h">psi/iestack.h</a>.
 
 <dt>
 Operand stack:
 <dd>
-<a href="../src/iosdata.h">src/iosdata.h</a>,
-<a href="../src/iostack.h">src/iostack.h</a>,
-<a href="../src/ostack.h">src/ostack.h</a>.
+<a href="../psi/iosdata.h">psi/iosdata.h</a>,
+<a href="../psi/iostack.h">psi/iostack.h</a>,
+<a href="../psi/ostack.h">psi/ostack.h</a>.
 
 </dl>
 
@@ -2309,8 +2295,8 @@ Operand stack:
 <dt>
 Files:
 <dd>
-<a href="../src/interp.c">src/interp.c</a>,
-<a href="../src/interp.h">src/interp.h</a>.
+<a href="../psi/interp.c">psi/interp.c</a>,
+<a href="../psi/interp.h">psi/interp.h</a>.
 
 </dl>
 
@@ -2328,28 +2314,28 @@ and the procedure must be called to provide more input data.
 <dt>
 Main scanner:
 <dd>
-<a href="../src/iscan.c">src/iscan.c</a>,
-<a href="../src/iscan.h">src/iscan.h</a>,
-<a href="../src/iscannum.c">src/iscannum.c</a>,
-<a href="../src/iscannum.h">src/iscannum.h</a>,
-<a href="../src/scanchar.h">src/scanchar.h</a>,
-<a href="../src/scantab.c">src/scantab.c</a>.
+<a href="../psi/iscan.c">psi/iscan.c</a>,
+<a href="../psi/iscan.h">psi/iscan.h</a>,
+<a href="../psi/iscannum.c">psi/iscannum.c</a>,
+<a href="../psi/iscannum.h">psi/iscannum.h</a>,
+<a href="../base/scanchar.h">base/scanchar.h</a>,
+<a href="../base/scantab.c">base/scantab.c</a>.
 
 <dt>
 Binary tokens:
 <dd>
-<a href="../src/btoken.h">src/btoken.h</a>,
-<a href="../src/ibnum.c">src/ibnum.c</a>,
-<a href="../src/ibnum.h">src/ibnum.h</a>,
-<a href="../src/inobtokn.c">src/inobtokn.c</a>,
-<a href="../src/iscanbin.c">src/iscanbin.c</a>,
-<a href="../src/iscanbin.h">src/iscanbin.h</a>.
+<a href="../psi/btoken.h">psi/btoken.h</a>,
+<a href="../psi/ibnum.c">psi/ibnum.c</a>,
+<a href="../psi/ibnum.h">psi/ibnum.h</a>,
+<a href="../psi/inobtokn.c">psi/inobtokn.c</a>,
+<a href="../psi/iscanbin.c">psi/iscanbin.c</a>,
+<a href="../psi/iscanbin.h">psi/iscanbin.h</a>.
 
 <dt>
 DSC parsing:
 <dd>
-<a href="../src/dscparse.c">src/dscparse.c</a>,
-<a href="../src/dscparse.h">src/dscparse.h</a>.
+<a href="../psi/dscparse.c">psi/dscparse.c</a>,
+<a href="../psi/dscparse.h">psi/dscparse.h</a>.
 
 </dl>
 
@@ -2366,77 +2352,77 @@ Non-output-related:
 <dt>
 Filters:
 <dd>
-<a href="../src/ifilter.h">src/ifilter.h</a>,
-<a href="../src/ifilter2.h">src/ifilter2.h</a>,
-<a href="../src/ifrpred.h">src/ifrpred.h</a>,
-<a href="../src/ifwpred.h">src/ifwpred.h</a>,
-<a href="../src/istream.h">src/istream.h</a>,
-<a href="../src/zfbcp.c">src/zfbcp.c</a>,
-<a href="../src/zfdctd.c">src/zfdctd.c</a>,
-<a href="../src/zfdcte.c">src/zfdcte.c</a>,
-<a href="../src/zfdecode.c">src/zfdecode.c</a>,
-<a href="../src/zfilter.c">src/zfilter.c</a>,
-<a href="../src/zfilter2.c">src/zfilter2.c</a>,
-<a href="../src/zfilterx.c">src/zfilterx.c</a>,
-<a href="../src/zfjbig2.c">src/zfjbig2.c</a>,
-<a href="../src/zfjpx.c">src/zfjpx.c</a>,
-<a href="../src/zfmd5.c">src/zfmd5.c</a>,
-<a href="../src/zfarc4.c">src/zfarc4.c</a>,
-<a href="../src/zfproc.c">src/zfproc.c</a>,
-<a href="../src/zfrsd.c">src/zfrsd.c</a>,
-<a href="../src/zfzlib.c">src/zfzlib.c</a>.
+<a href="../psi/ifilter.h">psi/ifilter.h</a>,
+<a href="../psi/ifilter2.h">psi/ifilter2.h</a>,
+<a href="../psi/ifrpred.h">psi/ifrpred.h</a>,
+<a href="../psi/ifwpred.h">psi/ifwpred.h</a>,
+<a href="../psi/istream.h">psi/istream.h</a>,
+<a href="../psi/zfbcp.c">psi/zfbcp.c</a>,
+<a href="../psi/zfdctd.c">psi/zfdctd.c</a>,
+<a href="../psi/zfdcte.c">psi/zfdcte.c</a>,
+<a href="../psi/zfdecode.c">psi/zfdecode.c</a>,
+<a href="../psi/zfilter.c">psi/zfilter.c</a>,
+<a href="../psi/zfilter2.c">psi/zfilter2.c</a>,
+<a href="../psi/zfilterx.c">psi/zfilterx.c</a>,
+<a href="../psi/zfjbig2.c">psi/zfjbig2.c</a>,
+<a href="../psi/zfjpx.c">psi/zfjpx.c</a>,
+<a href="../psi/zfmd5.c">psi/zfmd5.c</a>,
+<a href="../psi/zfarc4.c">psi/zfarc4.c</a>,
+<a href="../psi/zfproc.c">psi/zfproc.c</a>,
+<a href="../psi/zfrsd.c">psi/zfrsd.c</a>,
+<a href="../psi/zfzlib.c">psi/zfzlib.c</a>.
 
 <dt>
 File and stream I/O:
 <dd>
-<a href="../src/files.h">src/files.h</a>,
-<a href="../src/itoken.h">src/itoken.h</a>,
-<a href="../src/zbseq.c">src/zbseq.c</a>,
-<a href="../src/zdscpars.c">src/zdscpars.c</a>,
-<a href="../src/zfile.h">src/zfile.h</a>,
-<a href="../src/zfile.c">src/zfile.c</a>,
-<a href="../src/zfile1.c">src/zfile1.c</a>,
-<a href="../src/zfileio.c">src/zfileio.c</a>,
-<a href="../src/ztoken.c">src/ztoken.c</a>.
+<a href="../psi/files.h">psi/files.h</a>,
+<a href="../psi/itoken.h">psi/itoken.h</a>,
+<a href="../psi/zbseq.c">psi/zbseq.c</a>,
+<a href="../psi/zdscpars.c">psi/zdscpars.c</a>,
+<a href="../psi/zfile.h">psi/zfile.h</a>,
+<a href="../psi/zfile.c">psi/zfile.c</a>,
+<a href="../psi/zfile1.c">psi/zfile1.c</a>,
+<a href="../psi/zfileio.c">psi/zfileio.c</a>,
+<a href="../psi/ztoken.c">psi/ztoken.c</a>.
 
 <dt>
 Data structures:
 <dd>
-<a href="../src/zarray.c">src/zarray.c</a>,
-<a href="../src/zdict.c">src/zdict.c</a>,
-<a href="../src/zgeneric.c">src/zgeneric.c</a>,
-<a href="../src/zpacked.c">src/zpacked.c</a>,
-<a href="../src/zstring.c">src/zstring.c</a>.
+<a href="../psi/zarray.c">psi/zarray.c</a>,
+<a href="../psi/zdict.c">psi/zdict.c</a>,
+<a href="../psi/zgeneric.c">psi/zgeneric.c</a>,
+<a href="../psi/zpacked.c">psi/zpacked.c</a>,
+<a href="../psi/zstring.c">psi/zstring.c</a>.
 
 <dt>
 Functions:
 <dd>
-<a href="../src/ifunc.h">src/ifunc.h</a>,
-<a href="../src/zfunc.c">src/zfunc.c</a>,
-<a href="../src/zfunc0.c">src/zfunc0.c</a>,
-<a href="../src/zfunc3.c">src/zfunc3.c</a>,
-<a href="../src/zfunc4.c">src/zfunc4.c</a>,
+<a href="../psi/ifunc.h">psi/ifunc.h</a>,
+<a href="../psi/zfunc.c">psi/zfunc.c</a>,
+<a href="../psi/zfunc0.c">psi/zfunc0.c</a>,
+<a href="../psi/zfunc3.c">psi/zfunc3.c</a>,
+<a href="../psi/zfunc4.c">psi/zfunc4.c</a>,
 
 <dt>
 Other:
 <dd>
-<a href="../src/ivmem2.h">src/ivmem2.h</a>,
-<a href="../src/zalg.c">src/zalg.c</a>,
-<a href="../src/zarith.c">src/zarith.c</a>,
-<a href="../src/zcontext.c">src/zcontext.c</a>,
-<a href="../src/zcontrol.c">src/zcontrol.c</a>,
-<a href="../src/zmath.c">src/zmath.c</a>,
-<a href="../src/zmatrix.c">src/zmatrix.c</a>,
-<a href="../src/zmisc.c">src/zmisc.c</a>,
-<a href="../src/zmisc1.c">src/zmisc1.c</a>,
-<a href="../src/zmisc2.c">src/zmisc2.c</a>,
-<a href="../src/zmisc3.c">src/zmisc3.c</a>,
-<a href="../src/zrelbit.c">src/zrelbit.c</a>,
-<a href="../src/zstack.c">src/zstack.c</a>,
-<a href="../src/ztype.c">src/ztype.c</a>,
-<a href="../src/zusparam.c">src/zusparam.c</a>,
-<a href="../src/zvmem.c">src/zvmem.c</a>,
-<a href="../src/zvmem2.c">src/zvmem2.c</a>.
+<a href="../psi/ivmem2.h">psi/ivmem2.h</a>,
+<a href="../psi/zalg.c">psi/zalg.c</a>,
+<a href="../psi/zarith.c">psi/zarith.c</a>,
+<a href="../psi/zcontext.c">psi/zcontext.c</a>,
+<a href="../psi/zcontrol.c">psi/zcontrol.c</a>,
+<a href="../psi/zmath.c">psi/zmath.c</a>,
+<a href="../psi/zmatrix.c">psi/zmatrix.c</a>,
+<a href="../psi/zmisc.c">psi/zmisc.c</a>,
+<a href="../psi/zmisc1.c">psi/zmisc1.c</a>,
+<a href="../psi/zmisc2.c">psi/zmisc2.c</a>,
+<a href="../psi/zmisc3.c">psi/zmisc3.c</a>,
+<a href="../psi/zrelbit.c">psi/zrelbit.c</a>,
+<a href="../psi/zstack.c">psi/zstack.c</a>,
+<a href="../psi/ztype.c">psi/ztype.c</a>,
+<a href="../psi/zusparam.c">psi/zusparam.c</a>,
+<a href="../psi/zvmem.c">psi/zvmem.c</a>,
+<a href="../psi/zvmem2.c">psi/zvmem2.c</a>.
 
 </dl>
 
@@ -2449,68 +2435,64 @@ Output-related:
 <dt>
 Device management:
 <dd>
-<a href="../src/zdevcal.c">src/zdevcal.c</a>,
-<a href="../src/zdevice.c">src/zdevice.c</a>,
-<a href="../src/zdevice2.c">src/zdevice2.c</a>,
-<a href="../src/ziodev.c">src/ziodev.c</a>,
-<a href="../src/ziodev2.c">src/ziodev2.c</a>,
-<a href="../src/ziodevs.c">src/ziodevs.c</a>,
-<a href="../src/ziodevsc.c">src/ziodevsc.c</a>,
-<a href="../src/ziodevst.c">src/ziodevst.c</a>,
-<a href="../src/zmedia2.c">src/zmedia2.c</a>,
-<a href="../src/zdfilter.c">src/zdfilter.c</a>.
+<a href="../psi/zdevcal.c">psi/zdevcal.c</a>,
+<a href="../psi/zdevice.c">psi/zdevice.c</a>,
+<a href="../psi/zdevice2.c">psi/zdevice2.c</a>,
+<a href="../psi/ziodev.c">psi/ziodev.c</a>,
+<a href="../psi/ziodev2.c">psi/ziodev2.c</a>,
+<a href="../psi/ziodevs.c">psi/ziodevs.c</a>,
+<a href="../psi/ziodev.c.c">psi/ziodev.c.c</a>,
+<a href="../psi/zmedia2.c">psi/zmedia2.c</a>,
+<a href="../psi/zdfilter.c">psi/zdfilter.c</a>.
 
 <dt>
 Fonts and text:
 <dd>
-<a href="../src/bfont.h">src/bfont.h</a>,
-<a href="../src/ccfont.h">src/ccfont.h</a>,
-<a href="../src/iccfont.c">src/iccfont.c</a>,
-<a href="../src/icfontab.c">src/icfontab.c</a>,
-<a href="../src/ichar.h">src/ichar.h</a>,
-<a href="../src/ichar1.h">src/ichar1.h</a>,
-<a href="../src/icharout.h">src/icharout.h</a>,
-<a href="../src/icid.h">src/icid.h</a>,
-<a href="../src/ifcid.h">src/ifcid.h</a>,
-<a href="../src/ifont.h">src/ifont.h</a>,
-<a href="../src/ifont1.h">src/ifont1.h</a>,
-<a href="../src/ifont2.h">src/ifont2.h</a>,
-<a href="../src/ifont42.h">src/ifont42.h</a>,
-<a href="../src/zbfont.c">src/zbfont.c</a>,
-<a href="../src/zcfont.c">src/zcfont.c</a>,
-<a href="../src/zchar.c">src/zchar.c</a>,
-<a href="../src/zchar1.c">src/zchar1.c</a>,
-<a href="../src/zchar2.c">src/zchar2.c</a>,
-<a href="../src/zchar32.c">src/zchar32.c</a>,
-<a href="../src/zchar42.c">src/zchar42.c</a>,
-<a href="../src/zchar42.h">src/zchar42.h</a>,
-<a href="../src/zcharout.c">src/zcharout.c</a>,
-<a href="../src/zcharx.c">src/zcharx.c</a>,
-<a href="../src/zcid.c">src/zcid.c</a>,
-<a href="../src/zcidtest.c">src/zcidtest.c</a>,
-<a href="../src/zfcid.c">src/zfcid.c</a>,
-<a href="../src/zfcid0.c">src/zfcid0.c</a>,
-<a href="../src/zfcid1.c">src/zfcid1.c</a>,
-<a href="../src/zfcmap.c">src/zfcmap.c</a>,
-<a href="../src/zfont.c">src/zfont.c</a>,
-<a href="../src/zfont0.c">src/zfont0.c</a>,
-<a href="../src/zfont1.c">src/zfont1.c</a>,
-<a href="../src/zfont2.c">src/zfont2.c</a>,
-<a href="../src/zfont32.c">src/zfont32.c</a>,
-<a href="../src/zfont42.c">src/zfont42.c</a>,
-<a href="../src/zfontenum.c">src/zfontenum.c</a>.
+<a href="../psi/bfont.h">psi/bfont.h</a>,
+<a href="../psi/ichar.h">psi/ichar.h</a>,
+<a href="../psi/ichar1.h">psi/ichar1.h</a>,
+<a href="../psi/icharout.h">psi/icharout.h</a>,
+<a href="../psi/icid.h">psi/icid.h</a>,
+<a href="../psi/ifcid.h">psi/ifcid.h</a>,
+<a href="../psi/ifont.h">psi/ifont.h</a>,
+<a href="../psi/ifont1.h">psi/ifont1.h</a>,
+<a href="../psi/ifont2.h">psi/ifont2.h</a>,
+<a href="../psi/ifont42.h">psi/ifont42.h</a>,
+<a href="../psi/zbfont.c">psi/zbfont.c</a>,
+<a href="../psi/zcfont.c">psi/zcfont.c</a>,
+<a href="../psi/zchar.c">psi/zchar.c</a>,
+<a href="../psi/zchar1.c">psi/zchar1.c</a>,
+<a href="../psi/zchar2.c">psi/zchar2.c</a>,
+<a href="../psi/zchar32.c">psi/zchar32.c</a>,
+<a href="../psi/zchar42.c">psi/zchar42.c</a>,
+<a href="../psi/zchar42.h">psi/zchar42.h</a>,
+<a href="../psi/zcharout.c">psi/zcharout.c</a>,
+<a href="../psi/zcharx.c">psi/zcharx.c</a>,
+<a href="../psi/zcid.c">psi/zcid.c</a>,
+<a href="../psi/zcidtest.c">psi/zcidtest.c</a>,
+<a href="../psi/zfcid.c">psi/zfcid.c</a>,
+<a href="../psi/zfcid0.c">psi/zfcid0.c</a>,
+<a href="../psi/zfcid1.c">psi/zfcid1.c</a>,
+<a href="../psi/zfcmap.c">psi/zfcmap.c</a>,
+<a href="../psi/zfont.c">psi/zfont.c</a>,
+<a href="../psi/zfont0.c">psi/zfont0.c</a>,
+<a href="../psi/zfont1.c">psi/zfont1.c</a>,
+<a href="../psi/zfont2.c">psi/zfont2.c</a>,
+<a href="../psi/zfont32.c">psi/zfont32.c</a>,
+<a href="../psi/zfont42.c">psi/zfont42.c</a>,
+<a href="../psi/zfontenum.c">psi/zfontenum.c</a>.
 
 <dt>
 A bridge to the True Type bytecode interpreter:
 <dd>
-<a href="../src/gxttfb.c">src/gxttfb.c</a>,
-<a href="../src/gxttfb.h">src/gxttfb.h</a>,
-<a href="../src/ttfoutl.h">src/ttfoutl.h</a>,
-<a href="../src/ttfmain.c">src/ttfmain.c</a>,
-<a href="../src/ttfmemd.c">src/ttfmemd.c</a>,
-<a href="../src/ttfmemd.h">src/ttfmemd.h</a>,
-<a href="../src/ttfinp.c">src/ttfinp.c</a>,
-<a href="../src/ttfinp.h">src/ttfinp.h</a>.
+<a href="../base/gxttfb.c">base/gxttfb.c</a>,
+<a href="../base/gxttfb.h">base/gxttfb.h</a>,
+<a href="../base/ttfoutl.h">base/ttfoutl.h</a>,
+<a href="../base/ttfmain.c">base/ttfmain.c</a>,
+<a href="../base/ttfmemd.c">base/ttfmemd.c</a>,
+<a href="../base/ttfmemd.h">base/ttfmemd.h</a>,
+<a href="../base/ttfinp.c">base/ttfinp.c</a>,
+<a href="../base/ttfinp.h">base/ttfinp.h</a>.
 
 <dt>
 A reduced True Type bytecode interpreter:
@@ -2518,87 +2500,87 @@ A reduced True Type bytecode interpreter:
 the
 FreeType 1 project)</em>
 <dd>
-<a href="../src/ttfsfnt.h">src/ttfsfnt.h</a>,
-<a href="../src/ttcalc.c">src/ttcalc.c</a>,
-<a href="../src/ttcalc.h">src/ttcalc.h</a>,
-<a href="../src/ttcommon.h">src/ttcommon.h</a>,
-<a href="../src/ttconf.h">src/ttconf.h</a>,
-<a href="../src/ttconfig.h">src/ttconfig.h</a>,
-<a href="../src/ttinterp.c">src/ttinterp.c</a>,
-<a href="../src/ttinterp.h">src/ttinterp.h</a>,
-<a href="../src/ttload.c">src/ttload.c</a>,
-<a href="../src/ttload.h">src/ttload.h</a>,
-<a href="../src/ttmisc.h">src/ttmisc.h</a>,
-<a href="../src/ttobjs.c">src/ttobjs.c</a>,
-<a href="../src/ttobjs.h">src/ttobjs.h</a>,
-<a href="../src/tttables.h">src/tttables.h</a>,
-<a href="../src/tttype.h">src/tttype.h</a>,
-<a href="../src/tttypes.h">src/tttypes.h</a>.
+<a href="../base/ttfsfnt.h">base/ttfsfnt.h</a>,
+<a href="../base/ttcalc.c">base/ttcalc.c</a>,
+<a href="../base/ttcalc.h">base/ttcalc.h</a>,
+<a href="../base/ttcommon.h">base/ttcommon.h</a>,
+<a href="../base/ttconf.h">base/ttconf.h</a>,
+<a href="../base/ttconfig.h">base/ttconfig.h</a>,
+<a href="../base/ttinterp.c">base/ttinterp.c</a>,
+<a href="../base/ttinterp.h">base/ttinterp.h</a>,
+<a href="../base/ttload.c">base/ttload.c</a>,
+<a href="../base/ttload.h">base/ttload.h</a>,
+<a href="../base/ttmisc.h">base/ttmisc.h</a>,
+<a href="../base/ttobjs.c">base/ttobjs.c</a>,
+<a href="../base/ttobjs.h">base/ttobjs.h</a>,
+<a href="../base/tttables.h">base/tttables.h</a>,
+<a href="../base/tttype.h">base/tttype.h</a>,
+<a href="../base/tttypes.h">base/tttypes.h</a>.
 
 <dt>
 Color, pattern, and halftone:
 <dd>
-<a href="../src/icie.h">src/icie.h</a>,
-<a href="../src/icolor.h">src/icolor.h</a>,
-<a href="../src/icremap.h">src/icremap.h</a>,
-<a href="../src/icsmap.h">src/icsmap.h</a>,
-<a href="../src/iht.h">src/iht.h</a>,
-<a href="../src/ipcolor.h">src/ipcolor.h</a>,
-<a href="../src/zcie.c">src/zcie.c</a>,
-<a href="../src/zcolor.c">src/zcolor.c</a>,
-<a href="../src/zcolor1.c">src/zcolor1.c</a>,
-<a href="../src/zcolor2.c">src/zcolor2.c</a>,
-<a href="../src/zcolor3.c">src/zcolor3.c</a>,
-<a href="../src/zcrd.c">src/zcrd.c</a>,
-<a href="../src/zcsdevn.c">src/zcsdevn.c</a>,
-<a href="../src/zcsindex.c">src/zcsindex.c</a>,
-<a href="../src/zcspixel.c">src/zcspixel.c</a>,
-<a href="../src/zcssepr.c">src/zcssepr.c</a>,
-<a href="../src/zicc.c">src/zicc.c</a>,
-<a href="../src/zhsb.c">src/zhsb.c</a>,
-<a href="../src/zht.c">src/zht.c</a>,
-<a href="../src/zht1.c">src/zht1.c</a>,
-<a href="../src/zht2.h">src/zht2.h</a>,
-<a href="../src/zht2.c">src/zht2.c</a>,
-<a href="../src/zpcolor.c">src/zpcolor.c</a>,
-<a href="../src/zshade.c">src/zshade.c</a>,
-<a href="../src/ztrans.c">src/ztrans.c</a>.
+<a href="../psi/icie.h">psi/icie.h</a>,
+<a href="../psi/icolor.h">psi/icolor.h</a>,
+<a href="../psi/icremap.h">psi/icremap.h</a>,
+<a href="../psi/icsmap.h">psi/icsmap.h</a>,
+<a href="../psi/iht.h">psi/iht.h</a>,
+<a href="../psi/ipcolor.h">psi/ipcolor.h</a>,
+<a href="../psi/zcie.c">psi/zcie.c</a>,
+<a href="../psi/zcolor.c">psi/zcolor.c</a>,
+<a href="../psi/zcolor1.c">psi/zcolor1.c</a>,
+<a href="../psi/zcolor2.c">psi/zcolor2.c</a>,
+<a href="../psi/zcolor3.c">psi/zcolor3.c</a>,
+<a href="../psi/zcrd.c">psi/zcrd.c</a>,
+<a href="../psi/zcsdevn.c">psi/zcsdevn.c</a>,
+<a href="../psi/zcsindex.c">psi/zcsindex.c</a>,
+<a href="../psi/zcspixel.c">psi/zcspixel.c</a>,
+<a href="../psi/zcssepr.c">psi/zcssepr.c</a>,
+<a href="../psi/zicc.c">psi/zicc.c</a>,
+<a href="../psi/zhsb.c">psi/zhsb.c</a>,
+<a href="../psi/zht.c">psi/zht.c</a>,
+<a href="../psi/zht1.c">psi/zht1.c</a>,
+<a href="../psi/zht2.h">psi/zht2.h</a>,
+<a href="../psi/zht2.c">psi/zht2.c</a>,
+<a href="../psi/zpcolor.c">psi/zpcolor.c</a>,
+<a href="../psi/zshade.c">psi/zshade.c</a>,
+<a href="../psi/ztrans.c">psi/ztrans.c</a>.
 
 <dt>
 Images:
 <dd>
-<a href="../src/iimage.h">src/iimage.h</a>,
-<a href="../src/iimage2.h">src/iimage2.h</a>,
-<a href="../src/zimage.c">src/zimage.c</a>,
-<a href="../src/zimage2.c">src/zimage2.c</a>,
-<a href="../src/zimage3.c">src/zimage3.c</a>,
-<a href="../src/zfimscale.c">src/zfimscale.c</a>.
+<a href="../psi/iimage.h">psi/iimage.h</a>,
+<a href="../psi/iimage2.h">psi/iimage2.h</a>,
+<a href="../psi/zimage.c">psi/zimage.c</a>,
+<a href="../psi/zimage2.c">psi/zimage2.c</a>,
+<a href="../psi/zimage3.c">psi/zimage3.c</a>,
+<a href="../psi/zfimscale.c">psi/zfimscale.c</a>.
 
 <dt>
 Other graphics:
 <dd>
-<a href="../src/igstate.h">src/igstate.h</a>,
-<a href="../src/zdpnext.c">src/zdpnext.c</a>,
-<a href="../src/zdps.c">src/zdps.c</a>,
-<a href="../src/zdps1.c">src/zdps1.c</a>,
-<a href="../src/zgstate.c">src/zgstate.c</a>,
-<a href="../src/zpaint.c">src/zpaint.c</a>,
-<a href="../src/zpath.c">src/zpath.c</a>,
-<a href="../src/zpath1.c">src/zpath1.c</a>,
-<a href="../src/zrop.c">src/zrop.c</a>,
-<a href="../src/ztrap.c">src/ztrap.c</a>,
-<a href="../src/zupath.c">src/zupath.c</a>.
+<a href="../psi/igstate.h">psi/igstate.h</a>,
+<a href="../psi/zdpnext.c">psi/zdpnext.c</a>,
+<a href="../psi/zdps.c">psi/zdps.c</a>,
+<a href="../psi/zdps1.c">psi/zdps1.c</a>,
+<a href="../psi/zgstate.c">psi/zgstate.c</a>,
+<a href="../psi/zpaint.c">psi/zpaint.c</a>,
+<a href="../psi/zpath.c">psi/zpath.c</a>,
+<a href="../psi/zpath1.c">psi/zpath1.c</a>,
+<a href="../psi/zrop.c">psi/zrop.c</a>,
+<a href="../psi/ztrap.c">psi/ztrap.c</a>,
+<a href="../psi/zupath.c">psi/zupath.c</a>.
 
 </dl>
 
 <dt>
 Operator support:
 <dd>
-<a href="../src/oparc.h">src/oparc.h</a>,
-<a href="../src/opcheck.h">src/opcheck.h</a>,
-<a href="../src/opdef.h">src/opdef.h</a>,
-<a href="../src/oper.h">src/oper.h</a>,
-<a href="../src/opextern.h">src/opextern.h</a>.
+<a href="../psi/oparc.h">psi/oparc.h</a>,
+<a href="../psi/opcheck.h">psi/opcheck.h</a>,
+<a href="../psi/opdef.h">psi/opdef.h</a>,
+<a href="../psi/oper.h">psi/oper.h</a>,
+<a href="../psi/opextern.h">psi/opextern.h</a>.
 
 </dl>
 
@@ -2621,7 +2603,7 @@ supposed to have names that begin with '.', so you can find them all by
 executing the following (Unix) command:
 
 <blockquote><pre>
-grep '{".[.]' src/[zi]*.c
+grep '{".[.]' psi/[zi]*.c
 </pre></blockquote>
 
 <p>
@@ -2634,25 +2616,25 @@ here.
 <dl>
 
 <dt>
-<a href="../src/zdosio.c">src/zdosio.c</a>
+<a href="../psi/zdosio.c">psi/zdosio.c</a>
 <dd>
 Provides access to PC hardware I/O through MS-DOS system calls.  Probably no
 longer useful.
 
 <dt>
-<a href="../src/zdouble.c">src/zdouble.c</a>
+<a href="../psi/zdouble.c">psi/zdouble.c</a>
 <dd>
 Provides "double" floating point arithmetic, using 8-byte strings to hold
 values.  Developed under a contract; probably used only by the group that
 funded the development.
 
 <dt>
-<a href="../src/zfsample.c">src/zfsample.c</a>,
+<a href="../psi/zfsample.c">psi/zfsample.c</a>,
 <dd>
 Provides a special operator to sample a given function and create a new type 0 function.
 
 <dt>
-<a href="../src/zsysvm.c">src/zsysvm.c</a>
+<a href="../psi/zsysvm.c">psi/zsysvm.c</a>
 <dd>
 Provides operators for allocating objects in specific VM spaces,
 disregarding the current VM mode.
@@ -2669,38 +2651,38 @@ href="#PostScript_interpreter_extensions">below</a>.
 <dt>
 Font API :
 <dd>
-<a href="../src/ifapi.h">src/ifapi.h</a>,
-<a href="../src/zfapi.c">src/zfapi.c</a>,
-<a href="../src/fapiufst.c">src/fapiufst.c</a>,
-<a href="../src/fapi_ft.c">src/fapi_ft.c</a>,
-<a href="../src/wrfont.h">src/wrfont.h</a>,
-<a href="../src/wrfont.c">src/wrfont.c</a>,
-<a href="../src/write_t1.h">src/write_t1.h</a>,
-<a href="../src/write_t1.c">src/write_t1.c</a>,
-<a href="../src/write_t2.h">src/write_t2.h</a>,
-<a href="../src/write_t2.c">src/write_t2.c</a>,
+<a href="../psi/ifapi.h">psi/ifapi.h</a>,
+<a href="../psi/zfapi.c">psi/zfapi.c</a>,
+<a href="../base/fapiufst.c">base/fapiufst.c</a>,
+<a href="../base/fapi_ft.c">base/fapi_ft.c</a>,
+<a href="../base/wrfont.h">base/wrfont.h</a>,
+<a href="../base/wrfont.c">base/wrfont.c</a>,
+<a href="../base/write_t1.h">base/write_t1.h</a>,
+<a href="../base/write_t1.c">base/write_t1.c</a>,
+<a href="../base/write_t2.h">base/write_t2.h</a>,
+<a href="../base/write_t2.c">base/write_t2.c</a>,
 
 <dt>
 Miscellaneous support:
 <dd>
-<a href="../src/ierrors.h">src/ierrors.h</a>,
-<a href="../src/errors.h">src/errors.h</a> <em>(deprecated)</em>,
-<a href="../src/ghost.h">src/ghost.h</a>,
-<a href="../src/iconf.c">src/iconf.c</a>,
-<a href="../src/iconf.h">src/iconf.h</a>,
-<a href="../src/idparam.c">src/idparam.c</a>,
-<a href="../src/idparam.h">src/idparam.h</a>,
-<a href="../src/ilevel.h">src/ilevel.h</a>,
-<a href="../src/inouparm.c">src/inouparm.c</a>,
-<a href="../src/iparam.c">src/iparam.c</a>,
-<a href="../src/iparam.h">src/iparam.h</a>,
-<a href="../src/iparray.h">src/iparray.h</a>,
-<a href="../src/iutil.c">src/iutil.c</a>,
-<a href="../src/iutil.h">src/iutil.h</a>,
-<a href="../src/iutil2.c">src/iutil2.c</a>,
-<a href="../src/iutil2.h">src/iutil2.h</a>,
-<a href="../src/iplugin.c">src/iplugin.c</a>,
-<a href="../src/iplugin.h">src/iplugin.h</a>.
+<a href="../psi/ierrors.h">psi/ierrors.h</a>,
+<a href="../base/errors.h">base/errors.h</a> <em>(deprecated)</em>,
+<a href="../psi/ghost.h">psi/ghost.h</a>,
+<a href="../psi/iconf.c">psi/iconf.c</a>,
+<a href="../psi/iconf.h">psi/iconf.h</a>,
+<a href="../psi/idparam.c">psi/idparam.c</a>,
+<a href="../psi/idparam.h">psi/idparam.h</a>,
+<a href="../psi/ilevel.h">psi/ilevel.h</a>,
+<a href="../psi/inouparm.c">psi/inouparm.c</a>,
+<a href="../psi/iparam.c">psi/iparam.c</a>,
+<a href="../psi/iparam.h">psi/iparam.h</a>,
+<a href="../psi/iparray.h">psi/iparray.h</a>,
+<a href="../psi/iutil.c">psi/iutil.c</a>,
+<a href="../psi/iutil.h">psi/iutil.h</a>,
+<a href="../psi/iutil2.c">psi/iutil2.c</a>,
+<a href="../psi/iutil2.h">psi/iutil2.h</a>,
+<a href="../psi/iplugin.c">psi/iplugin.c</a>,
+<a href="../psi/iplugin.h">psi/iplugin.h</a>.
 
 </dl>
 
@@ -3178,7 +3160,7 @@ build.  For example, the core (Level 1) PostScript build has a "stub" for
 binary tokens, which are a Level 2 feature but are referenced by the core
 scanner: a Level 2 build must remove the stub.  For more information about
 this, look for the string <code>-replace</code> in the makefiles and in
-<a href="../src/genconf.c">src/genconf.c</a>.
+<a href="../base/genconf.c">base/genconf.c</a>.
 
 </ul>
 
@@ -3241,36 +3223,27 @@ Source generators:
 <dl>
 
 <dt>
-<a href="../src/genarch.c">src/genarch.c</a>
+<a href="../base/genarch.c">base/genarch.c</a>
 <dd>
 Creates a header file containing a variety of information about the hardware
 and compiler that isn't provided in any standard system header file.  Always
 used.
 
 <dt>
-<a href="../src/genconf.c">src/genconf.c</a> (also generates non-source)
+<a href="../base/genconf.c">base/genconf.c</a> (also generates non-source)
 <dd>
 Constructs header files and linker control files from the collection of
 options and modules that make up the build.  See above.  Always used.
 
 <dt>
-<a href="../src/genht.c">src/genht.c</a>
+<a href="../base/genht.c">base/genht.c</a>
 <dd>
 Converts a PostScript halftone (in a particular constrained format) to a C
 data structure that can be compiled into an executable.  Only used if any
 such halftones are included in the build.
 
 <dt>
-<a href="../src/geninit.c">src/geninit.c</a>
-<dd>
-Converts PostScript initialization files to a single PostScript file that
-has comments removed and optionally, a C data structure that can be
-compiled into an executable.  Only used when building a PostScript
-interpreter, and only if <code>COMPILE_INITS</code> was set to 1 in the
-makefile.
-
-<dt>
-<a href="../src/mkromfs.c">src/mkromfs.c</a>
+<a href="../base/mkromfs.c">base/mkromfs.c</a>
 <dd>
 Takes a set of directories, and creates a compressed filesystem
 image that can be compiled into the executable as static data and accessed
@@ -3279,7 +3252,7 @@ through the %rom% iodevice prefix. This is used to implement the
 efficient than the current 'gsinit.c' produced by 'geninit.c'). This IODevice
 is more versatile since other files can be encapsulated such as fonts, helper
 PostScript files and Resources. The list of files is defined in part in 
-<a href="../src/psromfs.mak">src/psromfs.mak</a>.
+<a href="../base/psromfs.mak">base/psromfs.mak</a>.
 
 </dl>
 
@@ -3290,18 +3263,18 @@ Other generators:
 <dl>
 
 <dt>
-<a href="../src/echogs.c">src/echogs.c</a>
+<a href="../base/echogs.c">base/echogs.c</a>
 <dd>
 Implements a variety of shell-like functions to get around quirks,
 limitations, and omissions in the shells on various platforms.  Always used.
 
 <dt>
-<a href="../src/genconf.c">src/genconf.c</a> (also generates source)
+<a href="../base/genconf.c">base/genconf.c</a> (also generates source)
 <dd>
 See above.
 
 <dt>
-<a href="../src/gendev.c">src/gendev.c</a> (not used)
+<a href="../base/gendev.c">base/gendev.c</a> (not used)
 <dd>
 Was intended as a replacement for <code>genconf</code>, but was never
 completed.
@@ -3321,36 +3294,36 @@ only for the sake of the build process.
 <dt>
 Files for PC environments:
 <dd>
-<a href="../src/gswin.icx">src/gswin.icx</a>,
-<a href="../src/gswin16.icx">src/gswin16.icx</a>,
-<a href="../src/bcc32.cfg">src/bcc32.cfg</a>,
-<a href="../src/cp.bat">src/cp.bat</a>,
-<a href="../src/cp.cmd">src/cp.cmd</a>,
-<a href="../src/dw32c.def">src/dw32c.def</a>,
-<a href="../src/dwmain.rc">src/dwmain.rc</a>,
-<a href="../src/dwmain32.def">src/dwmain32.def</a>,
-<a href="../src/dwsetup.def">src/dwsetup.def</a>,
-<a href="../src/dwsetup.rc">src/dwsetup.rc</a>,
-<a href="../src/dwuninst.def">src/dwuninst.def</a>,
-<a href="../src/dwuninst.rc">src/dwuninst.rc</a>,
-<a href="../src/gsdll2.def">src/gsdll2.def</a>,
-<a href="../src/gsdll2.rc">src/gsdll2.rc</a>,
-<a href="../src/gsdll32.def">src/gsdll32.def</a>,
-<a href="../src/gsdll32.rc">src/gsdll32.rc</a>,
-<a href="../src/gsdll32w.lnk">src/gsdll32w.lnk</a>,
-<a href="../src/gsos2.def">src/gsos2.def</a>,
-<a href="../src/gsos2.icx">src/gsos2.icx</a>,
-<a href="../src/gsos2.rc">src/gsos2.rc</a>,
-<a href="../src/gspmdrv.def">src/gspmdrv.def</a>,
-<a href="../src/gspmdrv.icx">src/gspmdrv.icx</a>,
-<a href="../src/gspmdrv.rc">src/gspmdrv.rc</a>,
-<a href="../src/gswin.rc">src/gswin.rc</a>,
-<a href="../src/gswin32.rc">src/gswin32.rc</a>,
-<a href="../src/mv.bat">src/mv.bat</a>,
-<a href="../src/mv.cmd">src/mv.cmd</a>,
-<a href="../src/rm.bat">src/rm.bat</a>,
-<a href="../src/rm.cmd">src/rm.cmd</a>,
-<a href="../src/turboc.cfg">src/turboc.cfg</a>.
+<a href="../base/gswin.icx">base/gswin.icx</a>,
+<a href="../base/gswin16.icx">base/gswin16.icx</a>,
+<a href="../base/bcc32.cfg">base/bcc32.cfg</a>,
+<a href="../base/cp.bat">base/cp.bat</a>,
+<a href="../base/cp.cmd">base/cp.cmd</a>,
+<a href="../psi/dw32c.def">psi/dw32c.def</a>,
+<a href="../psi/dwmain.rc">psi/dwmain.rc</a>,
+<a href="../psi/dwmain32.def">psi/dwmain32.def</a>,
+<a href="../psi/dwsetup.def">psi/dwsetup.def</a>,
+<a href="../psi/dwsetup.rc">psi/dwsetup.rc</a>,
+<a href="../psi/dwuninst.def">psi/dwuninst.def</a>,
+<a href="../psi/dwuninst.rc">psi/dwuninst.rc</a>,
+<a href="../psi/gsdll2.def">psi/gsdll2.def</a>,
+<a href="../psi/gsdll2.rc">psi/gsdll2.rc</a>,
+<a href="../psi/gsdll32.def">psi/gsdll32.def</a>,
+<a href="../psi/gsdll32.rc">psi/gsdll32.rc</a>,
+<a href="../psi/gsdll32w.lnk">psi/gsdll32w.lnk</a>,
+<a href="../base/gsos2.def">base/gsos2.def</a>,
+<a href="../base/gsos2.icx">base/gsos2.icx</a>,
+<a href="../base/gsos2.rc">base/gsos2.rc</a>,
+<a href="../base/gspmdrv.def">base/gspmdrv.def</a>,
+<a href="../base/gspmdrv.icx">base/gspmdrv.icx</a>,
+<a href="../base/gspmdrv.rc">base/gspmdrv.rc</a>,
+<a href="../base/gswin.rc">base/gswin.rc</a>,
+<a href="../base/gswin32.rc">base/gswin32.rc</a>,
+<a href="../base/mv.bat">base/mv.bat</a>,
+<a href="../base/mv.cmd">base/mv.cmd</a>,
+<a href="../base/rm.bat">base/rm.bat</a>,
+<a href="../base/rm.cmd">base/rm.cmd</a>,
+<a href="../base/turboc.cfg">base/turboc.cfg</a>.
 
 <dt>
 Files for MacOS:
@@ -3360,17 +3333,17 @@ Files for MacOS:
 <dt>
 Files for OpenVMS:
 <dd>
-<a href="../src/append_l.com">src/append_l.com</a>,
-<a href="../src/copy_one.com">src/copy_one.com</a>,
-<a href="../src/rm_all.com">src/rm_all.com</a>,
-<a href="../src/rm_one.com">src/rm_one.com</a>.
+<a href="../base/append_l.com">base/append_l.com</a>,
+<a href="../base/copy_one.com">base/copy_one.com</a>,
+<a href="../base/rm_all.com">base/rm_all.com</a>,
+<a href="../base/rm_one.com">base/rm_one.com</a>.
 
 <dt>
 Other files:
 <dd>
-<a href="../src/bench.c">src/bench.c</a>,
-<a href="../src/catmake">src/catmake</a>,
-<a href="../src/instcopy">src/instcopy</a>.
+<a href="../base/bench.c">base/bench.c</a>,
+<a href="../base/catmake">base/catmake</a>,
+<a href="../base/instcopy">base/instcopy</a>.
 
 </dl>
 
@@ -3589,7 +3562,7 @@ object is freed (either explicitly or automatically).
 Structure descriptors are read-only, and are normally defined statically
 using one of the large set of <code>gs_private_st_</code> or
 <code>gs_public_st_</code> macros in <a
-href="../src/gsstruct.h">src/gsstruct.h</a>.
+href="../base/gsstruct.h">base/gsstruct.h</a>.
 
 <p>
 While the structure descriptor normally specifies the size of the object,
@@ -3623,7 +3596,7 @@ require a structure descriptor if instances of that type are used
 <li>Instances are allocated only on the C stack, e.g., as
 <code>xxx_t&nbsp;xxx1,&nbsp;xxx2;</code>, or on the C heap, with
 <code>malloc</code> or through the Ghostscript "wrapper" defined in <a
-href="../src/gsmalloc.h">src/gsmalloc.h</a>.
+href="../base/gsmalloc.h">base/gsmalloc.h</a>.
 
 <li>Pointers to instances are not stored in places where the garbage
 collector will try to trace the pointer.
@@ -3643,8 +3616,8 @@ stack.
 <dt>
 Files:
 <dd>
-<a href="../src/gsstruct.h">src/gsstruct.h</a>,
-<a href="../src/gsstype.h">src/gsstype.h</a>.
+<a href="../base/gsstruct.h">base/gsstruct.h</a>,
+<a href="../base/gsstype.h">base/gsstype.h</a>.
 </dl>
 
 <h4><a name="Garbage_collection"></a>Garbage collection</h4>
@@ -3679,9 +3652,9 @@ garbage collectable objects from the stack (other than designated roots).
 <dt>
 Files:
 <dd>
-<a href="../src/gsgc.h">src/gsgc.h</a>,
-<a href="../src/gsnogc.c">src/gsnogc.c</a>,
-<a href="../src/gsnogc.h">src/gsnogc.h</a>.
+<a href="../psi/gs.c.h">psi/gs.c.h</a>,
+<a href="../base/gsnogc.c">base/gsnogc.c</a>,
+<a href="../base/gsnogc.h">base/gsnogc.h</a>.
 </dl>
 
 <h4><a name="Movability"></a>Movability</h4>
@@ -3722,7 +3695,7 @@ the contents insofar as possible.
 </ul>
 
 <p>
-For details, see <a href="../src/gsmemory.h">src/gsmemory.h</a>.
+For details, see <a href="../base/gsmemory.h">base/gsmemory.h</a>.
 
 <p>
 The allocator API also includes one special hook for the PostScript
@@ -3734,11 +3707,11 @@ href="#save_forgetsave_restore"><code>save</code> and
 <dt>
 Files:
 <dd>
-<a href="../src/gsmemraw.h">src/gsmemraw.h</a>,
-<a href="../src/gsmemory.c">src/gsmemory.c</a>,
-<a href="../src/gsmemory.h">src/gsmemory.h</a>,
-<a href="../src/gsstruct.h">src/gsstruct.h</a>,
-<a href="../src/gsstype.h">src/gsstype.h</a>.
+<a href="../base/gsmemraw.h">base/gsmemraw.h</a>,
+<a href="../base/gsmemory.c">base/gsmemory.c</a>,
+<a href="../base/gsmemory.h">base/gsmemory.h</a>,
+<a href="../base/gsstruct.h">base/gsstruct.h</a>,
+<a href="../base/gsstype.h">base/gsstype.h</a>.
 </dl>
 
 <h3><a name="Freeing_storage"></a>Freeing storage</h3>
@@ -3800,7 +3773,7 @@ cannot free objects that are involved in a pointer cycle (e.g., A -> B -> C
 <dt>
 Files:
 <dd>
-<a href="../src/gsrefct.h">src/gsrefct.h</a>.
+<a href="../base/gsrefct.h">base/gsrefct.h</a>.
 </dl>
 
 <h4><a name="Real_garbage_collection"></a>(Real) garbage collection</h4>
@@ -3826,8 +3799,8 @@ behavior.
 <dt>
 Files:
 <dd>
-<a href="../src/gsmalloc.h">src/gsmalloc.h</a>,
-<a href="../src/gsmalloc.c">src/gsmalloc.c</a>.
+<a href="../base/gsmalloc.h">base/gsmalloc.h</a>,
+<a href="../base/gsmalloc.c">base/gsmalloc.c</a>.
 </dl>
 
 <h4><a name="Locking"></a>Locking</h4>
@@ -3845,8 +3818,8 @@ technique, any allocator can be made thread-safe.
 <dt>
 Files:
 <dd>
-<a href="../src/gsmemlok.h">src/gsmemlok.h</a>,
-<a href="../src/gsmemlok.c">src/gsmemlok.c</a>.
+<a href="../base/gsmemlok.h">base/gsmemlok.h</a>,
+<a href="../base/gsmemlok.c">base/gsmemlok.c</a>.
 </dl>
 
 <h4><a name="Retrying"></a>Retrying</h4>
@@ -3863,8 +3836,8 @@ occupied by caches.
 <dt>
 Files:
 <dd>
-<a href="../src/gsmemret.h">src/gsmemret.h</a>,
-<a href="../src/gsmemret.c">src/gsmemret.c</a>.
+<a href="../base/gsmemret.h">base/gsmemret.h</a>,
+<a href="../base/gsmemret.c">base/gsmemret.c</a>.
 </dl>
 
 <h4><a name="Chunk"></a>Chunk</h4>
@@ -3884,8 +3857,8 @@ which MUST be mutex protected.
 <dt>
 Files:
 <dd>
-<a href="../src/gsmchunk.h">src/gsmchunk.h</a>,
-<a href="../src/gsmchunk.c">src/gsmchunk.c</a>.
+<a href="../psi/gs.chunk.h">psi/gs.chunk.h</a>,
+<a href="../psi/gs.chunk.c">psi/gs.chunk.c</a>.
 </dl>
 
 <h3><a name="Standard_implementation"></a>Standard implementation</h3>
@@ -3915,10 +3888,10 @@ href="#Refs">Refs</a> below for details.
 <dt>
 Files:
 <dd>
-<a href="../src/gsalloc.c">src/gsalloc.c</a>,
-<a href="../src/gsalloc.h">src/gsalloc.h</a>,
-<a href="../src/gxalloc.h">src/gxalloc.h</a>,
-<a href="../src/gxobj.h">src/gxobj.h</a>.
+<a href="../base/gsalloc.c">base/gsalloc.c</a>,
+<a href="../base/gsalloc.h">base/gsalloc.h</a>,
+<a href="../base/gxalloc.h">base/gxalloc.h</a>,
+<a href="../base/gxobj.h">base/gxobj.h</a>.
 </dl>
 
 <h3><a name="PostScript_interpreter_extensions"></a>PostScript interpreter extensions</h3>
@@ -3934,16 +3907,16 @@ collection.
 <p>
 Ghostscript represents what the PLRM calls PostScript "objects" using a
 structure called a <code>ref</code>, defined in <a
-href="../src/iref.h">src/iref.h</a>; packed refs, used for the elements of
-packed arrays, are defined in <a href="../src/ipacked.h">src/ipacked.h</a>.
+href="../psi/iref.h">psi/iref.h</a>; packed refs, used for the elements of
+packed arrays, are defined in <a href="../psi/ipacked.h">psi/ipacked.h</a>.
 See those files for detailed information.
 
 <dl>
 <dt>
 Files:
 <dd>
-<a href="../src/ipacked.h">src/ipacked.h</a>,
-<a href="../src/iref.h">src/iref.h</a>.
+<a href="../psi/ipacked.h">psi/ipacked.h</a>,
+<a href="../psi/iref.h">psi/iref.h</a>.
 </dl>
 
 <p>
@@ -3964,15 +3937,15 @@ there is a tag for "foreign" VM, which means that the memory is not managed
 by a Ghostscript allocator at all.  Every store into a composite object must
 check for <code>invalidaccess</code>: the VM space tag values are chosen
 to help make this check efficient.  See <a
-href="../src/ivmspace.h">src/ivmspace.h</a>, <a
-href="../src/iref.h">src/iref.h</a>, and <a
-href="../src/store.h">src/store.h</a> for details.
+href="../psi/ivmspace.h">psi/ivmspace.h</a>, <a
+href="../psi/iref.h">psi/iref.h</a>, and <a
+href="../psi/store.h">psi/store.h</a> for details.
 
 <dl>
 <dt>
 Files:
 <dd>
-<a href="../src/ivmspace.h">src/ivmspace.h</a>.
+<a href="../psi/ivmspace.h">psi/ivmspace.h</a>.
 </dl>
 
 <p>
@@ -3983,7 +3956,7 @@ manager packs multiple composite objects (also called "ref-containing
 objects") into a single memory manager object, similar to the way the memory
 manager packs multiple objects into a chunk (see <a
 href="#Standard_implementation">above</a>).  See <a
-href="../src/gxalloc.h">src/gxalloc.h</a> for details.  This memory manager
+href="../base/gxalloc.h">base/gxalloc.h</a> for details.  This memory manager
 object has a structure descriptor, like all other memory manager objects.
 
 <p>
@@ -3997,13 +3970,13 @@ href="#Interpreter_GC">q.v.</a>).
 <dt>
 Files:
 <dd>
-<a href="../src/ialloc.c">src/ialloc.c</a>,
-<a href="../src/ialloc.h">src/ialloc.h</a>,
-<a href="../src/iastate.h">src/iastate.h</a>,
-<a href="../src/iastruct.h">src/iastruct.h</a>,
-<a href="../src/ilocate.c">src/ilocate.c</a>,
-<a href="../src/imemory.h">src/imemory.h</a>,
-<a href="../src/istruct.h">src/istruct.h</a>.
+<a href="../psi/ialloc.c">psi/ialloc.c</a>,
+<a href="../psi/ialloc.h">psi/ialloc.h</a>,
+<a href="../psi/iastate.h">psi/iastate.h</a>,
+<a href="../psi/iastruct.h">psi/iastruct.h</a>,
+<a href="../psi/ilocate.c">psi/ilocate.c</a>,
+<a href="../psi/imemory.h">psi/imemory.h</a>,
+<a href="../psi/istruct.h">psi/istruct.h</a>.
 </dl>
 
 <h4><a name="save_forgetsave_restore"></a>save/.forgetsave/restore</h4>
@@ -4017,18 +3990,18 @@ a given <code>save</code> had never happened.  (In data base terminology,
 transaction").  <code>.forgetsave</code> was implemented for a specific
 commercial customer (who may no longer even be using it): it was a pain to
 make work, but it's in the code now, and should be maintained.  See the
-extensive comments in <a href="../src/isave.c">src/isave.c</a> for more
+extensive comments in <a href="../psi/isave.c">psi/isave.c</a> for more
 information about how these operations work.
 
 <dl>
 <dt>
 Files:
 <dd>
-<a href="../src/idosave.h">src/idosave.h</a>,
-<a href="../src/isave.c">src/isave.c</a>,
-<a href="../src/isave.h">src/isave.h</a>,
-<a href="../src/isstate.h">src/isstate.h</a>,
-<a href="../src/store.h">src/store.h</a>.
+<a href="../psi/idosave.h">psi/idosave.h</a>,
+<a href="../psi/isave.c">psi/isave.c</a>,
+<a href="../psi/isave.h">psi/isave.h</a>,
+<a href="../psi/isstate.h">psi/isstate.h</a>,
+<a href="../psi/store.h">psi/store.h</a>.
 </dl>
 
 <h4><a name="Stable_allocators"></a>Stable allocators</h4>
@@ -4070,10 +4043,10 @@ allocators are:
 <li>Several per-context structures for DPS.
 
 <li>Paths (see <code>gstate_path_memory</code> in
-<a href="../src/gsstate.c">src/gsstate.c</a>.
+<a href="../base/gsstate.c">base/gsstate.c</a>.
 
 <li>Row buffers for images (see <code>gs_image_row_memory</code> in <a
-href="../src/gsimage.c">src/gsimage.c</a>), because the data-reading
+href="../base/gsimage.c">base/gsimage.c</a>), because the data-reading
 procedure for an image can invoke <code>save</code> and
 <code>restore</code>.
 
@@ -4081,7 +4054,7 @@ procedure for an image can invoke <code>save</code> and
 .. register .. restore.
 
 <li>The parameter lists for pdfwrite and pswrite devices (in <a
-href="../src/gdevpsdp.c">src/gdevpsdp.c</a>), because the whole issue of
+href="../base/gdevpsdp.c">base/gdevpsdp.c</a>), because the whole issue of
 local vs. global VM for setpagedevice is, in the words of Ed Taft of Adobe,
 "a mess".
 
@@ -4151,14 +4124,14 @@ using 3 different mechanisms:
 <ul>
 
 <li>Objects have a mark bit in their header: see
-<a href="../src/gxobj.h">src/gxobj.h</a>,
+<a href="../base/gxobj.h">base/gxobj.h</a>,
 
 <li>Refs and packed refs have a reserved mark bit: see <a
-href="../src/iref.h">src/iref.h</a> and <a
-href="../src/ipacked.h">src/ipacked.h</a>.
+href="../psi/iref.h">psi/iref.h</a> and <a
+href="../psi/ipacked.h">psi/ipacked.h</a>.
 
 <li>Strings use a separate bit table, with one bit per string byte: see
-<a href="../src/gxalloc.h">src/gxalloc.h</a>,
+<a href="../base/gxalloc.h">base/gxalloc.h</a>,
 
 </ul>
 
@@ -4183,12 +4156,12 @@ ref at the end for this purpose.
 <dt>
 Files:
 <dd>
-<a href="../src/igc.c">src/igc.c</a>,
-<a href="../src/igc.h">src/igc.h</a>,
-<a href="../src/igcref.c">src/igcref.c</a>,
-<a href="../src/igcstr.c">src/igcstr.c</a>,
-<a href="../src/igcstr.h">src/igcstr.h</a>,
-<a href="../src/ireclaim.c">src/ireclaim.c</a>.
+<a href="../psi/igc.c">psi/igc.c</a>,
+<a href="../psi/igc.h">psi/igc.h</a>,
+<a href="../psi/igcref.c">psi/igcref.c</a>,
+<a href="../psi/igcstr.c">psi/igcstr.c</a>,
+<a href="../psi/igcstr.h">psi/igcstr.h</a>,
+<a href="../psi/ireclaim.c">psi/ireclaim.c</a>.
 </dl>
 
 <hr>
@@ -4228,7 +4201,7 @@ compilation may fail.
 <dt>
 Files:
 <dd>
-<a href="../src/genarch.c">src/genarch.c</a>,
+<a href="../base/genarch.c">base/genarch.c</a>,
 <a href="../obj/arch.h">obj/arch.h</a>.
 </dl>
 
@@ -4241,7 +4214,7 @@ Currently, Ghostscript's build process doesn't attempt to sort this out
 automatically.  Instead, for each library header file
 <code>&lt;</code><em>xxx</em><code>.h&gt;</code> there is a
 corresponding Ghostscript source file
-<code>src/</code><em>xxx</em><code>_.h</code>, containing a set of
+<code>base/</code><em>xxx</em><code>_.h</code>, containing a set of
 compile-time conditionals that attempt to select the correct platform header
 file, or in some cases substitute Ghostscript's own code for a missing
 facility.  You may need to edit these files when moving to platforms with
@@ -4251,27 +4224,27 @@ unusually non-standard libraries.
 <dt>
 Files:
 <dd>
-<a href="../src/ctype_.h">src/ctype_.h</a>,
-<a href="../src/dirent_.h">src/dirent_.h</a>,
-<a href="../src/dos_.h">src/dos_.h</a>,
-<a href="../src/errno_.h">src/errno_.h</a>,
-<a href="../src/fcntl_.h">src/fcntl_.h</a>,
-<a href="../src/jerror_.h">src/jerror_.h</a>,
-<a href="../src/malloc_.h">src/malloc_.h</a>,
-<a href="../src/math_.h">src/math_.h</a>,
-<a href="../src/memory_.h">src/memory_.h</a>,
-<a href="../src/pipe_.h">src/pipe_.h</a>,
-<a href="../src/png_.h">src/png_.h</a>,
-<a href="../src/setjmp_.h">src/setjmp_.h</a>,
-<a href="../src/stat_.h">src/stat_.h</a>,
-<a href="../src/stdint_.h">src/stdint_.h</a>,
-<a href="../src/stdio_.h">src/stdio_.h</a>,
-<a href="../src/string_.h">src/string_.h</a>,
-<a href="../src/time_.h">src/time_.h</a>,
-<a href="../src/unistd_.h">src/unistd_.h</a>,
-<a href="../src/vmsmath.h">src/vmsmath.h</a>,
-<a href="../src/windows_.h">src/windows_.h</a>,
-<a href="../src/x_.h">src/x_.h</a>.
+<a href="../base/ctype_.h">base/ctype_.h</a>,
+<a href="../base/dirent_.h">base/dirent_.h</a>,
+<a href="../base/dos_.h">base/dos_.h</a>,
+<a href="../base/errno_.h">base/errno_.h</a>,
+<a href="../base/fcntl_.h">base/fcntl_.h</a>,
+<a href="../base/jerror_.h">base/jerror_.h</a>,
+<a href="../base/malloc_.h">base/malloc_.h</a>,
+<a href="../base/math_.h">base/math_.h</a>,
+<a href="../base/memory_.h">base/memory_.h</a>,
+<a href="../base/pipe_.h">base/pipe_.h</a>,
+<a href="../base/png_.h">base/png_.h</a>,
+<a href="../base/setjmp_.h">base/setjmp_.h</a>,
+<a href="../base/stat_.h">base/stat_.h</a>,
+<a href="../base/stdint_.h">base/stdint_.h</a>,
+<a href="../base/stdio_.h">base/stdio_.h</a>,
+<a href="../base/string_.h">base/string_.h</a>,
+<a href="../base/time_.h">base/time_.h</a>,
+<a href="../base/unistd_.h">base/unistd_.h</a>,
+<a href="../base/vmsmath.h">base/vmsmath.h</a>,
+<a href="../base/windows_.h">base/windows_.h</a>,
+<a href="../base/x_.h">base/x_.h</a>.
 </dl>
 
 <p>
@@ -4298,51 +4271,50 @@ executable.
 <dt>
 API:
 <dd>
-<a href="../src/gp.h">src/gp.h</a>,
-<a href="../src/gpcheck.h">src/gpcheck.h</a>,
-<a href="../src/gpgetenv.h">src/gpgetenv.h</a>,
-<a href="../src/gpmisc.h">src/gpmisc.h</a>,
-<a href="../src/gpsync.h">src/gpsync.h</a>.
+<a href="../base/gp.h">base/gp.h</a>,
+<a href="../base/gpcheck.h">base/gpcheck.h</a>,
+<a href="../base/gpgetenv.h">base/gpgetenv.h</a>,
+<a href="../base/gpmisc.h">base/gpmisc.h</a>,
+<a href="../base/gpsync.h">base/gpsync.h</a>.
 
 <dt>
 Implementation files shared among multiple platforms:
 <dd>
-<a href="../src/gp_getnv.c">src/gp_getnv.c</a>,
-<a href="../src/gp_mktmp.c">src/gp_mktmp.c</a>,
-<a href="../src/gp_nsync.c">src/gp_nsync.c</a>,
-<a href="../src/gp_psync.c">src/gp_psync.c</a>,
-<a href="../src/gp_strdl.c">src/gp_strdl.c</a>,
-<a href="../src/gpmisc.c">src/gpmisc.c</a>.
+<a href="../base/gp_getnv.c">base/gp_getnv.c</a>,
+<a href="../base/gp_mktmp.c">base/gp_mktmp.c</a>,
+<a href="../base/gp_nsync.c">base/gp_nsync.c</a>,
+<a href="../base/gp_psync.c">base/gp_psync.c</a>,
+<a href="../base/gp_strdl.c">base/gp_strdl.c</a>,
+<a href="../base/gpmisc.c">base/gpmisc.c</a>.
 
 <dt>
 Platform-specific implementation files:
 <dd>
-<a href="../src/gp_dosfe.c">src/gp_dosfe.c</a>,
-<a href="../src/gp_dosfs.c">src/gp_dosfs.c</a>,
-<a href="../src/gp_dvx.c">src/gp_dvx.c</a>,
-<a href="../src/gp_iwatc.c">src/gp_iwatc.c</a>,
-<a href="../src/gp_msdos.c">src/gp_msdos.c</a>,
-<a href="../src/gp_mshdl.c">src/gp_mshdl.c</a>,
-<a href="../src/gp_msio.c">src/gp_msio.c</a>,
-<a href="../src/gp_mslib.c">src/gp_mslib.c</a>,
-<a href="../src/gp_mswin.c">src/gp_mswin.c</a>,
-<a href="../src/gp_mswin.h">src/gp_mswin.h</a>,
-<a href="../src/gp_ntfs.c">src/gp_ntfs.c</a>,
-<a href="../src/gp_os2.c">src/gp_os2.c</a>,
-<a href="../src/gp_os2.h">src/gp_os2.h</a>,
-<a href="../src/gp_os9.c">src/gp_os9.c</a>,
-<a href="../src/gp_stdia.c">src/gp_stdia.c</a>,
-<a href="../src/gp_stdin.c">src/gp_stdin.c</a>,
-<a href="../src/gp_sysv.c">src/gp_sysv.c</a>,
-<a href="../src/gp_unifn.c">src/gp_unifn.c</a>,
-<a href="../src/gp_unifs.c">src/gp_unifs.c</a>,
-<a href="../src/gp_unix.c">src/gp_unix.c</a>,
-<a href="../src/gp_unix_cache.c">src/gp_unix_cache.c</a>,
-<a href="../src/gp_vms.c">src/gp_vms.c</a>,
-<a href="../src/gp_wgetv.c">src/gp_wgetv.c</a>,
-<a href="../src/gp_win32.c">src/gp_win32.c</a>,
-<a href="../src/gp_wsync.c">src/gp_wsync.c</a>,
-<a href="../src/gs_dll_call.h">src/gs_dll_call.h</a>.
+<a href="../base/gp_dosfe.c">base/gp_dosfe.c</a>,
+<a href="../base/gp_dosfs.c">base/gp_dosfs.c</a>,
+<a href="../base/gp_dvx.c">base/gp_dvx.c</a>,
+<a href="../base/gp_iwatc.c">base/gp_iwatc.c</a>,
+<a href="../base/gp_msdos.c">base/gp_msdos.c</a>,
+<a href="../base/gp_mshdl.c">base/gp_mshdl.c</a>,
+<a href="../base/gp_mslib.c">base/gp_mslib.c</a>,
+<a href="../base/gp_mswin.c">base/gp_mswin.c</a>,
+<a href="../base/gp_mswin.h">base/gp_mswin.h</a>,
+<a href="../base/gp_ntfs.c">base/gp_ntfs.c</a>,
+<a href="../base/gp_os2.c">base/gp_os2.c</a>,
+<a href="../base/gp_os2.h">base/gp_os2.h</a>,
+<a href="../base/gp_os9.c">base/gp_os9.c</a>,
+<a href="../base/gp_stdia.c">base/gp_stdia.c</a>,
+<a href="../base/gp_stdin.c">base/gp_stdin.c</a>,
+<a href="../base/gp_sysv.c">base/gp_sysv.c</a>,
+<a href="../base/gp_unifn.c">base/gp_unifn.c</a>,
+<a href="../base/gp_unifs.c">base/gp_unifs.c</a>,
+<a href="../base/gp_unix.c">base/gp_unix.c</a>,
+<a href="../base/gp_unix.cache.c">base/gp_unix.cache.c</a>,
+<a href="../base/gp_vms.c">base/gp_vms.c</a>,
+<a href="../base/gp_wgetv.c">base/gp_wgetv.c</a>,
+<a href="../base/gp_win32.c">base/gp_win32.c</a>,
+<a href="../base/gp_wsync.c">base/gp_wsync.c</a>,
+<a href="../base/gs_dll_call.h">base/gs_dll_call.h</a>.
 
 </dl>
 
@@ -4398,46 +4370,44 @@ configurations:
 
 <li>POSIX systems (inluding Linux and Unix):
 <ul>
-<li><a href="../src/configure.ac">src/configure.ac</a>,
+<li><a href="../base/configure.ac">base/configure.ac</a>,
 GNU Autoconf source script for automatic build configuration.
-<li><a href="../src/Makefile.in">src/Makefile.in</a>,
+<li><a href="../base/Makefile.in">base/Makefile.in</a>,
 source for the top-level makefile used in the Autoconf build.
-<li><a href="../src/unix-gcc.mak">src/unix-gcc.mak</a>,
+<li><a href="../base/unix-gcc.mak">base/unix-gcc.mak</a>,
 for Unix with gcc.
-<li><a href="../src/unixansi.mak">src/unixansi.mak</a>,
+<li><a href="../base/unixansi.mak">base/unixansi.mak</a>,
 for Unix with an ANSI C compiler other than gcc.
 </ul>
 
 <li>PC:
 <ul>
-<li><a href="../src/bcwin32.mak">src/bcwin32.mak</a>,
+<li><a href="../base/bcwin32.mak">base/bcwin32.mak</a>,
 for MS Windows with Borland C++ Builder.
-<li><a href="../src/msvc32.mak">src/msvc32.mak</a>,
+<li><a href="../psi/msvc32.mak">psi/msvc32.mak</a>,
 for MS Windows with Microsoft Visual C (MSVC).
-<li><a href="../src/os2.mak">src/os2.mak</a>,
+<li><a href="../base/os2.mak">base/os2.mak</a>,
 for MS-DOS or OS/2 GCC/EMX environment.
-<li><a href="../src/watcw32.mak">src/watcw32.mak</a>,
+<li><a href="../base/watcw32.mak">base/watcw32.mak</a>,
 for MS Windows with Watcom C.
 </ul>
 
 <li>Macintosh:
 <ul>
-<li><a href="../src/macosx.mak">src/macosx.mak</a>,
+<li><a href="../base/macosx.mak">base/macosx.mak</a>,
 commandline makefile for MacOS X.
-<li><a href="../src/macos-mcp.mak">src/macos-mcp.mak</a>,
+<li><a href="../base/macos-mcp.mak">base/macos-mcp.mak</a>,
 dummy makefile to generate an xml project file for Metrowerks Codewarrior.
 </ul>
 
 
 <li>Other:
 <ul>
-<li><a href="../src/all-arch.mak">src/all-arch.mak</a>,
+<li><a href="../base/all-arch.mak">base/all-arch.mak</a>,
 for building on many Unix systems in a networked test environment.
-<li><a href="../src/dvx-gcc.mak">src/dvx-gcc.mak</a>,
-for DesqView/X with gcc.
-<li><a href="../src/openvms.mak">src/openvms.mak</a>,
+<li><a href="../base/openvms.mak">base/openvms.mak</a>,
 for OpenVMS with Digital's CC compiler and the MMS build program.
-<li><a href="../src/openvms.mmk">src/openvms.mmk</a>,
+<li><a href="../base/openvms.mmk">base/openvms.mmk</a>,
 for OpenVMS with Digital's CC compiler and the MMK build program.
 </ul>
 
@@ -4447,11 +4417,11 @@ for OpenVMS with Digital's CC compiler and the MMK build program.
 The following top-level makefiles build the library test program:
 
 <ul>
-<li><a href="../src/ugcclib.mak">src/ugcclib.mak</a>,
+<li><a href="../base/ugcclib.mak">base/ugcclib.mak</a>,
 on Unix with gcc.
-<li><a href="../src/msvclib.mak">src/msvclib.mak</a>,
+<li><a href="../base/msvclib.mak">base/msvclib.mak</a>,
 on MS Windows with MSVC.
-<li><a href="../src/watclib.mak">src/watclib.mak</a>,
+<li><a href="../base/watclib.mak">base/watclib.mak</a>,
 on extended MS-DOS with Watcom C.
 </ul>
 
@@ -4468,7 +4438,7 @@ section</a> of the documentation for building Ghostscript.
 <dt>
 Library test program:
 <dd>
-<a href="../src/gslib.c">src/gslib.c</a>.
+<a href="../base/gslib.c">base/gslib.c</a>.
 
 <dt>
 Platform-independent makefiles:
@@ -4479,32 +4449,30 @@ Platform-independent makefiles:
 <dt>
 Graphics library and support:
 <dd>
-<a href="../src/contrib.mak">src/contrib.mak</a>,
-<a href="../src/devs.mak">src/devs.mak</a>,
-<a href="../src/gs.mak">src/gs.mak</a>,
-<a href="../src/lib.mak">src/lib.mak</a>,
-<a href="../src/version.mak">src/version.mak</a>.
+<a href="../base/contrib.mak">base/contrib.mak</a>,
+<a href="../base/devs.mak">base/devs.mak</a>,
+<a href="../base/gs.mak">base/gs.mak</a>,
+<a href="../base/lib.mak">base/lib.mak</a>,
+<a href="../base/version.mak">base/version.mak</a>.
 
 <dt>
 PostScript interpreter and fonts:
 <dd>
-<a href="../src/cfonts.mak">src/cfonts.mak</a>,
-<a href="../src/int.mak">src/int.mak</a>,
-<a href="../src/wmin.mak">src/wmin.mak</a>.
+<a href="../psi/int.mak">psi/int.mak</a>.
 
 <dt>
 Third-party libraries:
 <dd>
-<a href="../src/expat.mak">src/expat.mak</a>,
-<a href="../src/icclib.mak">src/icclib.mak</a>,
-<a href="../src/ijs.mak">src/ijs.mak</a>,
-<a href="../src/jasper.mak">src/jasper.mak</a>,
-<a href="../src/jbig2.mak">src/jbig2.mak</a>,
-<a href="../src/ldf_jb2.mak">src/ldf_jb2.mak</a>,
-<a href="../src/lwf_jp2.mak">src/lwf_jp2.mak</a>,
-<a href="../src/jpeg.mak">src/jpeg.mak</a>,
-<a href="../src/libpng.mak">src/libpng.mak</a>,
-<a href="../src/zlib.mak">src/zlib.mak</a>.
+<a href="../base/expat.mak">base/expat.mak</a>,
+<a href="../base/icclib.mak">base/icclib.mak</a>,
+<a href="../base/ijs.mak">base/ijs.mak</a>,
+<a href="../base/jasper.mak">base/jasper.mak</a>,
+<a href="../base/jbig2.mak">base/jbig2.mak</a>,
+<a href="../base/ldf_jb2.mak">base/ldf_jb2.mak</a>,
+<a href="../base/lwf_jp2.mak">base/lwf_jp2.mak</a>,
+<a href="../base/jpeg.mak">base/jpeg.mak</a>,
+<a href="../base/libpng.mak">base/libpng.mak</a>,
+<a href="../base/zlib.mak">base/zlib.mak</a>.
 </dl>
 
 <dt>
@@ -4516,31 +4484,29 @@ Shared platform-dependent makefiles:
 <dt>
 Unix:
 <dd>
-<a href="../src/unix-aux.mak">src/unix-aux.mak</a>,
-<a href="../src/unix-dll.mak">src/unix-dll.mak</a>,
-<a href="../src/unix-end.mak">src/unix-end.mak</a>,
-<a href="../src/unixhead.mak">src/unixhead.mak</a>,
-<a href="../src/unixinst.mak">src/unixinst.mak</a>,
-<a href="../src/unixlink.mak">src/unixlink.mak</a>.
+<a href="../base/unix-aux.mak">base/unix-aux.mak</a>,
+<a href="../base/unix-dll.mak">base/unix-dll.mak</a>,
+<a href="../base/unix-end.mak">base/unix-end.mak</a>,
+<a href="../base/unixhead.mak">base/unixhead.mak</a>,
+<a href="../base/unixinst.mak">base/unixinst.mak</a>,
+<a href="../base/unixlink.mak">base/unixlink.mak</a>.
 
 <dt>
 Microsoft Windows and MS-DOS:
 <dd>
-<a href="../src/msvccmd.mak">src/msvccmd.mak</a>,
-<a href="../src/msvctail.mak">src/msvctail.mak</a>,
-<a href="../src/pcwin.mak">src/pcwin.mak</a>,
-<a href="../src/wccommon.mak">src/wccommon.mak</a>,
-<a href="../src/wctail.mak">src/wctail.mak</a>,
-<a href="../src/winint.mak">src/winint.mak</a>,
-<a href="../src/winlib.mak">src/winlib.mak</a>,
-<a href="../src/winplat.mak">src/winplat.mak</a>.
+<a href="../base/msvccmd.mak">base/msvccmd.mak</a>,
+<a href="../base/msvctail.mak">base/msvctail.mak</a>,
+<a href="../base/pcwin.mak">base/pcwin.mak</a>,
+<a href="../base/wccommon.mak">base/wccommon.mak</a>,
+<a href="../base/wctail.mak">base/wctail.mak</a>,
+<a href="../psi/winint.mak">psi/winint.mak</a>,
+<a href="../base/winlib.mak">base/winlib.mak</a>,
+<a href="../base/winplat.mak">base/winplat.mak</a>.
 
 <dt>
 Other:
 <dd>
-<a href="../src/dvx-head.mak">src/dvx-head.mak</a>,
-<a href="../src/dvx-tail.mak">src/dvx-tail.mak</a>.<br>
-<a href="../src/macos-fw.mak">src/macos-fw.mak</a>,
+<a href="../base/macos-fw.mak">base/macos-fw.mak</a>,
 for building as a MacOS X Framework.
 
 </dl>
@@ -4572,9 +4538,9 @@ earlier sections.
 <dt>
 Files:
 <dd>
-<a href="../src/std.h">src/std.h</a>,
-<a href="../src/stdpn.h">src/stdpn.h</a>,
-<a href="../src/stdpre.h">src/stdpre.h</a>.
+<a href="../base/std.h">base/std.h</a>,
+<a href="../base/stdpn.h">base/stdpn.h</a>,
+<a href="../base/stdpre.h">base/stdpre.h</a>.
 </dl>
 
 <h4><a name="Implicit_dependencies"></a>Implicit dependencies</h4>
@@ -4641,83 +4607,83 @@ some special top-level code.
 <dt>
 MS Windows files:
 <dd>
-<a href="../src/dpmain.c">src/dpmain.c</a>,
-<a href="../src/dwdll.c">src/dwdll.c</a>,
-<a href="../src/dwdll.h">src/dwdll.h</a>,
-<a href="../src/dwimg.c">src/dwimg.c</a>,
-<a href="../src/dwimg.h">src/dwimg.h</a>,
-<a href="../src/dwinst.cpp">src/dwinst.cpp</a>,
-<a href="../src/dwinst.h">src/dwinst.h</a>,
-<a href="../src/dwmain.c">src/dwmain.c</a>,
-<a href="../src/dwmainc.c">src/dwmainc.c</a>,
-<a href="../src/dwnodll.c">src/dwnodll.c</a>,
-<a href="../src/dwreg.c">src/dwreg.c</a>,
-<a href="../src/dwreg.h">src/dwreg.h</a>,
-<a href="../src/dwres.h">src/dwres.h</a>,
-<a href="../src/dwsetup.cpp">src/dwsetup.cpp</a>,
-<a href="../src/dwsetup.h">src/dwsetup.h</a>,
-<a href="../src/dwtext.c">src/dwtext.c</a>,
-<a href="../src/dwtext.h">src/dwtext.h</a>,
-<a href="../src/dwtrace.c">src/dwtrace.c</a>,
-<a href="../src/dwtrace.h">src/dwtrace.h</a>,
-<a href="../src/dwuninst.cpp">src/dwuninst.cpp</a>,
-<a href="../src/dwuninst.h">src/dwuninst.h</a>,
-<a href="../src/gp_msdll.c">src/gp_msdll.c</a>,
-<a href="../src/gp_mspol.c">src/gp_mspol.c</a>,
-<a href="../src/gp_msprn.c">src/gp_msprn.c</a>,
-<a href="../src/gsdllwin.h">src/gsdllwin.h</a>.
+<a href="../base/dpmain.c">base/dpmain.c</a>,
+<a href="../psi/dwdll.c">psi/dwdll.c</a>,
+<a href="../psi/dwdll.h">psi/dwdll.h</a>,
+<a href="../psi/dwimg.c">psi/dwimg.c</a>,
+<a href="../psi/dwimg.h">psi/dwimg.h</a>,
+<a href="../psi/dwinst.cpp">psi/dwinst.cpp</a>,
+<a href="../psi/dwinst.h">psi/dwinst.h</a>,
+<a href="../psi/dwmain.c">psi/dwmain.c</a>,
+<a href="../psi/dwmainc.c">psi/dwmainc.c</a>,
+<a href="../psi/dwnodll.c">psi/dwnodll.c</a>,
+<a href="../psi/dwreg.c">psi/dwreg.c</a>,
+<a href="../psi/dwreg.h">psi/dwreg.h</a>,
+<a href="../psi/dwres.h">psi/dwres.h</a>,
+<a href="../psi/dwsetup.cpp">psi/dwsetup.cpp</a>,
+<a href="../psi/dwsetup.h">psi/dwsetup.h</a>,
+<a href="../psi/dwtext.c">psi/dwtext.c</a>,
+<a href="../psi/dwtext.h">psi/dwtext.h</a>,
+<a href="../psi/dwtrace.c">psi/dwtrace.c</a>,
+<a href="../psi/dwtrace.h">psi/dwtrace.h</a>,
+<a href="../psi/dwuninst.cpp">psi/dwuninst.cpp</a>,
+<a href="../psi/dwuninst.h">psi/dwuninst.h</a>,
+<a href="../base/gp_msdll.c">base/gp_msdll.c</a>,
+<a href="../base/gp_mspol.c">base/gp_mspol.c</a>,
+<a href="../base/gp_msprn.c">base/gp_msprn.c</a>,
+<a href="../base/gsdllwin.h">base/gsdllwin.h</a>.
 
 <dt>
 OS/2 files:
 <dd>
-<a href="../src/gp_os2pr.c">src/gp_os2pr.c</a>,
-<a href="../src/gsdllos2.h">src/gsdllos2.h</a>.
+<a href="../base/gp_os2pr.c">base/gp_os2pr.c</a>,
+<a href="../psi/gsdllos2.h">psi/gsdllos2.h</a>.
 
 <dt>
 Unix files:
 <dd>
-<a href="../src/dxmain.c">src/dxmain.c</a>,
-<a href="../src/dxmainc.c">src/dxmainc.c</a>.
+<a href="../base/dxmain.c">base/dxmain.c</a>,
+<a href="../base/dxmainc.c">base/dxmainc.c</a>.
 
 <dt>
 Macintosh files:
 <dd>
-<a href="../src/gdevmac.c">src/gdevmac.c</a>,
-<a href="../src/gdevmac.h">src/gdevmac.h</a>,
-<a href="../src/gdevmacpictop.h">src/gdevmacpictop.h</a>,
-<a href="../src/gdevmacttf.h">src/gdevmacttf.h</a>,
-<a href="../src/gdevmacxf.c">src/gdevmacxf.c</a>,
-<a href="../src/gp_mac.c">src/gp_mac.c</a>,
-<a href="../src/gp_mac.h">src/gp_mac.h</a>,
-<a href="../src/gp_macio.c">src/gp_macio.c</a>,
-<a href="../src/gp_macpoll.c">src/gp_macpoll.c</a>,
-<a href="../src/gsiomacres.c">src/gsiomacres.c</a>,
-<a href="../src/macgenmcpxml.sh">src/macgenmcpxml.sh</a>,
-<a href="../src/macsystypes.h">src/macsystypes.h</a>,
-<a href="../src/macos_carbon_pre.h">src/macos_carbon_pre.h</a>,
-<a href="../src/macos_carbon_d_pre.h">src/macos_carbon_d_pre.h</a>,
-<a href="../src/macos_classic_d_pre.h">src/macos_classic_d_pre.h</a>,
-
-<a href="../src/dmmain.c">src/dmmain.c</a>,
-<a href="../src/dmmain.r">src/dmmain.r</a>.
+<a href="../base/gdevmac.c">base/gdevmac.c</a>,
+<a href="../base/gdevmac.h">base/gdevmac.h</a>,
+<a href="../base/gdevmacpictop.h">base/gdevmacpictop.h</a>,
+<a href="../base/gdevmacttf.h">base/gdevmacttf.h</a>,
+<a href="../base/gdevmacxf.c">base/gdevmacxf.c</a>,
+<a href="../base/gp_mac.c">base/gp_mac.c</a>,
+<a href="../base/gp_mac.h">base/gp_mac.h</a>,
+<a href="../base/gp_macio.c">base/gp_macio.c</a>,
+<a href="../base/gp_macpoll.c">base/gp_macpoll.c</a>,
+<a href="../base/gsiomacres.c">base/gsiomacres.c</a>,
+<a href="../base/macgenmcpxml.sh">base/macgenmcpxml.sh</a>,
+<a href="../base/macsystypes.h">base/macsystypes.h</a>,
+<a href="../base/macos_carbon_pre.h">base/macos_carbon_pre.h</a>,
+<a href="../base/macos_carbon_d_pre.h">base/macos_carbon_d_pre.h</a>,
+<a href="../base/macos_classic_d_pre.h">base/macos_classic_d_pre.h</a>,
+
+<a href="../base/dmmain.c">base/dmmain.c</a>,
+<a href="../base/dmmain.r">base/dmmain.r</a>.
 
 <dt>
 VMS files:
 <dd>
-<a href="../src/vms_x_fix.h">src/vms_x_fix.h</a>.
+<a href="../base/vms_x_fix.h">base/vms_x_fix.h</a>.
 
 <dt>
 DLL files:
 <dd>
-<a href="../src/gsdll.c">src/gsdll.c</a>,
-<a href="../src/gsdll.h">src/gsdll.h</a>,
-<a href="../src/gdevdsp.c">src/gdevdsp.c</a>,
-<a href="../src/gdevdsp.h">src/gdevdsp.h</a>,
-<a href="../src/gdevdsp2.h">src/gdevdsp2.h</a>,
-<a href="../src/iapi.c">src/iapi.c</a>,
-<a href="../src/iapi.h">src/iapi.h</a>,
-<a href="../src/idisp.c">src/idisp.c</a>,
-<a href="../src/idisp.h">src/idisp.h</a>.
+<a href="../psi/gsdll.c">psi/gsdll.c</a>,
+<a href="../base/gsdll.h">base/gsdll.h</a>,
+<a href="../base/gdevdsp.c">base/gdevdsp.c</a>,
+<a href="../base/gdevdsp.h">base/gdevdsp.h</a>,
+<a href="../base/gdevdsp2.h">base/gdevdsp2.h</a>,
+<a href="../psi/iapi.c">psi/iapi.c</a>,
+<a href="../psi/iapi.h">psi/iapi.h</a>,
+<a href="../psi/idisp.c">psi/idisp.c</a>,
+<a href="../psi/idisp.h">psi/idisp.h</a>.
 <p>
 The new DLL interface (new as of 7.0) is especially useful with the
 new display device, so it is included here. Both are due to Russell
@@ -4756,19 +4722,19 @@ and do not require a PostScript interpreter.
 <p>
 The code also contains many run-time procedures whose only purpose is to be
 called from the debugger to print out various data structures, including all
-the procedures in <a href="../src/idebug.c">src/idebug.c</a> (for the
+the procedures in <a href="../psi/idebug.c">psi/idebug.c</a> (for the
 PostScript interpreter) and the <code>debug_dump_</code> procedures in <a
-href="../src/gsmisc.c">src/gsmisc.c</a>.
+href="../base/gsmisc.c">base/gsmisc.c</a>.
 
 <dl>
 <dt>
 Files:
 <dd>
 <a href="Use.htm#Debugging">doc/Use.htm#Debugging</a>,
-<a href="../src/gdebug.h">src/gdebug.h</a>,
-<a href="../src/gsmdebug.h">src/gsmdebug.h</a>,
-<a href="../src/idebug.h">src/idebug.h</a>,
-<a href="../src/idebug.c">src/idebug.c</a>.
+<a href="../base/gdebug.h">base/gdebug.h</a>,
+<a href="../base/gsmdebug.h">base/gsmdebug.h</a>,
+<a href="../psi/idebug.h">psi/idebug.h</a>,
+<a href="../psi/idebug.c">psi/idebug.c</a>.
 </dl>
 
 <hr>
@@ -4783,7 +4749,7 @@ Enterprise Edition only. Standard Edition and Professional Edition do not includ
 <p>
 Microsoft profiler tool requires the application to be linked with
 a special linker option. To provide it you need the following change to 
-<code>gs/src/msvccmd.mak</code> :
+<code>gs/base/msvccmd.mak</code> :
 
 <blockquote><pre><tt> 
  
diff --git a/gs/doc/Drivers.htm b/gs/doc/Drivers.htm
index 90d613ee5..9c5de86c9 100644
--- a/gs/doc/Drivers.htm
+++ b/gs/doc/Drivers.htm
@@ -175,15 +175,15 @@ Note that the space before the :, and the explicit compilation rules for the
 If you want to add a simple device (specifically, a monochrome printer), you
 probably don't need to read the rest of this document; just use the code in
 an existing driver as a guide.  The Epson and Canon BubbleJet drivers <a
-href="../src/gdevepsn.c">gdevepsn.c</a> and <a
-href="../src/gdevbj10.c">gdevbj10.c</a> are good models for dot-matrix
+href="../base/gdevepsn.c">gdevepsn.c</a> and <a
+href="../base/gdevbj10.c">gdevbj10.c</a> are good models for dot-matrix
 printers, which require presenting the data for many scan lines at once; the
-DeskJet/LaserJet drivers in <a href="../src/gdevdjet.c">gdevdjet.c</a> are
+DeskJet/LaserJet drivers in <a href="../base/gdevdjet.c">gdevdjet.c</a> are
 good models for laser printers, which take a single scan line at a time but
 support data compression.  For color printers, there are unfortunately no
 good models: the two major color inkjet printer drivers, <a
-href="../src/gdevcdj.c">gdevcdj.c</a> and <a
-href="../src/gdevstc.c">gdevstc.c</a>, are far too complex to read.
+href="../base/gdevcdj.c">gdevcdj.c</a> and <a
+href="../base/gdevstc.c">gdevstc.c</a>, are far too complex to read.
 
 <p>
 On the other hand, if you're writing a driver for some more esoteric
@@ -196,8 +196,8 @@ Duplication of code, and sheer volume of code, is a serious maintenance and
 distribution problem for Ghostscript.  If your device is similar to an
 existing one, try to implement your driver by adding some parameterization
 to an existing driver rather than by copying code to create an entirely new
-source module.  <a href="../src/gdevepsn.c">gdevepsn.c</a> and <a
-href="../src/gdevdjet.c">gdevdjet.c</a> are good examples of this approach.
+source module.  <a href="../base/gdevepsn.c">gdevepsn.c</a> and <a
+href="../base/gdevdjet.c">gdevdjet.c</a> are good examples of this approach.
 
 <hr>
 
@@ -228,8 +228,8 @@ The <code>gx_device_common</code> macro defines the common structure
 elements, with the intent that devices define and export a structure along
 the following lines.  Do not fill in the individual generic parameter values
 in the usual way for C structures: use the macros defined for this purpose
-in <a href="../src/gxdevice.h">gxdevice.h</a> or, if applicable, <a
-href="../src/gdevprn.h">gdevprn.h</a>.
+in <a href="../base/gxdevice.h">gxdevice.h</a> or, if applicable, <a
+href="../base/gdevprn.h">gdevprn.h</a>.
 
 <blockquote>
 <pre>typedef struct smurf_device_s {
@@ -271,7 +271,7 @@ would be constructed by the compiler.)
 
 <p>
 You should consult the definition of struct <code>gx_device_s</code> in
-<a href="../src/gxdevice.h">gxdevice.h</a> for the complete details of the
+<a href="../base/gxdevice.h">gxdevice.h</a> for the complete details of the
 generic device structure.  Some of the most important members of this
 structure for ordinary drivers are:
 
@@ -295,7 +295,7 @@ structure for ordinary drivers are:
 
 <p>
 The name in the structure (<code>dname</code>) should be the same as the
-name in <a href="../src/contrib.mak">contrib.mak</a>.
+name in <a href="../base/contrib.mak">contrib.mak</a>.
 
 <h3><a name="Sophisticated"></a>For sophisticated developers only</h3>
 
@@ -307,56 +307,56 @@ structure, or to add procedures, you must change the following places:
 <li>This document and the <a href="News.htm">news document</a> (if you want
 	to keep the documentation up to date).
 <li>The definition of <code>gx_device_common</code> and the procedures
-	in <a href="../src/gxdevcli.h">gxdevcli.h</a>.
+	in <a href="../base/gxdevcli.h">gxdevcli.h</a>.
 <li>Possibly, the default forwarding procedures declared in
-	<a href="../src/gxdevice.h">gxdevice.h</a> and implemented in
-	<a href="../src/gdevnfwd.c">gdevnfwd.c</a>.
+	<a href="../base/gxdevice.h">gxdevice.h</a> and implemented in
+	<a href="../base/gdevnfwd.c">gdevnfwd.c</a>.
 <li>The device procedure record completion routines in
-	<a href="../src/gdevdflt.c">gdevdflt.c</a>.
+	<a href="../base/gdevdflt.c">gdevdflt.c</a>.
 <li>Possibly, the default device implementation in
-	<a href="../src/gdevdflt.c">gdevdflt.c</a>,
-	<a href="../src/gdevddrw.c">gdevddrw.c</a>, and
-	<a href="../src/gxcmap.c">gxcmap.c</a>.
-<li>The bounding box device in <a href="../src/gdevbbox.c">gdevbbox.c</a>
+	<a href="../base/gdevdflt.c">gdevdflt.c</a>,
+	<a href="../base/gdevddrw.c">gdevddrw.c</a>, and
+	<a href="../base/gxcmap.c">gxcmap.c</a>.
+<li>The bounding box device in <a href="../base/gdevbbox.c">gdevbbox.c</a>
 	(probably just adding <code>NULL</code> procedure entries if the
 	new procedures don't produce output).
 <li>These devices that must have complete (non-defaulted) procedure vectors:
 <ul>
-<li>The null device in <a href="../src/gdevnfwd.c">gdevnfwd.c</a>.
-<li>The command list "device" in <a href="../src/gxclist.c">gxclist.c</a>.
+<li>The null device in <a href="../base/gdevnfwd.c">gdevnfwd.c</a>.
+<li>The command list "device" in <a href="../base/gxclist.c">gxclist.c</a>.
 	This is not an actual device; it only defines procedures.
-<li>The "memory" devices in <a href="../src/gdevmem.h">gdevmem.h</a> and
+<li>The "memory" devices in <a href="../base/gdevmem.h">gdevmem.h</a> and
 	<code>gdevm*.c</code>.
 </ul>
 <li>The clip list accumulation "device" in
-	<a href="../src/gxacpath.c">gxacpath.c</a>.
-<li>The clipping "devices" <a href="../src/gxclip.c">gxclip.c</a>,
-	<a href="../src/gxclip2.c">gxclip2.c</a>,
-	and <a href="../src/gxclipm.c">gxclipm.c</a>.
+	<a href="../base/gxacpath.c">gxacpath.c</a>.
+<li>The clipping "devices" <a href="../base/gxclip.c">gxclip.c</a>,
+	<a href="../base/gxclip2.c">gxclip2.c</a>,
+	and <a href="../base/gxclipm.c">gxclipm.c</a>.
 <li>The pattern accumulation "device" in
-	<a href="../src/gxpcmap.c">gxpcmap.c</a>.
-<li>The hit detection "device" in <a href="../src/gdevhit.c">gdevhit.c</a>.
+	<a href="../base/gxpcmap.c">gxpcmap.c</a>.
+<li>The hit detection "device" in <a href="../base/gdevhit.c">gdevhit.c</a>.
 <li>The generic printer device macros in
-	<a href="../src/gdevprn.h">gdevprn.h</a>.
+	<a href="../base/gdevprn.h">gdevprn.h</a>.
 <li>The generic printer device code in
-	<a href="../src/gdevprn.c">gdevprn.c</a>.
+	<a href="../base/gdevprn.c">gdevprn.c</a>.
 <li>The RasterOp source device in
-	<a href="../src/gdevrops.c">gdevrops.c</a>.
+	<a href="../base/gdevrops.c">gdevrops.c</a>.
 </ul></blockquote>
 
 <p>
 You may also have to change the code for
 <code>gx_default_get_params</code> or
 <code>gx_default_put_params</code> in <a
-href="../src/gsdparam.c">gsdparam.c</a>.
+href="../base/gsdparam.c">gsdparam.c</a>.
 
 <p>
 You should not have to change any of the real devices in the standard
-Ghostscript distribution (listed in <a href="../src/devs.mak">devs.mak</a>
-and <a href="../src/contrib.mak">contrib.mak</a>) or any of your own
+Ghostscript distribution (listed in <a href="../base/devs.mak">devs.mak</a>
+and <a href="../base/contrib.mak">contrib.mak</a>) or any of your own
 devices, because all of them are supposed to use the macros in <a
-href="../src/gxdevice.h">gxdevice.h</a> or <a
-href="../src/gdevprn.h">gdevprn.h</a> to define and initialize their state.
+href="../base/gxdevice.h">gxdevice.h</a> or <a
+href="../base/gdevprn.h">gdevprn.h</a> to define and initialize their state.
 
 <hr>
 
@@ -380,7 +380,7 @@ system with (0,0) in the lower left corner.
 Drivers must check (and, if necessary, clip) the coordinate parameters given
 to them: they should not assume the coordinates will be in bounds.  The
 <code>fit_fill</code> and <b><tt>fit_copy</tt></b> macros in <a
-href="../src/gxdevice.h">gxdevice.h</a> are very helpful in doing this.
+href="../base/gxdevice.h">gxdevice.h</a> are very helpful in doing this.
 
 <h3><a name="Color_definition"></a>Color definition</h3>
 
@@ -551,7 +551,7 @@ changes to be made to the structure without changes being required in the
 actual device code.
 
 <p>
-The following macros (in <a href="../src/gxdevcli.h">gxdevcli.h</a>) provide
+The following macros (in <a href="../base/gxdevcli.h">gxdevcli.h</a>) provide
 convenient shorthands for initializing this structure for ordinary
 black-and-white or color devices:
 
@@ -570,7 +570,7 @@ to define a 24 bit RGB device or a 4 or 32 bit CMYK device.
 
 <p>
 The <code>#define dci_extended_alpha_values</code> macro (in
-<a href="../src/gxdevcli.h">gxdevcli.h</a>) 
+<a href="../base/gxdevcli.h">gxdevcli.h</a>) 
 specifies most of the current fields in the structure. However this macro allows 
 only the default setting for the comp_shift, comp_bits, and comp_mask fields 
 to be set. Any device which requires a non-default setting for these fields 
@@ -663,7 +663,7 @@ has responsibility for insuring that the correct procedures are contained
 in the device structure. (For an example, see the display device open procedure
 <code>display_open</code> and its subroutine 
 <code>display_set_color_format</code> 
-(in <a href="../src/gdevdisp.c">gdevdisp</a>).
+(in <a href="../base/gdevdisp.c">gdevdisp</a>).
 
 
 <h3><a name="Types"></a>Types</h3>
@@ -673,7 +673,7 @@ Here is a brief explanation of the various types that appear as parameters
 or results of the drivers.
 
 <dl>
-<dt><code>frac</code> (defined in <a href="../src/gxfrac.h">gxfrac.h</a>)
+<dt><code>frac</code> (defined in <a href="../base/gxfrac.h">gxfrac.h</a>)
 <dd>This is the type used to represent color values for the input to the
 color model mapping procedures. It is currently defined as a short.  It has a
 range of <code>frac_0</code> to <b><tt>frac_1</tt></b>.
@@ -681,7 +681,7 @@ range of <code>frac_0</code> to <b><tt>frac_1</tt></b>.
 
 <dl>
 <dt><code>gx_color_value</code> (defined in
-<a href="../src/gxdevice.h">gxdevice.h</a>)
+<a href="../base/gxdevice.h">gxdevice.h</a>)
 <dd>This is the type used to represent RGB or CMYK color values.  It is
 currently equivalent to unsigned short.  However, Ghostscript may use less
 than the full range of the type to represent color values:
@@ -692,20 +692,20 @@ and <code>gx_max_color_value</code> is the maximum value, equal to
 
 <dl>
 <dt><code>gx_device</code> (defined in 
-<a href="../src/gxdevice.h">gxdevice.h</a>)
+<a href="../base/gxdevice.h">gxdevice.h</a>)
 <dd>This is the device structure, as explained above.
 </dl>
 
 <dl>
 <dt><code>gs_matrix</code> (defined in 
-<a href="../src/gsmatrix.h">gsmatrix.h</a>)
+<a href="../base/gsmatrix.h">gsmatrix.h</a>)
 <dd>This is a 2-D homogeneous coordinate transformation matrix, used by
 many Ghostscript operators.
 </dl>
 
 <dl>
 <dt><code>gx_color_index</code> (defined in 
-<a href="../src/gxcindex.h">gxcindex.h</a>)
+<a href="../base/gxcindex.h">gxcindex.h</a>)
 <dd>This is meant to be whatever the driver uses to represent a device
 color.  For example, it might be an index in a color map, or it might be R,
 G, and B values packed into a single integer.  The Ghostscript graphics library
@@ -754,23 +754,23 @@ compiler being used, and if a 64 bit type is found then
 For Microsoft and the MSVC compiler, <code>GX_COLOR_INDEX_TYPE</code> will 
 be set to <code>unsigned _int64</code> if <b><tt>USE_LARGE_COLOR_INDEX</tt></b> 
 is set to 1 either on the make command line or by editing the definition 
- in <a href="../src/msvc32.mak">msvc32.mak</a> 
+ in <a href="../psi/msvc32.mak">msvc32.mak</a> 
 </dl>
 
 <dl>
 <dt><code>gs_param_list</code> (defined in <a
-href="../src/gsparam.h">gsparam.h</a>) 
+href="../base/gsparam.h">gsparam.h</a>) 
   <dd>This is a parameter list, which is used to read and set attributes in a
-device.  See the comments in <a href="../src/gsparam.h">gsparam.h</a>, and
+device.  See the comments in <a href="../base/gsparam.h">gsparam.h</a>, and
 the <a href="#Parameters">description of the <code>get_params</code> and
 <code>put_params</code> procedures</a> below, for more detail.
 </dl>
 
 <dl>
 <dt><code>gx_tile_bitmap</code> (defined in
-<a href="../src/gxbitmap.h">gxbitmap.h</a>)
+<a href="../base/gxbitmap.h">gxbitmap.h</a>)
 <br><code>gx_strip_bitmap</code> (defined in
-<a href="../src/gxbitmap.h">gxbitmap.h</a>)
+<a href="../base/gxbitmap.h">gxbitmap.h</a>)
 <dd>These structure types represent bitmaps to be used as a tile for
 filling a region (rectangle).  <code>gx_tile_bitmap</code> is an 
 older, deprecated type lacking <code>shift</code> and 
@@ -829,7 +829,7 @@ typedef struct gx_strip_bitmap_s {
 All the driver procedures defined below that return <code>int</code>
 results return 0 on success, or an appropriate negative error code in the
 case of error conditions.  The error codes are defined in <a
-href="../src/gserrors.h">gserrors.h</a>; they correspond directly to the
+href="../base/gserrors.h">gserrors.h</a>; they correspond directly to the
 errors defined in the PostScript language reference manuals.  The most
 common ones for drivers are:
 
@@ -855,9 +855,9 @@ should release all memory it allocated before it returns.)
 <p>
 If a driver does return an error, rather than a simple return statement it
 should use the <code>return_error</code> macro defined in <a
-href="../src/gx.h">gx.h</a>, which is automatically included by <a
-href="../src/gdevprn.h">gdevprn.h</a> but not by <a
-href="../src/gserrors.h">gserrors.h</a>.  For example
+href="../base/gx.h">gx.h</a>, which is automatically included by <a
+href="../base/gdevprn.h">gdevprn.h</a> but not by <a
+href="../base/gserrors.h">gserrors.h</a>.  For example
 
 <blockquote>
 <code> return_error(gs_error_VMerror);
@@ -872,9 +872,9 @@ reading the code for existing drivers: driver procedures must not use
 <code>malloc</code> to allocate any storage that stays around after the
 procedure returns. Instead, they must use <code>gs_malloc</code> and
 <code>gs_free</code>, which have slightly different calling conventions.
-(The prototypes for these are in <a href="../src/gsmemory.h">gsmemory.h</a>, 
-which is included in <a href="../src/gx.h">gx.h</a>, which is included in <a
-href="../src/gdevprn.h">gdevprn.h</a>.) This is necessary so that
+(The prototypes for these are in <a href="../base/gsmemory.h">gsmemory.h</a>, 
+which is included in <a href="../base/gx.h">gx.h</a>, which is included in <a
+href="../base/gdevprn.h">gdevprn.h</a>.) This is necessary so that
 Ghostscript can clean up all allocated memory before exiting, which is
 essential in environments that provide only single-address-space
 multi-tasking (some versions of Microsoft Windows). 
@@ -917,12 +917,12 @@ trace pointers in the structure. For drivers registered in the normal way
 (using the makefile approach described above), no special care is needed as
 long as instances are created only by calling the
 <code>gs_copydevice</code> procedure defined in <a
-href="../src/gsdevice.h">gsdevice.h</a>. If you have a need to define
+href="../base/gsdevice.h">gsdevice.h</a>. If you have a need to define
 devices that are not registered in this way, you must fill in the stype
 member in any dynamically allocated instances with a pointer to the same
 structure descriptor used to allocate the instance. For more information
-about structure descriptors, see <a href="../src/gsmemory.h">gsmemory.h</a>
-and <a href="../src/gsstruct.h">gsstruct.h</a>. 
+about structure descriptors, see <a href="../base/gsmemory.h">gsmemory.h</a>
+and <a href="../base/gsstruct.h">gsstruct.h</a>. 
 
 <hr>
 
@@ -933,11 +933,11 @@ Printer drivers (which include drivers that write some kind of raster file)
 are especially simple to implement.  
 The printer driver must implement a <code>print_page</code> or
 <code>print_page_copies</code> procedure.  There are macros in <a
-href="../src/gdevprn.h">gdevprn.h</a> that generate the device structure for
+href="../base/gdevprn.h">gdevprn.h</a> that generate the device structure for
 such devices, of which the simplest is <code>prn_device</code>; for an
-example, see <a href="../src/gdevbj10.c">gdevbj10.c</a>.  If you are writing
+example, see <a href="../base/gdevbj10.c">gdevbj10.c</a>.  If you are writing
 a printer driver, we suggest you start by reading <a
-href="../src/gdevprn.h">gdevprn.h</a> and the <a
+href="../base/gdevprn.h">gdevprn.h</a> and the <a
 href="#Color_mapping">subsection on "Color mapping"</a> below; you may be
 able to ignore all the rest of the driver procedures.
 
@@ -998,7 +998,7 @@ required to hold a scan line by calling:
 
 <p>
 For a very simple concrete example, we suggest reading the code in
-<code>bit_print_page</code> in <a href="../src/gdevbit.c">gdevbit.c</a>.
+<code>bit_print_page</code> in <a href="../base/gdevbit.c">gdevbit.c</a>.
 
 <p>
 If the device provides <code>print_page</code>, Ghostscript will call
@@ -1331,7 +1331,7 @@ const gs_state *)</code>
 <dd>This routine provides a method for the device to gather an equivalent
 color for spot colorants. This routine is called when a Separation or DeviceN
 color space is installed.  See comments at the start of
-<a href="../src/gsequivc.c">gsequivc.c</a>. Note: This procedure is only needed
+<a href="../base/gsequivc.c">gsequivc.c</a>. Note: This procedure is only needed
 for devices that support spot colorants and also need to have an equivalent
 color for simulating the appearance of the spot colorants.
 </dl>
@@ -1941,7 +1941,7 @@ gs_logical_operation_t&nbsp;lop)</code> <b><em>[OPTIONAL]</em></b>
 axis, and are defined by <code>ybot</code> and <b><tt>ytop</tt></b>,
 respectively.  The left and right edges are defined by <code>left</code>
 and <code>right</code>.  Both of these represent lines (<b><tt>gs_fixed_edge</tt></b>
-is defined in <a href="../src/gxdevcli.h">gxdevcli.h</a> and consists
+is defined in <a href="../base/gxdevcli.h">gxdevcli.h</a> and consists
 of <code>gs_fixed_point</code> <b><tt>start</tt></b> and <b><tt>end</tt></b> points).
 The y coordinates of these lines need not have any specific relation to
 <code>ybot</code> and <b><tt>ytop</tt></b>. The routine is defined this way so
@@ -2170,36 +2170,36 @@ consult the source code, specifically:
 <tr valign=top>	<th align=left>Header
 	<td>&nbsp;&nbsp;&nbsp;
 	<th align=left>Defines
-<tr valign=top>	<td><a href="../src/gxpaint.h">gxpaint.h</a>
+<tr valign=top>	<td><a href="../base/gxpaint.h">gxpaint.h</a>
 	<td>&nbsp;
 	<td><code>gx_fill_params</code>, <b><tt>gx_stroke_params</tt></b>
-<tr valign=top>	<td><a href="../src/gxfixed.h">gxfixed.h</a>
+<tr valign=top>	<td><a href="../base/gxfixed.h">gxfixed.h</a>
 	<td>&nbsp;
 	<td><code>fixed</code>, <b><tt>gs_fixed_point</tt></b> (used by
 	    <code>gx_*_params</code>)
-<tr valign=top>	<td><a href="../src/gxistate.h">gxistate.h</a>
+<tr valign=top>	<td><a href="../base/gxistate.h">gxistate.h</a>
 	<td>&nbsp;
 	<td><code>gs_imager_state</code> (used by <b><tt>gx_*_params</tt></b>)
-<tr valign=top>	<td><a href="../src/gxline.h">gxline.h</a>
+<tr valign=top>	<td><a href="../base/gxline.h">gxline.h</a>
 	<td>&nbsp;
 	<td><code>gx_line_params</code> (used by <b><tt>gs_imager_state</tt></b>)
-<tr valign=top>	<td><a href="../src/gslparam.h">gslparam.h</a>
+<tr valign=top>	<td><a href="../base/gslparam.h">gslparam.h</a>
 	<td>&nbsp;
 	<td>line cap/join values (used by <code>gx_line_params</code>)
-<tr valign=top>	<td><a href="../src/gxmatrix.h">gxmatrix.h</a>
+<tr valign=top>	<td><a href="../base/gxmatrix.h">gxmatrix.h</a>
 	<td>&nbsp;
 	<td><code>gs_matrix_fixed</code> (used by <b><tt>gs_imager_state</tt></b>)
-<tr valign=top>	<td><a href="../src/gspath.h">gspath.h</a>, <a href="../src/gxpath.h">gxpath.h</a>, <a href="../src/gzpath.h">gzpath.h</a>
+<tr valign=top>	<td><a href="../base/gspath.h">gspath.h</a>, <a href="../base/gxpath.h">gxpath.h</a>, <a href="../base/gzpath.h">gzpath.h</a>
 	<td>&nbsp;
 	<td><code>gx_path</code>
-<tr valign=top>	<td><a href="../src/gxcpath.h">gxcpath.h</a>, <a href="../src/gzcpath.h">gzcpath.h</a>
+<tr valign=top>	<td><a href="../base/gxcpath.h">gxcpath.h</a>, <a href="../base/gzcpath.h">gzcpath.h</a>
 	<td>&nbsp;
 	<td><code>gx_clip_path</code>
 </table></blockquote>
 
 <p>
 For a minimal example of how to implement the high-level drawing operations,
-see <a href="../src/gdevtrac.c">gdevtrac.c</a>.
+see <a href="../base/gdevtrac.c">gdevtrac.c</a>.
 
 <h4><a name="Paths"></a>Paths</h4>
 
@@ -2330,7 +2330,7 @@ typedef gs_image1_t gs_image_t;</pre>
 <p>
 Of course, standard PostScript images don't have an alpha component.  For
 more details, consult the source code in <a
-href="../src/gsiparam.h">gsiparam.h</a> and <code>gsiparm*.h</code>,
+href="../base/gsiparam.h">gsiparam.h</a> and <code>gsiparm*.h</code>,
 which define parameters for an image.
 
 <p>
@@ -2394,8 +2394,8 @@ image data, together with all variables needed to maintain the state of the
 process.  Since this is somewhat tricky to get right, if you plan to create
 one of your own you should probably read an existing implementation of
 <code>begin[_typed]_image</code>, such as the one in <a
-href="../src/gdevbbox.c">gdevbbox.c</a> or <a
-href="../src/gdevps.c">gdevps.c</a>.
+href="../base/gdevbbox.c">gdevbbox.c</a> or <a
+href="../base/gdevps.c">gdevps.c</a>.
 
 <p>
 The data passed at each call of <code>image_plane_data</code> consists of
@@ -2637,7 +2637,7 @@ follows:
 <tr valign=top>	<td><code>text</code>
 	<td>&nbsp;
 	<td>A pointer to the structure that defines the text operation
-	    and parameters.  See <a href="../src/gstext.h">gstext.h</a> for details.
+	    and parameters.  See <a href="../base/gstext.h">gstext.h</a> for details.
 <tr valign=top>	<td><code>font</code>
 	<td>&nbsp;
 	<td>Defines the font for drawing.
@@ -2680,7 +2680,7 @@ directly.  Instead, they should call <code>gx_device_text_begin</code>,
 which takes the same parameters and also initializes certain common elements
 of the text enumeration structure, or <code>gs_text_begin</code>, which
 takes many of the parameters from a graphics state structure.  For details,
-see <a href="../src/gstext.h">gstext.h</a>.
+see <a href="../base/gstext.h">gstext.h</a>.
 
 <p>
 The actual processing of text uses the procedures in the enumeration
@@ -2699,7 +2699,7 @@ procedures, which in turn call the procedures in the text enumerator.
 <dt><code>int gs_text_process(gs_text_enum_t&nbsp;*pte)</code>
 <dd>Continue processing text.  This procedure may return 0 or a negative
 error code as usual, or one of the following values (see
-<a href="../src/gstext.h">gstext.h</a> for details).
+<a href="../base/gstext.h">gstext.h</a> for details).
 
 <blockquote><table cellpadding=0 cellspacing=0>
 <tr valign=top>	<td><code>TEXT_PROCESS_RENDER</code>
@@ -2722,7 +2722,7 @@ any time.
 
 <p>
 There are numerous other procedures that clients may call during text
-processing.  See <a href="../src/gstext.h">gstext.h</a> for details.
+processing.  See <a href="../base/gstext.h">gstext.h</a> for details.
 
 <h5><a name="Text_notes"></a>Notes</h5>
 
@@ -2734,7 +2734,7 @@ return an enumerator.  Furthermore, the implementation of the
 <code>process</code> procedure (in the enumerator structure, called by
 <code>gs_text_process</code>) cannot simply return without doing
 anything, even if it doesn't want to draw anything on the output.  See the
-comments in <a href="../src/gxtext.h">gxtext.h</a> for details.
+comments in <a href="../base/gxtext.h">gxtext.h</a> for details.
 
 <h4><a name="Unicode"></a>Unicode support for high level devices</h4>
 
@@ -2847,8 +2847,8 @@ group.
 
 <p>
 For further details on <code>params</code>, see <a
-href="../src/gxgetbit.h">gxgetbit.h</a>.  For further details on
-<code>options</code>, see <a href="../src/gxbitfmt.h">gxbitfmt.h</a>.
+href="../base/gxgetbit.h">gxgetbit.h</a>.  For further details on
+<code>options</code>, see <a href="../base/gxbitfmt.h">gxbitfmt.h</a>.
 
 <p>
 Define w = <code>prect</code>-&gt;q.x - <b><tt>prect</tt></b>-&gt;p.x, h
@@ -2930,7 +2930,7 @@ integer (int or long), boolean, float, string, name, <code>NULL</code>,
 array of integer, array of float, or arrays or dictionaries of mixed types.
 For example, the <code>Name</code> of a device is a string; the
 <code>Margins</code> of a device is an array of two floats.  See
-<a href="../src/gsparam.h">gsparam.h</a> for more details.
+<a href="../base/gsparam.h">gsparam.h</a> for more details.
 
 <p>
 If a device has parameters other than the ones applicable to all devices
@@ -2939,15 +2939,15 @@ If a device has parameters other than the ones applicable to all devices
 your device has parameters beyond those of a straightforward display or
 printer, we strongly advise using the <code>_get_params</code> and
 <code>_put_params</code> procedures in an existing device (for example,
-<a href="../src/gdevcdj.c">gdevcdj.c</a> or <a
-href="../src/gdevbit.c">gdevbit.c</a>) as a model for your own code.
+<a href="../base/gdevcdj.c">gdevcdj.c</a> or <a
+href="../base/gdevbit.c">gdevbit.c</a>) as a model for your own code.
 
 <dl>
 <dt><code>int (*get_params)(gx_device&nbsp;*dev,
 gs_param_list&nbsp;*plist)</code> <b><em>[OPTIONAL]</em></b>
 <dd>Read the parameters of the device into the parameter list at
 <code>plist</code>, using the <b><tt>param_write_*</tt></b>
-macros or procedures defined in <a href="../src/gsparam.h">gsparam.h</a>.
+macros or procedures defined in <a href="../base/gsparam.h">gsparam.h</a>.
 </dl>
 
 <dl>
@@ -2970,9 +2970,9 @@ sparingly.
 gs_param_list&nbsp;*plist)</code> <b><em>[OPTIONAL]</em></b>
 <dd>Set the parameters of the device from the parameter list at
 <code>plist</code>, using the <b><tt>param_read_</tt></b>*
-macros/procedures defined in <a href="../src/gsparam.h">gsparam.h</a>.  All
+macros/procedures defined in <a href="../base/gsparam.h">gsparam.h</a>.  All
 <code>put_params</code> procedures must use a "two-phase commit"
-algorithm; see <a href="../src/gsparam.h">gsparam.h</a> for details.
+algorithm; see <a href="../base/gsparam.h">gsparam.h</a> for details.
 </dl>
 
 <h4><a name="Default_CRD_parameters"></a>Default color rendering
@@ -2983,9 +2983,9 @@ Drivers that want to provide one or more default CIE color rendering
 dictionaries (CRDs) can do so through <code>get_params</code>.  To do
 this, they create the CRD in the usual way (normally using the
 <code>gs_cie_render1_build</code> and <b><tt>_initialize</tt></b>
-procedures defined in <a href="../src/gscrd.h">gscrd.h</a>), and then write
+procedures defined in <a href="../base/gscrd.h">gscrd.h</a>), and then write
 it as a parameter using <code>param_write_cie_render1</code> defined in
-<a href="../src/gscrdp.h">gscrdp.h</a>.  However, the TransformPQR procedure
+<a href="../base/gscrdp.h">gscrdp.h</a>.  However, the TransformPQR procedure
 requires special handling.  If the CRD uses a TransformPQR procedure
 different from the default (identity), the driver must do the following:
 
@@ -3005,7 +3005,7 @@ procedure address.
 
 <p>
 For a complete example, see the <code>bit_get_params</code> procedure in
-<a href="../src/gdevbit.c">gdevbit.c</a>.  Note that it is essential that
+<a href="../base/gdevbit.c">gdevbit.c</a>.  Note that it is essential that
 the driver return the CRD or the procedure address only if specifically
 requested (<code>param_requested(...)</code> &gt; 0); otherwise, errors
 will occur.
diff --git a/gs/doc/Issues.htm b/gs/doc/Issues.htm
index c8f3bd4d9..84de3b6af 100644
--- a/gs/doc/Issues.htm
+++ b/gs/doc/Issues.htm
@@ -369,7 +369,7 @@ class="offsite">#223992</a>, November 30, 2000.
 <p><I>
 We suggest that anyone who would like to work on this project
 start by looking at how CIDFontType 0 fonts do incremental loading
-(lib/gs_cidfn.ps and src/zfcid0.c). Probably much of this
+(lib/gs_cidfn.ps and psi/zfcid0.c). Probably much of this
 code can be also be used with CIDFontType 2 and TrueType fonts.
 </I>
 
diff --git a/gs/doc/Make.htm b/gs/doc/Make.htm
index c4b59560d..f470797fc 100644
--- a/gs/doc/Make.htm
+++ b/gs/doc/Make.htm
@@ -370,9 +370,12 @@ directory.
 	<td>&nbsp;&nbsp;&nbsp;&nbsp;
 	<th valign=bottom align=left>Contents
 <tr>	<td colspan=5><hr>
-<tr>	<td><code>src/</code>
+<tr>	<td><code>base/</code>
 	<td>&nbsp;
-	<td>C source code and makefiles
+	<td>Graphics library C source code and makefiles
+<tr>	<td><code>psi/</code>
+	<td>&nbsp;
+	<td>PS interpreter C source code and makefiles
 <tr>	<td><code>lib/</code>
 	<td>&nbsp;
 	<td>PostScript files and scripts used when running Ghostscript
@@ -985,7 +988,7 @@ Microsoft assembler (version 4.0 or later).
 To create "<code>makefile</code>", give the command
 
 <blockquote><code>
-echo !include "src\bcwin32.mak" &gt;makefile
+echo !include "base\bcwin32.mak" &gt;makefile
 </code></blockquote>
 
 <p>
@@ -1096,7 +1099,7 @@ the top level directory using the following command:</li>
   names.) Also specify the location of the master directory for your Ghostscript 
   files. Then select OK. 
 <p> In the next dialog window, specify the build command line as <code>nmake 
-  /f src/msvc32.mak DEVSTUDIO= </code> Note the value for 
+  /f psi/msvc32.mak DEVSTUDIO= </code> Note the value for 
   <code>DEVSTUDIO</code> 
   is empty. Then select <code>Finish</code>. 
 <p>At this point, it is now possible to build Ghostscript using Developer Studio. 
@@ -1124,7 +1127,7 @@ the top level directory using the following command:</li>
   it is simpler to use a build batch command file rather than retyping the build 
   command line for each new project. Here is an example used by one of Artifex's 
   staff members. This file is one line:
-<blockquote><code> nmake -f src/msvc32.mak DEVSTUDIO= DEBUG=1 TDEBUG=1 GS_LIB_DEFAULT="./lib/;./font;$(GSROOTDIR)/lib;$(AROOTDIR)/fonts" 
+<blockquote><code> nmake -f psi/msvc32.mak DEVSTUDIO= DEBUG=1 TDEBUG=1 GS_LIB_DEFAULT="./lib/;./font;$(GSROOTDIR)/lib;$(AROOTDIR)/fonts" 
   </code></blockquote>
 <p>Please note the double quotes around the value for <code>GS_LIB_DEFAULT</code>
   and the addition of <code>./lib;./fonts;</code> to its definition. This uses
@@ -1161,13 +1164,13 @@ significantly misleading. For general MSVC users we recommend TDEBUG=1.
   An attempt is made to select the correct version of Microsoft Visual C++
   based on the version of nmake.  If this doesn't work it will default
   to version 6.x.  
-  If you are not using version 6.x then before building, in <code>src\msvc32.mak</code> 
+  If you are not using version 6.x then before building, in <code>psi\msvc32.mak</code> 
   find the line "<code>#MSVC_VERSION=6</code>" and change it to "<b><tt>MSVC_VERSION=4</tt></b>", 
   "<code>MSVC_VERSION=5</code>", "<b><tt>MSVC_VERSION=7</tt></b>"
   or "<code>MSVC_VERSION=8</code>". . 
 <p>In some cases the location of the Microsoft Developer Studio, needs to be changed. 
   The location of Microsoft Developer Studio is defined by the value of <code>DEVSTUDIO</code>. 
-  There are several different definitions of <code>DEVSTUDIO</code> in src\msvc32.mak. 
+  There are several different definitions of <code>DEVSTUDIO</code> in psi\msvc32.mak. 
   There is one for each of the currently supported versions of Microsoft Visual 
   C++ (4, 5, 6, 7, 7.1 and 8). 
 <p>The normal installation process for Microsoft Visual C++ includes setting the 
@@ -1185,15 +1188,15 @@ significantly misleading. For general MSVC users we recommend TDEBUG=1.
   the correct definition.) 
 <p>To run the <code>make</code> program, give the command 
 <blockquote><code>
-nmake -f src\msvc32.mak
+nmake -f psi\msvc32.mak
 </code></blockquote>
 
 <p>
-Rather than changing src/msvc32.mak, these values can be specified on the make
-command line,  I.e.
+Rather than changing psi/msvc32.mak, these values can be specified on 
+the make command line,  I.e.
 
-<blockquote><code> nmake -f src\msvc32.mak MSVC_VERSION=6 DEVSTUDIO="C:\Program Files\Microsoft Visual Studio" <br>
-nmake -f src\msvc32.mak MSVC_VERSION=7 DEVSTUDIO="C:\Program Files\Microsoft Visual Studio .NET"
+<blockquote><code> nmake -f psi\msvc32.mak MSVC_VERSION=6 DEVSTUDIO="C:\Program Files\Microsoft Visual Studio" <br>
+nmake -f psi\msvc32.mak MSVC_VERSION=7 DEVSTUDIO="C:\Program Files\Microsoft Visual Studio .NET"
  </code></blockquote>
 
 <p> Note that double quotes have been added around the path for <code>DEVSTUDIO</code> 
@@ -1255,7 +1258,7 @@ directory from a nearby directory.
 <p>
 To make ghostscript use
 <blockquote><code>
-  nmake -f src/msvc32.mak WIN64=
+  nmake -f psi/msvc32.mak WIN64=
 </code></blockquote>
 This will fail when it tries to run genconf.exe.
 Move <code>./obj/genconf.exe</code> to 64-bit Windows, then run it
@@ -1269,7 +1272,7 @@ ARCH_ALIGN_STRUCT_MOD to 16,
 and ARCH_SIZEOF_PTR to 8).
 Then restart the build
 <blockquote><code>
-  nmake -f src/msvc32.mak WIN64=
+  nmake -f psi/msvc32.mak WIN64=
 </code></blockquote>
 
 <p>
@@ -1280,7 +1283,7 @@ change the DEVSTUDIO path.
 <h4><a name="Microsoft_64on64"></a>Compile on 64-bit Windows XP</h4>
 To make ghostscript use
 <blockquote><code>
-  nmake -f src/msvc32.mak WIN64=
+  nmake -f psi/msvc32.mak WIN64=
 </code></blockquote>
 <p>
 The makefile currently uses the cross compiler (x86_amd64) 
@@ -1310,7 +1313,7 @@ http://www.info-zip.org/pub/infozip/Zip.html</a>.  This is free.
 </ul>
 
 <p>
-You will have to edit <code>src/winint.mak</code> to define
+You will have to edit <code>psi/winint.mak</code> to define
 <code>WINZIPSE_XE</code> and <b><tt>ZIP_XE</tt></b> respectively as the
 path names of these programs.  See <a href="Release.htm">Release.htm</a> for
 the detailed procedure.
@@ -1335,7 +1338,7 @@ the directory where you installed the Watcom tools, and that the setting of
 <tr>	<td colspan=3><hr>
 <tr>	<td>MS Windows
 	<td>&nbsp;
-	<td nowrap><code>echo&nbsp;!include&nbsp;src\watcw32.mak&nbsp;&gt;makefile</code>
+	<td nowrap><code>echo&nbsp;!include&nbsp;base\watcw32.mak&nbsp;&gt;makefile</code>
 </table></blockquote>
 
 <p>
@@ -1484,7 +1487,7 @@ in the section on <a href="#MacOS">Classic MacOS</a> above.
 To set up the shlib build, download and uncompress the Ghostscript source.
 
 <p>
-Copy <tt>src/macos-mcp.mak</tt> to the top-level directory and rename
+Copy <tt>base/macos-mcp.mak</tt> to the top-level directory and rename
 it <tt>makefile</tt>. Then run 'make' in that directory, either from
 within Terminal.app or through Project Builder. This will set up the
 generated code required for the build and run a shell script to generate
@@ -1602,9 +1605,9 @@ version.
 <h3><a name="UNIX_makefile"></a>Setting up "makefile"</h3>
 
 <p>
-The files <code>src/unix</code>*<b><tt>.mak</tt></b> are the makefiles for
-Unix platforms, and you choose one based on what compiler you use.  To
-build Ghostscript, however, you must use the simple command
+The files <code>base/unix</code>*<b><tt>.mak</tt></b> are the makefiles 
+for Unix platforms, and you choose one based on what compiler you use.  
+To build Ghostscript, however, you must use the simple command
 "<code>make</code>", which must find the file "<b><tt>makefile</tt></b>"
 (or "<code>Makefile</code>").  If your system supports symbolic links,
 set up "<code>makefile</code>" like this.
@@ -1612,10 +1615,10 @@ set up "<code>makefile</code>" like this.
 <blockquote><table cellpadding=0 cellspacing=0>
 <tr>	<td>GNU gcc:
 	<td>&nbsp;&nbsp;&nbsp;&nbsp;
-	<td nowrap><code>ln -s src/unix-gcc.mak makefile</code>
+	<td nowrap><code>ln -s base/unix-gcc.mak makefile</code>
 <tr>	<td>Non-gcc ANSI C compiler:
 	<td>&nbsp;
-	<td nowrap><code>ln -s src/unixansi.mak makefile</code>
+	<td nowrap><code>ln -s base/unixansi.mak makefile</code>
 </table></blockquote>
 
 <p>
@@ -1692,7 +1695,7 @@ system, and hardware.
 To build Ghostscript as a shared object with gcc 
 (instead of as a single large executable) use:
 <pre>
-	ln -s src/unix-gcc.mak makefile
+	ln -s base/unix-gcc.mak makefile
 	make so
 </pre>
 <p>
@@ -1701,7 +1704,7 @@ shared object, <code>gsx</code> which uses Gtk+ and <b><tt>gsc</tt></b>
 which does not.
 
 <p>
-Do not use <tt>make -f src/unix-gcc.mak</tt> because this will
+Do not use <tt>make -f base/unix-gcc.mak</tt> because this will
 break the recursive make used in building the shared object.
 <p>
 To install the shared object and these two programs:
@@ -1713,7 +1716,7 @@ To delete files created by the build process:
 	make soclean
 </pre>
 <p>
-For more details see <a href="../src/unix-dll.mak">unix-dll.mak</a>.
+For more details see <a href="../base/unix-dll.mak">unix-dll.mak</a>.
 
 <h3><a name="Tool_specific_issues"></a>Tool-specific issues</h3>
 
@@ -2408,10 +2411,10 @@ for the binaries.
 First, build the standard configuration:
 
 <ul>
-<li>Edit gs/src/os2.mak: find line with 'CO=-O' (Optimizer flag) and edit
-this line to 'CO=-O2' (-O or -O1 do not work!).
+<li>Edit gs/base/os2.mak: find line with 'CO=-O' (Optimizer flag) and 
+edit this line to 'CO=-O2' (-O or -O1 do not work!).
 
-<li>To start the make process, type <code>nmake -f .\src\os2.mak</code>,
+<li>To start the make process, type <code>nmake -f .\base\os2.mak</code>,
 from the gs-directory.
 
 <li>One DLL and two EXEs will be produced in <code>gs/bin</code>:
@@ -2423,8 +2426,8 @@ be produced in <code>gs/obj</code>.
 
 <p>
 Now, if you wish, you can edit OS2.MAK to suit your needs, and then perform
-<code>nmake -f .\src\os2.mak clean</code> and then <code>nmake -f
-.\src\os2.mak</code>.
+<code>nmake -f .\base\os2.mak clean</code> and then <code>nmake -f
+.\base\os2.mak</code>.
 
 <hr>
 
diff --git a/gs/doc/Release.htm b/gs/doc/Release.htm
index d6d62580d..fe6b37b86 100644
--- a/gs/doc/Release.htm
+++ b/gs/doc/Release.htm
@@ -82,18 +82,14 @@ be sure to specify all command lines, file names, etc. in explicit
 detail.
 
 <p>
-File names below that don't include an explicit subdirectory name are in the
-<code>src</code> subdirectory.
-
-<p>
 If you do plan to make your own distribution, please be aware of some items
 you will want to change.
 
 <ul>
 
 <li>If you make any significant changes, please edit
-<code>gscdef.c</code> to change <b><tt>GS_PRODUCTFAMILY</tt></b> and
-<code>GS_PRODUCT</code> from "GPL Ghostscript" to something else,
+<code>base/gscdef.c</code> to change <b><tt>GS_PRODUCTFAMILY</tt></b> 
+and <code>GS_PRODUCT</code> from "GPL Ghostscript" to something else,
 in order to avoid confusion with Artifex releases.
 
 <li>In the same file, you may also want to edit <code>GS_COPYRIGHT</code>
@@ -181,7 +177,7 @@ Release numbers appear in the following places in the Ghostscript files:
 <li>In <code>lib/gs_init.ps</code>, as an integer (release number x100) at the beginning of the
 file just after the initial comment blocks.
 
-<li>In <code>src/version.mak</code>, split into 3 lines.
+<li>In <code>base/version.mak</code>, split into 3 lines.
 
 <li>In <code>doc/News.htm</code>, in the two headers and their labels and at the very end in
 the copyright footer.
@@ -267,7 +263,7 @@ Update references to the date for release:
 line. That is, in parentheses after the <tt>VERSION X.YY</tt> heading,
 and in the copyright footer both the year and the release date.
 
-<li>In <code>src/dwsetup.rc</code> and <b><tt>src/winint.mak</tt></b>,
+<li>In <code>psi/dwsetup.rc</code> and <b><tt>psi/winint.mak</tt></b>,
 update the year in the embedded copyright notice.
 
 </ul>
@@ -631,7 +627,8 @@ then repackage in a zip file as follows:
 <blockquote>
 <code>zip -r temp.zip gsN.NN/LICENSE gsN.NN/doc gsN.NN/examples 
   gsN.NN/icclib gsN.NN/ijs gsN.NN/jasper gsN.NN/jbig2dec gsN.NN/jpeg
-  gsN.NN/lib gsN.NN/libpng gsN.NN/src gsN.NN/Resource gsN.NN/zlib</code>
+  gsN.NN/lib gsN.NN/libpng gsN.NN/base gsN.NN/psi gsN.NN/Resource 
+  gsN.NN/zlib</code>
 </blockquote>
 Unzip converting the line endings to CRLF:
 <blockquote>
@@ -662,12 +659,12 @@ Alternatively, the command line version of WinZip
 (<code>wzzip.exe</code>) can be used by replacing the 
 Info-Zip command line options <code>-9 -r</code>
 with <code>-ex -P</code> in
-<code><a href="../src/winint.mak">winint.mak</a></code>.
+<code><a href="../psi/winint.mak">winint.mak</a></code>.
 <p>
 You will need WinZip Self-Extractor for building the
 self extracting archive.  This is commercial software.
 You may need to update the path <code>WINZIPSE_XE</code> in 
-<code><a href="../src/winint.mak">winint.mak</a></code>.
+<code><a href="../psi/winint.mak">winint.mak</a></code>.
 <p>
 Unzip the jpeg, libpng and zlib libraries, then make ghostscript
 as documented in <a href="Make.htm">Make.htm</a>.
diff --git a/gs/src/bfont.h b/gs/psi/bfont.h
index bf2e09fea..bf2e09fea 100644
--- a/gs/src/bfont.h
+++ b/gs/psi/bfont.h
diff --git a/gs/src/btoken.h b/gs/psi/btoken.h
index da69136f9..da69136f9 100644
--- a/gs/src/btoken.h
+++ b/gs/psi/btoken.h
diff --git a/gs/src/dscparse.c b/gs/psi/dscparse.c
index f727d295a..f727d295a 100644
--- a/gs/src/dscparse.c
+++ b/gs/psi/dscparse.c
diff --git a/gs/src/dscparse.h b/gs/psi/dscparse.h
index 9e7c6298e..9e7c6298e 100644
--- a/gs/src/dscparse.h
+++ b/gs/psi/dscparse.h
diff --git a/gs/src/dstack.h b/gs/psi/dstack.h
index 3e5b9136b..3e5b9136b 100644
--- a/gs/src/dstack.h
+++ b/gs/psi/dstack.h
diff --git a/gs/src/dw32c.def b/gs/psi/dw32c.def
index e3708f42b..e3708f42b 100644
--- a/gs/src/dw32c.def
+++ b/gs/psi/dw32c.def
diff --git a/gs/src/dwdll.c b/gs/psi/dwdll.c
index c63cf1d05..c63cf1d05 100644
--- a/gs/src/dwdll.c
+++ b/gs/psi/dwdll.c
diff --git a/gs/src/dwdll.h b/gs/psi/dwdll.h
index c2058a81d..c2058a81d 100644
--- a/gs/src/dwdll.h
+++ b/gs/psi/dwdll.h
diff --git a/gs/src/dwimg.c b/gs/psi/dwimg.c
index 4c84e5727..4c84e5727 100644
--- a/gs/src/dwimg.c
+++ b/gs/psi/dwimg.c
diff --git a/gs/src/dwimg.h b/gs/psi/dwimg.h
index 69c5a4c04..69c5a4c04 100644
--- a/gs/src/dwimg.h
+++ b/gs/psi/dwimg.h
diff --git a/gs/src/dwinst.cpp b/gs/psi/dwinst.cpp
index 70726ea48..70726ea48 100644
--- a/gs/src/dwinst.cpp
+++ b/gs/psi/dwinst.cpp
diff --git a/gs/src/dwinst.h b/gs/psi/dwinst.h
index fce283c2f..fce283c2f 100644
--- a/gs/src/dwinst.h
+++ b/gs/psi/dwinst.h
diff --git a/gs/src/dwmain.c b/gs/psi/dwmain.c
index ab64edba2..ab64edba2 100644
--- a/gs/src/dwmain.c
+++ b/gs/psi/dwmain.c
diff --git a/gs/src/dwmain.rc b/gs/psi/dwmain.rc
index 045f1a2ca..045f1a2ca 100644
--- a/gs/src/dwmain.rc
+++ b/gs/psi/dwmain.rc
diff --git a/gs/src/dwmain32.def b/gs/psi/dwmain32.def
index 179611fe2..179611fe2 100644
--- a/gs/src/dwmain32.def
+++ b/gs/psi/dwmain32.def
diff --git a/gs/src/dwmainc.c b/gs/psi/dwmainc.c
index a8ac02eca..a8ac02eca 100644
--- a/gs/src/dwmainc.c
+++ b/gs/psi/dwmainc.c
diff --git a/gs/src/dwnodll.c b/gs/psi/dwnodll.c
index 53480cbb4..53480cbb4 100644
--- a/gs/src/dwnodll.c
+++ b/gs/psi/dwnodll.c
diff --git a/gs/src/dwreg.c b/gs/psi/dwreg.c
index a7e52fdb1..a7e52fdb1 100644
--- a/gs/src/dwreg.c
+++ b/gs/psi/dwreg.c
diff --git a/gs/src/dwreg.h b/gs/psi/dwreg.h
index af1e4bacb..af1e4bacb 100644
--- a/gs/src/dwreg.h
+++ b/gs/psi/dwreg.h
diff --git a/gs/src/dwres.h b/gs/psi/dwres.h
index 4b5e83a55..4b5e83a55 100644
--- a/gs/src/dwres.h
+++ b/gs/psi/dwres.h
diff --git a/gs/src/dwsetup.cpp b/gs/psi/dwsetup.cpp
index 5aecc5ecd..5aecc5ecd 100644
--- a/gs/src/dwsetup.cpp
+++ b/gs/psi/dwsetup.cpp
diff --git a/gs/src/dwsetup.def b/gs/psi/dwsetup.def
index 28fe216d5..28fe216d5 100644
--- a/gs/src/dwsetup.def
+++ b/gs/psi/dwsetup.def
diff --git a/gs/src/dwsetup.h b/gs/psi/dwsetup.h
index a5cc0872e..a5cc0872e 100644
--- a/gs/src/dwsetup.h
+++ b/gs/psi/dwsetup.h
diff --git a/gs/src/dwsetup.rc b/gs/psi/dwsetup.rc
index 067240757..067240757 100644
--- a/gs/src/dwsetup.rc
+++ b/gs/psi/dwsetup.rc
diff --git a/gs/src/dwtext.c b/gs/psi/dwtext.c
index 58224eb2a..58224eb2a 100644
--- a/gs/src/dwtext.c
+++ b/gs/psi/dwtext.c
diff --git a/gs/src/dwtext.h b/gs/psi/dwtext.h
index af09aee62..af09aee62 100644
--- a/gs/src/dwtext.h
+++ b/gs/psi/dwtext.h
diff --git a/gs/src/dwtrace.c b/gs/psi/dwtrace.c
index 45845d1cf..45845d1cf 100644
--- a/gs/src/dwtrace.c
+++ b/gs/psi/dwtrace.c
diff --git a/gs/src/dwtrace.h b/gs/psi/dwtrace.h
index 689e3bfd9..689e3bfd9 100644
--- a/gs/src/dwtrace.h
+++ b/gs/psi/dwtrace.h
diff --git a/gs/src/dwuninst.cpp b/gs/psi/dwuninst.cpp
index 4d7305e41..4d7305e41 100644
--- a/gs/src/dwuninst.cpp
+++ b/gs/psi/dwuninst.cpp
diff --git a/gs/src/dwuninst.def b/gs/psi/dwuninst.def
index 5a4002e27..5a4002e27 100644
--- a/gs/src/dwuninst.def
+++ b/gs/psi/dwuninst.def
diff --git a/gs/src/dwuninst.h b/gs/psi/dwuninst.h
index bf66f6945..bf66f6945 100644
--- a/gs/src/dwuninst.h
+++ b/gs/psi/dwuninst.h
diff --git a/gs/src/dwuninst.rc b/gs/psi/dwuninst.rc
index 37ced5e88..37ced5e88 100644
--- a/gs/src/dwuninst.rc
+++ b/gs/psi/dwuninst.rc
diff --git a/gs/src/estack.h b/gs/psi/estack.h
index 9cc93aafa..9cc93aafa 100644
--- a/gs/src/estack.h
+++ b/gs/psi/estack.h
diff --git a/gs/src/files.h b/gs/psi/files.h
index 4e29115be..4e29115be 100644
--- a/gs/src/files.h
+++ b/gs/psi/files.h
diff --git a/gs/src/ghost.h b/gs/psi/ghost.h
index 9d4e7b9ae..9d4e7b9ae 100644
--- a/gs/src/ghost.h
+++ b/gs/psi/ghost.h
diff --git a/gs/src/gs.c b/gs/psi/gs.c
index c08706749..c08706749 100644
--- a/gs/src/gs.c
+++ b/gs/psi/gs.c
diff --git a/gs/src/gsdll.c b/gs/psi/gsdll.c
index ad9820326..ad9820326 100644
--- a/gs/src/gsdll.c
+++ b/gs/psi/gsdll.c
diff --git a/gs/src/gsdll2.def b/gs/psi/gsdll2.def
index 880204a30..880204a30 100644
--- a/gs/src/gsdll2.def
+++ b/gs/psi/gsdll2.def
diff --git a/gs/src/gsdll2.rc b/gs/psi/gsdll2.rc
index 4369eaacc..4369eaacc 100644
--- a/gs/src/gsdll2.rc
+++ b/gs/psi/gsdll2.rc
diff --git a/gs/src/gsdll32.def b/gs/psi/gsdll32.def
index cc2e776ca..cc2e776ca 100644
--- a/gs/src/gsdll32.def
+++ b/gs/psi/gsdll32.def
diff --git a/gs/src/gsdll32.rc b/gs/psi/gsdll32.rc
index 4d9b6bc62..4d9b6bc62 100644
--- a/gs/src/gsdll32.rc
+++ b/gs/psi/gsdll32.rc
diff --git a/gs/src/gsdll32w.lnk b/gs/psi/gsdll32w.lnk
index 12c60ffb6..12c60ffb6 100644
--- a/gs/src/gsdll32w.lnk
+++ b/gs/psi/gsdll32w.lnk
diff --git a/gs/src/gsdllos2.h b/gs/psi/gsdllos2.h
index d5706206f..d5706206f 100644
--- a/gs/src/gsdllos2.h
+++ b/gs/psi/gsdllos2.h
diff --git a/gs/src/gserver.c b/gs/psi/gserver.c
index 47a543a59..47a543a59 100644
--- a/gs/src/gserver.c
+++ b/gs/psi/gserver.c
diff --git a/gs/src/ialloc.c b/gs/psi/ialloc.c
index aca27a5f5..aca27a5f5 100644
--- a/gs/src/ialloc.c
+++ b/gs/psi/ialloc.c
diff --git a/gs/src/ialloc.h b/gs/psi/ialloc.h
index 87b7f1ef1..87b7f1ef1 100644
--- a/gs/src/ialloc.h
+++ b/gs/psi/ialloc.h
diff --git a/gs/src/iapi.c b/gs/psi/iapi.c
index 73cb7970f..73cb7970f 100644
--- a/gs/src/iapi.c
+++ b/gs/psi/iapi.c
diff --git a/gs/src/iapi.h b/gs/psi/iapi.h
index a82aad3aa..a82aad3aa 100644
--- a/gs/src/iapi.h
+++ b/gs/psi/iapi.h
diff --git a/gs/src/iastate.h b/gs/psi/iastate.h
index 2270b6dde..2270b6dde 100644
--- a/gs/src/iastate.h
+++ b/gs/psi/iastate.h
diff --git a/gs/src/iastruct.h b/gs/psi/iastruct.h
index 1f0dde041..1f0dde041 100644
--- a/gs/src/iastruct.h
+++ b/gs/psi/iastruct.h
diff --git a/gs/src/ibnum.c b/gs/psi/ibnum.c
index a440ed396..a440ed396 100644
--- a/gs/src/ibnum.c
+++ b/gs/psi/ibnum.c
diff --git a/gs/src/ibnum.h b/gs/psi/ibnum.h
index 7290ae650..7290ae650 100644
--- a/gs/src/ibnum.h
+++ b/gs/psi/ibnum.h
diff --git a/gs/src/ichar.h b/gs/psi/ichar.h
index 247af2884..247af2884 100644
--- a/gs/src/ichar.h
+++ b/gs/psi/ichar.h
diff --git a/gs/src/ichar1.h b/gs/psi/ichar1.h
index e05804e90..e05804e90 100644
--- a/gs/src/ichar1.h
+++ b/gs/psi/ichar1.h
diff --git a/gs/src/icharout.h b/gs/psi/icharout.h
index 72a33d6c7..72a33d6c7 100644
--- a/gs/src/icharout.h
+++ b/gs/psi/icharout.h
diff --git a/gs/src/icid.h b/gs/psi/icid.h
index 8c108e3f7..8c108e3f7 100644
--- a/gs/src/icid.h
+++ b/gs/psi/icid.h
diff --git a/gs/src/icie.h b/gs/psi/icie.h
index 317fc1ea0..317fc1ea0 100644
--- a/gs/src/icie.h
+++ b/gs/psi/icie.h
diff --git a/gs/src/icolor.h b/gs/psi/icolor.h
index b922e7548..b922e7548 100644
--- a/gs/src/icolor.h
+++ b/gs/psi/icolor.h
diff --git a/gs/src/iconf.c b/gs/psi/iconf.c
index d3f464c09..d3f464c09 100644
--- a/gs/src/iconf.c
+++ b/gs/psi/iconf.c
diff --git a/gs/src/iconf.h b/gs/psi/iconf.h
index 9bbaa2df1..9bbaa2df1 100644
--- a/gs/src/iconf.h
+++ b/gs/psi/iconf.h
diff --git a/gs/src/icontext.c b/gs/psi/icontext.c
index 0279ce862..0279ce862 100644
--- a/gs/src/icontext.c
+++ b/gs/psi/icontext.c
diff --git a/gs/src/icontext.h b/gs/psi/icontext.h
index 1cd24ec49..1cd24ec49 100644
--- a/gs/src/icontext.h
+++ b/gs/psi/icontext.h
diff --git a/gs/src/icremap.h b/gs/psi/icremap.h
index e4dda2029..e4dda2029 100644
--- a/gs/src/icremap.h
+++ b/gs/psi/icremap.h
diff --git a/gs/src/icsmap.h b/gs/psi/icsmap.h
index 3a6f99b5a..3a6f99b5a 100644
--- a/gs/src/icsmap.h
+++ b/gs/psi/icsmap.h
diff --git a/gs/src/icstate.h b/gs/psi/icstate.h
index 4e5369e2b..4e5369e2b 100644
--- a/gs/src/icstate.h
+++ b/gs/psi/icstate.h
diff --git a/gs/src/iddict.h b/gs/psi/iddict.h
index f30e59ff4..f30e59ff4 100644
--- a/gs/src/iddict.h
+++ b/gs/psi/iddict.h
diff --git a/gs/src/iddstack.h b/gs/psi/iddstack.h
index 9e6d2da55..9e6d2da55 100644
--- a/gs/src/iddstack.h
+++ b/gs/psi/iddstack.h
diff --git a/gs/src/idebug.c b/gs/psi/idebug.c
index 1c7ad2fa6..1c7ad2fa6 100644
--- a/gs/src/idebug.c
+++ b/gs/psi/idebug.c
diff --git a/gs/src/idebug.h b/gs/psi/idebug.h
index 340769f23..340769f23 100644
--- a/gs/src/idebug.h
+++ b/gs/psi/idebug.h
diff --git a/gs/src/idict.c b/gs/psi/idict.c
index d10e804c9..d10e804c9 100644
--- a/gs/src/idict.c
+++ b/gs/psi/idict.c
diff --git a/gs/src/idict.h b/gs/psi/idict.h
index 21a403750..21a403750 100644
--- a/gs/src/idict.h
+++ b/gs/psi/idict.h
diff --git a/gs/src/idictdef.h b/gs/psi/idictdef.h
index 5f78e26a3..5f78e26a3 100644
--- a/gs/src/idictdef.h
+++ b/gs/psi/idictdef.h
diff --git a/gs/src/idicttpl.h b/gs/psi/idicttpl.h
index 3526ed46a..3526ed46a 100644
--- a/gs/src/idicttpl.h
+++ b/gs/psi/idicttpl.h
diff --git a/gs/src/idisp.c b/gs/psi/idisp.c
index e26ec19a2..e26ec19a2 100644
--- a/gs/src/idisp.c
+++ b/gs/psi/idisp.c
diff --git a/gs/src/idisp.h b/gs/psi/idisp.h
index 88b352fd4..88b352fd4 100644
--- a/gs/src/idisp.h
+++ b/gs/psi/idisp.h
diff --git a/gs/src/idosave.h b/gs/psi/idosave.h
index aee38ef34..aee38ef34 100644
--- a/gs/src/idosave.h
+++ b/gs/psi/idosave.h
diff --git a/gs/src/idparam.c b/gs/psi/idparam.c
index d7f63133f..d7f63133f 100644
--- a/gs/src/idparam.c
+++ b/gs/psi/idparam.c
diff --git a/gs/src/idparam.h b/gs/psi/idparam.h
index d95f10ca3..d95f10ca3 100644
--- a/gs/src/idparam.h
+++ b/gs/psi/idparam.h
diff --git a/gs/src/idsdata.h b/gs/psi/idsdata.h
index 96f256684..96f256684 100644
--- a/gs/src/idsdata.h
+++ b/gs/psi/idsdata.h
diff --git a/gs/src/idstack.c b/gs/psi/idstack.c
index c340ea77d..c340ea77d 100644
--- a/gs/src/idstack.c
+++ b/gs/psi/idstack.c
diff --git a/gs/src/idstack.h b/gs/psi/idstack.h
index fe1005c7f..fe1005c7f 100644
--- a/gs/src/idstack.h
+++ b/gs/psi/idstack.h
diff --git a/gs/src/ierrors.h b/gs/psi/ierrors.h
index 083028b8d..083028b8d 100644
--- a/gs/src/ierrors.h
+++ b/gs/psi/ierrors.h
diff --git a/gs/src/iesdata.h b/gs/psi/iesdata.h
index 1e3d87646..1e3d87646 100644
--- a/gs/src/iesdata.h
+++ b/gs/psi/iesdata.h
diff --git a/gs/src/iestack.h b/gs/psi/iestack.h
index d8d38c84a..d8d38c84a 100644
--- a/gs/src/iestack.h
+++ b/gs/psi/iestack.h
diff --git a/gs/src/ifapi.h b/gs/psi/ifapi.h
index 78400b7d3..78400b7d3 100644
--- a/gs/src/ifapi.h
+++ b/gs/psi/ifapi.h
diff --git a/gs/src/ifcid.h b/gs/psi/ifcid.h
index 35b15bfaa..35b15bfaa 100644
--- a/gs/src/ifcid.h
+++ b/gs/psi/ifcid.h
diff --git a/gs/src/ifilter.h b/gs/psi/ifilter.h
index 2b56cfe54..2b56cfe54 100644
--- a/gs/src/ifilter.h
+++ b/gs/psi/ifilter.h
diff --git a/gs/src/ifilter2.h b/gs/psi/ifilter2.h
index 4729c1ff8..4729c1ff8 100644
--- a/gs/src/ifilter2.h
+++ b/gs/psi/ifilter2.h
diff --git a/gs/src/ifont.h b/gs/psi/ifont.h
index 63acb4436..63acb4436 100644
--- a/gs/src/ifont.h
+++ b/gs/psi/ifont.h
diff --git a/gs/src/ifont1.h b/gs/psi/ifont1.h
index a300e6011..a300e6011 100644
--- a/gs/src/ifont1.h
+++ b/gs/psi/ifont1.h
diff --git a/gs/src/ifont2.h b/gs/psi/ifont2.h
index a49b02e7f..a49b02e7f 100644
--- a/gs/src/ifont2.h
+++ b/gs/psi/ifont2.h
diff --git a/gs/src/ifont42.h b/gs/psi/ifont42.h
index 879fe66cf..879fe66cf 100644
--- a/gs/src/ifont42.h
+++ b/gs/psi/ifont42.h
diff --git a/gs/src/ifrpred.h b/gs/psi/ifrpred.h
index f1f460a19..f1f460a19 100644
--- a/gs/src/ifrpred.h
+++ b/gs/psi/ifrpred.h
diff --git a/gs/src/ifunc.h b/gs/psi/ifunc.h
index 171b302f9..171b302f9 100644
--- a/gs/src/ifunc.h
+++ b/gs/psi/ifunc.h
diff --git a/gs/src/ifwpred.h b/gs/psi/ifwpred.h
index e2e3f73b9..e2e3f73b9 100644
--- a/gs/src/ifwpred.h
+++ b/gs/psi/ifwpred.h
diff --git a/gs/src/igc.c b/gs/psi/igc.c
index 3fbbe7715..3fbbe7715 100644
--- a/gs/src/igc.c
+++ b/gs/psi/igc.c
diff --git a/gs/src/igc.h b/gs/psi/igc.h
index 728495aa0..728495aa0 100644
--- a/gs/src/igc.h
+++ b/gs/psi/igc.h
diff --git a/gs/src/igcref.c b/gs/psi/igcref.c
index 63267fd8b..63267fd8b 100644
--- a/gs/src/igcref.c
+++ b/gs/psi/igcref.c
diff --git a/gs/src/igcstr.c b/gs/psi/igcstr.c
index 86881836c..86881836c 100644
--- a/gs/src/igcstr.c
+++ b/gs/psi/igcstr.c
diff --git a/gs/src/igcstr.h b/gs/psi/igcstr.h
index d2f6514b6..d2f6514b6 100644
--- a/gs/src/igcstr.h
+++ b/gs/psi/igcstr.h
diff --git a/gs/src/igstate.h b/gs/psi/igstate.h
index 9af475fbe..9af475fbe 100644
--- a/gs/src/igstate.h
+++ b/gs/psi/igstate.h
diff --git a/gs/src/iht.h b/gs/psi/iht.h
index dfac294e5..dfac294e5 100644
--- a/gs/src/iht.h
+++ b/gs/psi/iht.h
diff --git a/gs/src/iimage.h b/gs/psi/iimage.h
index 8f866b07a..8f866b07a 100644
--- a/gs/src/iimage.h
+++ b/gs/psi/iimage.h
diff --git a/gs/src/iimage2.h b/gs/psi/iimage2.h
index 5f8376553..5f8376553 100644
--- a/gs/src/iimage2.h
+++ b/gs/psi/iimage2.h
diff --git a/gs/src/iinit.c b/gs/psi/iinit.c
index 8b3504fc7..8b3504fc7 100644
--- a/gs/src/iinit.c
+++ b/gs/psi/iinit.c
diff --git a/gs/src/iinit.h b/gs/psi/iinit.h
index 3e15d582b..3e15d582b 100644
--- a/gs/src/iinit.h
+++ b/gs/psi/iinit.h
diff --git a/gs/src/ilevel.h b/gs/psi/ilevel.h
index 33bcfafee..33bcfafee 100644
--- a/gs/src/ilevel.h
+++ b/gs/psi/ilevel.h
diff --git a/gs/src/ilocate.c b/gs/psi/ilocate.c
index 6ffef11fe..6ffef11fe 100644
--- a/gs/src/ilocate.c
+++ b/gs/psi/ilocate.c
diff --git a/gs/src/imain.c b/gs/psi/imain.c
index e06fca87a..e06fca87a 100644
--- a/gs/src/imain.c
+++ b/gs/psi/imain.c
diff --git a/gs/src/imain.h b/gs/psi/imain.h
index 6257b58f8..6257b58f8 100644
--- a/gs/src/imain.h
+++ b/gs/psi/imain.h
diff --git a/gs/src/imainarg.c b/gs/psi/imainarg.c
index 446ba390c..446ba390c 100644
--- a/gs/src/imainarg.c
+++ b/gs/psi/imainarg.c
diff --git a/gs/src/imainarg.h b/gs/psi/imainarg.h
index f2021e2b4..f2021e2b4 100644
--- a/gs/src/imainarg.h
+++ b/gs/psi/imainarg.h
diff --git a/gs/src/imemory.h b/gs/psi/imemory.h
index b5fcd1a69..b5fcd1a69 100644
--- a/gs/src/imemory.h
+++ b/gs/psi/imemory.h
diff --git a/gs/src/iminst.h b/gs/psi/iminst.h
index 6dd45cc78..6dd45cc78 100644
--- a/gs/src/iminst.h
+++ b/gs/psi/iminst.h
diff --git a/gs/src/iname.c b/gs/psi/iname.c
index 64128e94f..64128e94f 100644
--- a/gs/src/iname.c
+++ b/gs/psi/iname.c
diff --git a/gs/src/iname.h b/gs/psi/iname.h
index a6e2449e4..a6e2449e4 100644
--- a/gs/src/iname.h
+++ b/gs/psi/iname.h
diff --git a/gs/src/inamedef.h b/gs/psi/inamedef.h
index e06a4fa13..e06a4fa13 100644
--- a/gs/src/inamedef.h
+++ b/gs/psi/inamedef.h
diff --git a/gs/src/inameidx.h b/gs/psi/inameidx.h
index 782f78de5..782f78de5 100644
--- a/gs/src/inameidx.h
+++ b/gs/psi/inameidx.h
diff --git a/gs/src/inames.h b/gs/psi/inames.h
index 209b08c47..209b08c47 100644
--- a/gs/src/inames.h
+++ b/gs/psi/inames.h
diff --git a/gs/src/inamestr.h b/gs/psi/inamestr.h
index 11bbbcd91..11bbbcd91 100644
--- a/gs/src/inamestr.h
+++ b/gs/psi/inamestr.h
diff --git a/gs/src/inobtokn.c b/gs/psi/inobtokn.c
index a326bc8ab..a326bc8ab 100644
--- a/gs/src/inobtokn.c
+++ b/gs/psi/inobtokn.c
diff --git a/gs/src/inouparm.c b/gs/psi/inouparm.c
index deee5d699..deee5d699 100644
--- a/gs/src/inouparm.c
+++ b/gs/psi/inouparm.c
diff --git a/gs/src/int.mak b/gs/psi/int.mak
index 41ec537ef..41ec537ef 100644
--- a/gs/src/int.mak
+++ b/gs/psi/int.mak
diff --git a/gs/src/interp.c b/gs/psi/interp.c
index 0b02d9ba8..0b02d9ba8 100644
--- a/gs/src/interp.c
+++ b/gs/psi/interp.c
diff --git a/gs/src/interp.h b/gs/psi/interp.h
index 94cb42b21..94cb42b21 100644
--- a/gs/src/interp.h
+++ b/gs/psi/interp.h
diff --git a/gs/src/iosdata.h b/gs/psi/iosdata.h
index fec846471..fec846471 100644
--- a/gs/src/iosdata.h
+++ b/gs/psi/iosdata.h
diff --git a/gs/src/iostack.h b/gs/psi/iostack.h
index 9b1defafb..9b1defafb 100644
--- a/gs/src/iostack.h
+++ b/gs/psi/iostack.h
diff --git a/gs/src/ipacked.h b/gs/psi/ipacked.h
index aade6228e..aade6228e 100644
--- a/gs/src/ipacked.h
+++ b/gs/psi/ipacked.h
diff --git a/gs/src/iparam.c b/gs/psi/iparam.c
index afebdfb2c..afebdfb2c 100644
--- a/gs/src/iparam.c
+++ b/gs/psi/iparam.c
diff --git a/gs/src/iparam.h b/gs/psi/iparam.h
index eb38f9744..eb38f9744 100644
--- a/gs/src/iparam.h
+++ b/gs/psi/iparam.h
diff --git a/gs/src/iparray.h b/gs/psi/iparray.h
index 97fe9b64e..97fe9b64e 100644
--- a/gs/src/iparray.h
+++ b/gs/psi/iparray.h
diff --git a/gs/src/ipcolor.h b/gs/psi/ipcolor.h
index 8410e3b94..8410e3b94 100644
--- a/gs/src/ipcolor.h
+++ b/gs/psi/ipcolor.h
diff --git a/gs/src/iplugin.c b/gs/psi/iplugin.c
index f65e9aa52..f65e9aa52 100644
--- a/gs/src/iplugin.c
+++ b/gs/psi/iplugin.c
diff --git a/gs/src/iplugin.h b/gs/psi/iplugin.h
index 71621119d..71621119d 100644
--- a/gs/src/iplugin.h
+++ b/gs/psi/iplugin.h
diff --git a/gs/src/ireclaim.c b/gs/psi/ireclaim.c
index 6dd4bbd73..6dd4bbd73 100644
--- a/gs/src/ireclaim.c
+++ b/gs/psi/ireclaim.c
diff --git a/gs/src/iref.h b/gs/psi/iref.h
index 8d6c95e91..8d6c95e91 100644
--- a/gs/src/iref.h
+++ b/gs/psi/iref.h
diff --git a/gs/src/isave.c b/gs/psi/isave.c
index 975c576e7..975c576e7 100644
--- a/gs/src/isave.c
+++ b/gs/psi/isave.c
diff --git a/gs/src/isave.h b/gs/psi/isave.h
index 9e44b34fd..9e44b34fd 100644
--- a/gs/src/isave.h
+++ b/gs/psi/isave.h
diff --git a/gs/src/iscan.c b/gs/psi/iscan.c
index fc4a956ed..fc4a956ed 100644
--- a/gs/src/iscan.c
+++ b/gs/psi/iscan.c
diff --git a/gs/src/iscan.h b/gs/psi/iscan.h
index 5ec2d4077..5ec2d4077 100644
--- a/gs/src/iscan.h
+++ b/gs/psi/iscan.h
diff --git a/gs/src/iscanbin.c b/gs/psi/iscanbin.c
index 6c47369b3..6c47369b3 100644
--- a/gs/src/iscanbin.c
+++ b/gs/psi/iscanbin.c
diff --git a/gs/src/iscanbin.h b/gs/psi/iscanbin.h
index 75297ace8..75297ace8 100644
--- a/gs/src/iscanbin.h
+++ b/gs/psi/iscanbin.h
diff --git a/gs/src/iscannum.c b/gs/psi/iscannum.c
index f49c1e1ba..f49c1e1ba 100644
--- a/gs/src/iscannum.c
+++ b/gs/psi/iscannum.c
diff --git a/gs/src/iscannum.h b/gs/psi/iscannum.h
index 70b605eb3..70b605eb3 100644
--- a/gs/src/iscannum.h
+++ b/gs/psi/iscannum.h
diff --git a/gs/src/isdata.h b/gs/psi/isdata.h
index 81e59c4dd..81e59c4dd 100644
--- a/gs/src/isdata.h
+++ b/gs/psi/isdata.h
diff --git a/gs/src/isstate.h b/gs/psi/isstate.h
index 09f7af9d3..09f7af9d3 100644
--- a/gs/src/isstate.h
+++ b/gs/psi/isstate.h
diff --git a/gs/src/istack.c b/gs/psi/istack.c
index 03ada954c..03ada954c 100644
--- a/gs/src/istack.c
+++ b/gs/psi/istack.c
diff --git a/gs/src/istack.h b/gs/psi/istack.h
index c5a39f94d..c5a39f94d 100644
--- a/gs/src/istack.h
+++ b/gs/psi/istack.h
diff --git a/gs/src/istkparm.h b/gs/psi/istkparm.h
index de19da625..de19da625 100644
--- a/gs/src/istkparm.h
+++ b/gs/psi/istkparm.h
diff --git a/gs/src/istream.h b/gs/psi/istream.h
index 9ff97a1d9..9ff97a1d9 100644
--- a/gs/src/istream.h
+++ b/gs/psi/istream.h
diff --git a/gs/src/istruct.h b/gs/psi/istruct.h
index 41f9db78e..41f9db78e 100644
--- a/gs/src/istruct.h
+++ b/gs/psi/istruct.h
diff --git a/gs/src/itoken.h b/gs/psi/itoken.h
index df4415984..df4415984 100644
--- a/gs/src/itoken.h
+++ b/gs/psi/itoken.h
diff --git a/gs/src/iutil.c b/gs/psi/iutil.c
index 29736348c..29736348c 100644
--- a/gs/src/iutil.c
+++ b/gs/psi/iutil.c
diff --git a/gs/src/iutil.h b/gs/psi/iutil.h
index 3852a9182..3852a9182 100644
--- a/gs/src/iutil.h
+++ b/gs/psi/iutil.h
diff --git a/gs/src/iutil2.c b/gs/psi/iutil2.c
index 9549eb781..9549eb781 100644
--- a/gs/src/iutil2.c
+++ b/gs/psi/iutil2.c
diff --git a/gs/src/iutil2.h b/gs/psi/iutil2.h
index 2eb93c838..2eb93c838 100644
--- a/gs/src/iutil2.h
+++ b/gs/psi/iutil2.h
diff --git a/gs/src/ivmem2.h b/gs/psi/ivmem2.h
index 2b07480e3..2b07480e3 100644
--- a/gs/src/ivmem2.h
+++ b/gs/psi/ivmem2.h
diff --git a/gs/src/ivmspace.h b/gs/psi/ivmspace.h
index fc5f48087..fc5f48087 100644
--- a/gs/src/ivmspace.h
+++ b/gs/psi/ivmspace.h
diff --git a/gs/src/main.h b/gs/psi/main.h
index 27db6e6ce..27db6e6ce 100644
--- a/gs/src/main.h
+++ b/gs/psi/main.h
diff --git a/gs/src/msvc32.mak b/gs/psi/msvc32.mak
index b2a89e17f..cc82220b2 100644
--- a/gs/src/msvc32.mak
+++ b/gs/psi/msvc32.mak
@@ -40,7 +40,7 @@
 BINDIR=.\bin
 !endif
 !ifndef GLSRCDIR
-GLSRCDIR=.\src
+GLSRCDIR=.\base
 !endif
 !ifndef GLGENDIR
 GLGENDIR=.\obj
@@ -49,7 +49,7 @@ GLGENDIR=.\obj
 GLOBJDIR=.\obj
 !endif
 !ifndef PSSRCDIR
-PSSRCDIR=.\src
+PSSRCDIR=.\psi
 !endif
 !ifndef PSLIBDIR
 PSLIBDIR=.\lib
diff --git a/gs/src/oparc.h b/gs/psi/oparc.h
index 5a8e7947b..5a8e7947b 100644
--- a/gs/src/oparc.h
+++ b/gs/psi/oparc.h
diff --git a/gs/src/opcheck.h b/gs/psi/opcheck.h
index 1ade21feb..1ade21feb 100644
--- a/gs/src/opcheck.h
+++ b/gs/psi/opcheck.h
diff --git a/gs/src/opdef.h b/gs/psi/opdef.h
index b4b21a733..b4b21a733 100644
--- a/gs/src/opdef.h
+++ b/gs/psi/opdef.h
diff --git a/gs/src/oper.h b/gs/psi/oper.h
index 7862ccf36..7862ccf36 100644
--- a/gs/src/oper.h
+++ b/gs/psi/oper.h
diff --git a/gs/src/opextern.h b/gs/psi/opextern.h
index f2665a7dd..f2665a7dd 100644
--- a/gs/src/opextern.h
+++ b/gs/psi/opextern.h
diff --git a/gs/src/ostack.h b/gs/psi/ostack.h
index 329bc12f7..329bc12f7 100644
--- a/gs/src/ostack.h
+++ b/gs/psi/ostack.h
diff --git a/gs/src/sfilter1.c b/gs/psi/sfilter1.c
index cdf9abffd..cdf9abffd 100644
--- a/gs/src/sfilter1.c
+++ b/gs/psi/sfilter1.c
diff --git a/gs/src/store.h b/gs/psi/store.h
index 9a97ea821..9a97ea821 100644
--- a/gs/src/store.h
+++ b/gs/psi/store.h
diff --git a/gs/src/winint.mak b/gs/psi/winint.mak
index 95880df59..95880df59 100755
--- a/gs/src/winint.mak
+++ b/gs/psi/winint.mak
diff --git a/gs/src/zalg.c b/gs/psi/zalg.c
index ba05af810..ba05af810 100644
--- a/gs/src/zalg.c
+++ b/gs/psi/zalg.c
diff --git a/gs/src/zarith.c b/gs/psi/zarith.c
index d8eb91b4f..d8eb91b4f 100644
--- a/gs/src/zarith.c
+++ b/gs/psi/zarith.c
diff --git a/gs/src/zarray.c b/gs/psi/zarray.c
index 15b671aa2..15b671aa2 100644
--- a/gs/src/zarray.c
+++ b/gs/psi/zarray.c
diff --git a/gs/src/zbfont.c b/gs/psi/zbfont.c
index 14d4aa145..14d4aa145 100644
--- a/gs/src/zbfont.c
+++ b/gs/psi/zbfont.c
diff --git a/gs/src/zbseq.c b/gs/psi/zbseq.c
index 3cdfd9000..3cdfd9000 100644
--- a/gs/src/zbseq.c
+++ b/gs/psi/zbseq.c
diff --git a/gs/src/zcfont.c b/gs/psi/zcfont.c
index 6ed2275c2..6ed2275c2 100644
--- a/gs/src/zcfont.c
+++ b/gs/psi/zcfont.c
diff --git a/gs/src/zchar.c b/gs/psi/zchar.c
index b78fc51bc..b78fc51bc 100644
--- a/gs/src/zchar.c
+++ b/gs/psi/zchar.c
diff --git a/gs/src/zchar1.c b/gs/psi/zchar1.c
index 858cfc7f3..858cfc7f3 100644
--- a/gs/src/zchar1.c
+++ b/gs/psi/zchar1.c
diff --git a/gs/src/zchar2.c b/gs/psi/zchar2.c
index ec0db5c70..ec0db5c70 100644
--- a/gs/src/zchar2.c
+++ b/gs/psi/zchar2.c
diff --git a/gs/src/zchar32.c b/gs/psi/zchar32.c
index 52c38c588..52c38c588 100644
--- a/gs/src/zchar32.c
+++ b/gs/psi/zchar32.c
diff --git a/gs/src/zchar42.c b/gs/psi/zchar42.c
index 6cabe9f50..6cabe9f50 100644
--- a/gs/src/zchar42.c
+++ b/gs/psi/zchar42.c
diff --git a/gs/src/zchar42.h b/gs/psi/zchar42.h
index a4e39d1ed..a4e39d1ed 100644
--- a/gs/src/zchar42.h
+++ b/gs/psi/zchar42.h
diff --git a/gs/src/zcharout.c b/gs/psi/zcharout.c
index 3ac38d9dc..3ac38d9dc 100644
--- a/gs/src/zcharout.c
+++ b/gs/psi/zcharout.c
diff --git a/gs/src/zcharx.c b/gs/psi/zcharx.c
index 6b8ffcc47..6b8ffcc47 100644
--- a/gs/src/zcharx.c
+++ b/gs/psi/zcharx.c
diff --git a/gs/src/zcid.c b/gs/psi/zcid.c
index 33c3bdc46..33c3bdc46 100644
--- a/gs/src/zcid.c
+++ b/gs/psi/zcid.c
diff --git a/gs/src/zcidtest.c b/gs/psi/zcidtest.c
index 001952734..001952734 100644
--- a/gs/src/zcidtest.c
+++ b/gs/psi/zcidtest.c
diff --git a/gs/src/zcie.c b/gs/psi/zcie.c
index 81d8ba6c4..81d8ba6c4 100644
--- a/gs/src/zcie.c
+++ b/gs/psi/zcie.c
diff --git a/gs/src/zcolor.c b/gs/psi/zcolor.c
index f3df49541..f3df49541 100644
--- a/gs/src/zcolor.c
+++ b/gs/psi/zcolor.c
diff --git a/gs/src/zcolor1.c b/gs/psi/zcolor1.c
index 5feb2e875..5feb2e875 100644
--- a/gs/src/zcolor1.c
+++ b/gs/psi/zcolor1.c
diff --git a/gs/src/zcolor2.c b/gs/psi/zcolor2.c
index b836d978b..b836d978b 100644
--- a/gs/src/zcolor2.c
+++ b/gs/psi/zcolor2.c
diff --git a/gs/src/zcolor3.c b/gs/psi/zcolor3.c
index d874afcff..d874afcff 100644
--- a/gs/src/zcolor3.c
+++ b/gs/psi/zcolor3.c
diff --git a/gs/src/zcontext.c b/gs/psi/zcontext.c
index 151f833b4..151f833b4 100644
--- a/gs/src/zcontext.c
+++ b/gs/psi/zcontext.c
diff --git a/gs/src/zcontrol.c b/gs/psi/zcontrol.c
index 1c8cd668c..1c8cd668c 100644
--- a/gs/src/zcontrol.c
+++ b/gs/psi/zcontrol.c
diff --git a/gs/src/zcrd.c b/gs/psi/zcrd.c
index 2e74abe7e..2e74abe7e 100644
--- a/gs/src/zcrd.c
+++ b/gs/psi/zcrd.c
diff --git a/gs/src/zcsdevn.c b/gs/psi/zcsdevn.c
index d13d4cc5b..d13d4cc5b 100644
--- a/gs/src/zcsdevn.c
+++ b/gs/psi/zcsdevn.c
diff --git a/gs/src/zcsindex.c b/gs/psi/zcsindex.c
index 2b8f6d9b7..2b8f6d9b7 100644
--- a/gs/src/zcsindex.c
+++ b/gs/psi/zcsindex.c
diff --git a/gs/src/zcspixel.c b/gs/psi/zcspixel.c
index ef4584306..ef4584306 100644
--- a/gs/src/zcspixel.c
+++ b/gs/psi/zcspixel.c
diff --git a/gs/src/zcssepr.c b/gs/psi/zcssepr.c
index de0454dc1..de0454dc1 100644
--- a/gs/src/zcssepr.c
+++ b/gs/psi/zcssepr.c
diff --git a/gs/src/zdevcal.c b/gs/psi/zdevcal.c
index 1ec6fb195..1ec6fb195 100644
--- a/gs/src/zdevcal.c
+++ b/gs/psi/zdevcal.c
diff --git a/gs/src/zdevice.c b/gs/psi/zdevice.c
index 4553128ef..4553128ef 100644
--- a/gs/src/zdevice.c
+++ b/gs/psi/zdevice.c
diff --git a/gs/src/zdevice2.c b/gs/psi/zdevice2.c
index cad437f02..cad437f02 100644
--- a/gs/src/zdevice2.c
+++ b/gs/psi/zdevice2.c
diff --git a/gs/src/zdfilter.c b/gs/psi/zdfilter.c
index f7fef64b1..f7fef64b1 100644
--- a/gs/src/zdfilter.c
+++ b/gs/psi/zdfilter.c
diff --git a/gs/src/zdict.c b/gs/psi/zdict.c
index 65b49d8b2..65b49d8b2 100644
--- a/gs/src/zdict.c
+++ b/gs/psi/zdict.c
diff --git a/gs/src/zdosio.c b/gs/psi/zdosio.c
index 132877951..132877951 100644
--- a/gs/src/zdosio.c
+++ b/gs/psi/zdosio.c
diff --git a/gs/src/zdouble.c b/gs/psi/zdouble.c
index 4b5195056..4b5195056 100644
--- a/gs/src/zdouble.c
+++ b/gs/psi/zdouble.c
diff --git a/gs/src/zdpnext.c b/gs/psi/zdpnext.c
index 0db9728f3..0db9728f3 100644
--- a/gs/src/zdpnext.c
+++ b/gs/psi/zdpnext.c
diff --git a/gs/src/zdps.c b/gs/psi/zdps.c
index a876cbd30..a876cbd30 100644
--- a/gs/src/zdps.c
+++ b/gs/psi/zdps.c
diff --git a/gs/src/zdps1.c b/gs/psi/zdps1.c
index 6940abb68..6940abb68 100644
--- a/gs/src/zdps1.c
+++ b/gs/psi/zdps1.c
diff --git a/gs/src/zdscpars.c b/gs/psi/zdscpars.c
index bb9e6f9e2..bb9e6f9e2 100644
--- a/gs/src/zdscpars.c
+++ b/gs/psi/zdscpars.c
diff --git a/gs/src/zfapi.c b/gs/psi/zfapi.c
index 84b96951b..84b96951b 100644
--- a/gs/src/zfapi.c
+++ b/gs/psi/zfapi.c
diff --git a/gs/src/zfarc4.c b/gs/psi/zfarc4.c
index 7403316d1..7403316d1 100644
--- a/gs/src/zfarc4.c
+++ b/gs/psi/zfarc4.c
diff --git a/gs/src/zfbcp.c b/gs/psi/zfbcp.c
index 147fd3154..147fd3154 100644
--- a/gs/src/zfbcp.c
+++ b/gs/psi/zfbcp.c
diff --git a/gs/src/zfcid.c b/gs/psi/zfcid.c
index 5517bf40f..5517bf40f 100644
--- a/gs/src/zfcid.c
+++ b/gs/psi/zfcid.c
diff --git a/gs/src/zfcid0.c b/gs/psi/zfcid0.c
index 7061c6437..7061c6437 100644
--- a/gs/src/zfcid0.c
+++ b/gs/psi/zfcid0.c
diff --git a/gs/src/zfcid1.c b/gs/psi/zfcid1.c
index a9c9f82c6..a9c9f82c6 100644
--- a/gs/src/zfcid1.c
+++ b/gs/psi/zfcid1.c
diff --git a/gs/src/zfcmap.c b/gs/psi/zfcmap.c
index b18c869c4..b18c869c4 100644
--- a/gs/src/zfcmap.c
+++ b/gs/psi/zfcmap.c
diff --git a/gs/src/zfdctd.c b/gs/psi/zfdctd.c
index a82abebb5..a82abebb5 100644
--- a/gs/src/zfdctd.c
+++ b/gs/psi/zfdctd.c
diff --git a/gs/src/zfdcte.c b/gs/psi/zfdcte.c
index bde775883..bde775883 100644
--- a/gs/src/zfdcte.c
+++ b/gs/psi/zfdcte.c
diff --git a/gs/src/zfdecode.c b/gs/psi/zfdecode.c
index 853228c29..853228c29 100644
--- a/gs/src/zfdecode.c
+++ b/gs/psi/zfdecode.c
diff --git a/gs/src/zfile.c b/gs/psi/zfile.c
index 7bb13ef6a..7bb13ef6a 100644
--- a/gs/src/zfile.c
+++ b/gs/psi/zfile.c
diff --git a/gs/src/zfile.h b/gs/psi/zfile.h
index defa2408e..defa2408e 100644
--- a/gs/src/zfile.h
+++ b/gs/psi/zfile.h
diff --git a/gs/src/zfile1.c b/gs/psi/zfile1.c
index 73bd96fd0..73bd96fd0 100644
--- a/gs/src/zfile1.c
+++ b/gs/psi/zfile1.c
diff --git a/gs/src/zfileio.c b/gs/psi/zfileio.c
index 72224459a..72224459a 100644
--- a/gs/src/zfileio.c
+++ b/gs/psi/zfileio.c
diff --git a/gs/src/zfilter.c b/gs/psi/zfilter.c
index 19e44b40f..19e44b40f 100644
--- a/gs/src/zfilter.c
+++ b/gs/psi/zfilter.c
diff --git a/gs/src/zfilter2.c b/gs/psi/zfilter2.c
index addf9a49a..addf9a49a 100644
--- a/gs/src/zfilter2.c
+++ b/gs/psi/zfilter2.c
diff --git a/gs/src/zfilterx.c b/gs/psi/zfilterx.c
index 6441372de..6441372de 100644
--- a/gs/src/zfilterx.c
+++ b/gs/psi/zfilterx.c
diff --git a/gs/src/zfimscale.c b/gs/psi/zfimscale.c
index d351ecf3d..d351ecf3d 100644
--- a/gs/src/zfimscale.c
+++ b/gs/psi/zfimscale.c
diff --git a/gs/src/zfjbig2.c b/gs/psi/zfjbig2.c
index b70993a41..b70993a41 100644
--- a/gs/src/zfjbig2.c
+++ b/gs/psi/zfjbig2.c
diff --git a/gs/src/zfjpx.c b/gs/psi/zfjpx.c
index 62d2afdad..62d2afdad 100644
--- a/gs/src/zfjpx.c
+++ b/gs/psi/zfjpx.c
diff --git a/gs/src/zfmd5.c b/gs/psi/zfmd5.c
index a8c7f7628..a8c7f7628 100644
--- a/gs/src/zfmd5.c
+++ b/gs/psi/zfmd5.c
diff --git a/gs/src/zfont.c b/gs/psi/zfont.c
index 05daae164..05daae164 100644
--- a/gs/src/zfont.c
+++ b/gs/psi/zfont.c
diff --git a/gs/src/zfont0.c b/gs/psi/zfont0.c
index 6a7ebbd9a..6a7ebbd9a 100644
--- a/gs/src/zfont0.c
+++ b/gs/psi/zfont0.c
diff --git a/gs/src/zfont1.c b/gs/psi/zfont1.c
index b83f68674..b83f68674 100644
--- a/gs/src/zfont1.c
+++ b/gs/psi/zfont1.c
diff --git a/gs/src/zfont2.c b/gs/psi/zfont2.c
index 0878600b4..0878600b4 100644
--- a/gs/src/zfont2.c
+++ b/gs/psi/zfont2.c
diff --git a/gs/src/zfont32.c b/gs/psi/zfont32.c
index 0f1136046..0f1136046 100644
--- a/gs/src/zfont32.c
+++ b/gs/psi/zfont32.c
diff --git a/gs/src/zfont42.c b/gs/psi/zfont42.c
index b6ba4bba4..b6ba4bba4 100644
--- a/gs/src/zfont42.c
+++ b/gs/psi/zfont42.c
diff --git a/gs/src/zfontenum.c b/gs/psi/zfontenum.c
index 2f36f0ee8..2f36f0ee8 100644
--- a/gs/src/zfontenum.c
+++ b/gs/psi/zfontenum.c
diff --git a/gs/src/zfproc.c b/gs/psi/zfproc.c
index 6034aa952..6034aa952 100644
--- a/gs/src/zfproc.c
+++ b/gs/psi/zfproc.c
diff --git a/gs/src/zfrsd.c b/gs/psi/zfrsd.c
index 981e8324a..981e8324a 100644
--- a/gs/src/zfrsd.c
+++ b/gs/psi/zfrsd.c
diff --git a/gs/src/zfsample.c b/gs/psi/zfsample.c
index dcf730a60..dcf730a60 100644
--- a/gs/src/zfsample.c
+++ b/gs/psi/zfsample.c
diff --git a/gs/src/zfunc.c b/gs/psi/zfunc.c
index 2dbd4094f..2dbd4094f 100644
--- a/gs/src/zfunc.c
+++ b/gs/psi/zfunc.c
diff --git a/gs/src/zfunc0.c b/gs/psi/zfunc0.c
index 8e8decaa8..8e8decaa8 100644
--- a/gs/src/zfunc0.c
+++ b/gs/psi/zfunc0.c
diff --git a/gs/src/zfunc3.c b/gs/psi/zfunc3.c
index cd03cf4ce..cd03cf4ce 100644
--- a/gs/src/zfunc3.c
+++ b/gs/psi/zfunc3.c
diff --git a/gs/src/zfunc4.c b/gs/psi/zfunc4.c
index 87e921543..87e921543 100644
--- a/gs/src/zfunc4.c
+++ b/gs/psi/zfunc4.c
diff --git a/gs/src/zfzlib.c b/gs/psi/zfzlib.c
index a4b6e6267..a4b6e6267 100644
--- a/gs/src/zfzlib.c
+++ b/gs/psi/zfzlib.c
diff --git a/gs/src/zgeneric.c b/gs/psi/zgeneric.c
index 243d3d07c..243d3d07c 100644
--- a/gs/src/zgeneric.c
+++ b/gs/psi/zgeneric.c
diff --git a/gs/src/zgstate.c b/gs/psi/zgstate.c
index 8a030f0e9..8a030f0e9 100644
--- a/gs/src/zgstate.c
+++ b/gs/psi/zgstate.c
diff --git a/gs/src/zhsb.c b/gs/psi/zhsb.c
index 15ec8b7f5..15ec8b7f5 100644
--- a/gs/src/zhsb.c
+++ b/gs/psi/zhsb.c
diff --git a/gs/src/zht.c b/gs/psi/zht.c
index 58608c35a..58608c35a 100644
--- a/gs/src/zht.c
+++ b/gs/psi/zht.c
diff --git a/gs/src/zht1.c b/gs/psi/zht1.c
index f35a1bf16..f35a1bf16 100644
--- a/gs/src/zht1.c
+++ b/gs/psi/zht1.c
diff --git a/gs/src/zht2.c b/gs/psi/zht2.c
index a469b1eef..a469b1eef 100644
--- a/gs/src/zht2.c
+++ b/gs/psi/zht2.c
diff --git a/gs/src/zht2.h b/gs/psi/zht2.h
index 1b6404254..1b6404254 100644
--- a/gs/src/zht2.h
+++ b/gs/psi/zht2.h
diff --git a/gs/src/zicc.c b/gs/psi/zicc.c
index e3d1e93db..e3d1e93db 100644
--- a/gs/src/zicc.c
+++ b/gs/psi/zicc.c
diff --git a/gs/src/zimage.c b/gs/psi/zimage.c
index faca23910..faca23910 100644
--- a/gs/src/zimage.c
+++ b/gs/psi/zimage.c
diff --git a/gs/src/zimage2.c b/gs/psi/zimage2.c
index 09c147fef..09c147fef 100644
--- a/gs/src/zimage2.c
+++ b/gs/psi/zimage2.c
diff --git a/gs/src/zimage3.c b/gs/psi/zimage3.c
index e047633f2..e047633f2 100644
--- a/gs/src/zimage3.c
+++ b/gs/psi/zimage3.c
diff --git a/gs/src/ziodev.c b/gs/psi/ziodev.c
index d41069e0c..d41069e0c 100644
--- a/gs/src/ziodev.c
+++ b/gs/psi/ziodev.c
diff --git a/gs/src/ziodev2.c b/gs/psi/ziodev2.c
index 368428517..368428517 100644
--- a/gs/src/ziodev2.c
+++ b/gs/psi/ziodev2.c
diff --git a/gs/src/ziodevs.c b/gs/psi/ziodevs.c
index 020b04e87..020b04e87 100644
--- a/gs/src/ziodevs.c
+++ b/gs/psi/ziodevs.c
diff --git a/gs/src/ziodevsc.c b/gs/psi/ziodevsc.c
index f31e26ea0..f31e26ea0 100644
--- a/gs/src/ziodevsc.c
+++ b/gs/psi/ziodevsc.c
diff --git a/gs/src/zmath.c b/gs/psi/zmath.c
index e86c7bd61..e86c7bd61 100644
--- a/gs/src/zmath.c
+++ b/gs/psi/zmath.c
diff --git a/gs/src/zmatrix.c b/gs/psi/zmatrix.c
index 27af4e7ef..27af4e7ef 100644
--- a/gs/src/zmatrix.c
+++ b/gs/psi/zmatrix.c
diff --git a/gs/src/zmedia2.c b/gs/psi/zmedia2.c
index a30607cef..a30607cef 100644
--- a/gs/src/zmedia2.c
+++ b/gs/psi/zmedia2.c
diff --git a/gs/src/zmisc.c b/gs/psi/zmisc.c
index 08a2ae452..08a2ae452 100644
--- a/gs/src/zmisc.c
+++ b/gs/psi/zmisc.c
diff --git a/gs/src/zmisc1.c b/gs/psi/zmisc1.c
index 94f8838ab..94f8838ab 100644
--- a/gs/src/zmisc1.c
+++ b/gs/psi/zmisc1.c
diff --git a/gs/src/zmisc2.c b/gs/psi/zmisc2.c
index a45f37ae2..a45f37ae2 100644
--- a/gs/src/zmisc2.c
+++ b/gs/psi/zmisc2.c
diff --git a/gs/src/zmisc3.c b/gs/psi/zmisc3.c
index 840d9c41e..840d9c41e 100644
--- a/gs/src/zmisc3.c
+++ b/gs/psi/zmisc3.c
diff --git a/gs/src/zncdummy.c b/gs/psi/zncdummy.c
index bd8c0043d..bd8c0043d 100644
--- a/gs/src/zncdummy.c
+++ b/gs/psi/zncdummy.c
diff --git a/gs/src/zpacked.c b/gs/psi/zpacked.c
index 469cd81fa..469cd81fa 100644
--- a/gs/src/zpacked.c
+++ b/gs/psi/zpacked.c
diff --git a/gs/src/zpaint.c b/gs/psi/zpaint.c
index 5e98f5d36..5e98f5d36 100644
--- a/gs/src/zpaint.c
+++ b/gs/psi/zpaint.c
diff --git a/gs/src/zpath.c b/gs/psi/zpath.c
index e610bcd32..e610bcd32 100644
--- a/gs/src/zpath.c
+++ b/gs/psi/zpath.c
diff --git a/gs/src/zpath1.c b/gs/psi/zpath1.c
index f07319f7f..f07319f7f 100644
--- a/gs/src/zpath1.c
+++ b/gs/psi/zpath1.c
diff --git a/gs/src/zpcolor.c b/gs/psi/zpcolor.c
index e139df812..e139df812 100644
--- a/gs/src/zpcolor.c
+++ b/gs/psi/zpcolor.c
diff --git a/gs/src/zrelbit.c b/gs/psi/zrelbit.c
index 1187ae681..1187ae681 100644
--- a/gs/src/zrelbit.c
+++ b/gs/psi/zrelbit.c
diff --git a/gs/src/zrop.c b/gs/psi/zrop.c
index 55bb6bd87..55bb6bd87 100644
--- a/gs/src/zrop.c
+++ b/gs/psi/zrop.c
diff --git a/gs/src/zshade.c b/gs/psi/zshade.c
index 2f43e16b8..2f43e16b8 100644
--- a/gs/src/zshade.c
+++ b/gs/psi/zshade.c
diff --git a/gs/src/zstack.c b/gs/psi/zstack.c
index 84ec98ac4..84ec98ac4 100644
--- a/gs/src/zstack.c
+++ b/gs/psi/zstack.c
diff --git a/gs/src/zstring.c b/gs/psi/zstring.c
index afff12807..afff12807 100644
--- a/gs/src/zstring.c
+++ b/gs/psi/zstring.c
diff --git a/gs/src/zsysvm.c b/gs/psi/zsysvm.c
index c2290b760..c2290b760 100644
--- a/gs/src/zsysvm.c
+++ b/gs/psi/zsysvm.c
diff --git a/gs/src/ztoken.c b/gs/psi/ztoken.c
index 3e96a743a..3e96a743a 100644
--- a/gs/src/ztoken.c
+++ b/gs/psi/ztoken.c
diff --git a/gs/src/ztrans.c b/gs/psi/ztrans.c
index fd873a9f5..fd873a9f5 100644
--- a/gs/src/ztrans.c
+++ b/gs/psi/ztrans.c
diff --git a/gs/src/ztrap.c b/gs/psi/ztrap.c
index 2a1d77479..2a1d77479 100644
--- a/gs/src/ztrap.c
+++ b/gs/psi/ztrap.c
diff --git a/gs/src/ztype.c b/gs/psi/ztype.c
index 2175cdecf..2175cdecf 100644
--- a/gs/src/ztype.c
+++ b/gs/psi/ztype.c
diff --git a/gs/src/zupath.c b/gs/psi/zupath.c
index 0ddb7c527..0ddb7c527 100644
--- a/gs/src/zupath.c
+++ b/gs/psi/zupath.c
diff --git a/gs/src/zusparam.c b/gs/psi/zusparam.c
index 3b82b90dd..3b82b90dd 100644
--- a/gs/src/zusparam.c
+++ b/gs/psi/zusparam.c
diff --git a/gs/src/zvmem.c b/gs/psi/zvmem.c
index da4dd771a..da4dd771a 100644
--- a/gs/src/zvmem.c
+++ b/gs/psi/zvmem.c
diff --git a/gs/src/zvmem2.c b/gs/psi/zvmem2.c
index 8fa2fb686..8fa2fb686 100644
--- a/gs/src/zvmem2.c
+++ b/gs/psi/zvmem2.c
diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak
index d6f855cb9..ae46caf9f 100644
--- a/language_switch/pspcl6_gcc.mak
+++ b/language_switch/pspcl6_gcc.mak
@@ -13,8 +13,8 @@ MAKEFILE+= ../language_switch/pspcl6_gcc.mak
 
 # The sources are taken from these directories:
 MAINSRCDIR?=../main
-GLSRCDIR?=../gs/src
-PSSRCDIR?=../gs/src
+GLSRCDIR?=../gs/base
+PSSRCDIR?=../gs/psi
 PSISRCDIR?=../psi
 PSLIBDIR?=../gs/lib
 ICCSRCDIR?=../gs/icclib
diff --git a/language_switch/pspcl6_msvc.mak b/language_switch/pspcl6_msvc.mak
index 4fb66ffb8..5e1c0b41c 100644
--- a/language_switch/pspcl6_msvc.mak
+++ b/language_switch/pspcl6_msvc.mak
@@ -26,10 +26,10 @@ GENDIR=.\obj
 APPSRCDIR=.
 !endif
 !ifndef GLSRCDIR
-GLSRCDIR=..\gs\src
+GLSRCDIR=..\gs\base
 !endif
 !ifndef PSSRCDIR
-PSSRCDIR=..\gs\src
+PSSRCDIR=..\gs\psi
 !endif
 !ifndef PSISRCDIR
 PSISRCDIR=..\psi
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index 0291bc9e8..3758d1f66 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -22,7 +22,7 @@ XCFLAGS?=
 GENDIR?=./obj
 PGGENDIR?=./pgobj
 # The sources are taken from these directories:
-GLSRCDIR?=../gs/src
+GLSRCDIR?=../gs/base
 PCLSRCDIR?=../pcl
 PLSRCDIR?=../pl
 PXLSRCDIR?=../pxl
@@ -31,7 +31,7 @@ SVGSRCDIR?=../svg
 ICCSRCDIR?=../gs/icclib
 COMMONDIR?=../common
 MAINSRCDIR?=../main
-PSSRCDIR?=../gs/src
+PSSRCDIR?=../gs/psi
 
 # specify the location of zlib.  We use zlib for bandlist compression.
 ZSRCDIR?=../gs/zlib
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index 0867667ab..65ef59767 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -11,7 +11,7 @@ GENDIR=.\obj
 
 # The sources are taken from these directories:
 !ifndef GLSRCDIR
-GLSRCDIR=..\gs\src
+GLSRCDIR=..\gs\base
 !endif
 !ifndef PLSRCDIR
 PLSRCDIR=..\pl
diff --git a/psi/psitop.c b/psi/psitop.c
index e2d1a50f6..4c02a3a60 100755
--- a/psi/psitop.c
+++ b/psi/psitop.c
@@ -23,7 +23,7 @@
 #include "gdebug.h"
 #include "gp.h"
 #include "gserrors.h"
-#include "../gs/src/errors.h"	/* FIXME: Microsoft seems to pull in <errors.h> */
+#include "../gs/base/errors.h"	/* FIXME: MSVC seems to pull in <errors.h> */
 #include "gstypes.h"
 #include "gsmemory.h"
 #include "gsmalloc.h"
diff --git a/svg/svg_gcc.mak b/svg/svg_gcc.mak
index f371c50db..15b3716f0 100644
--- a/svg/svg_gcc.mak
+++ b/svg/svg_gcc.mak
@@ -37,7 +37,7 @@ GENDIR?=./obj
 
 # The sources are taken from these directories:
 MAINSRCDIR?=../main
-PSSRCDIR?=../gs/src
+PSSRCDIR?=../gs/psi
 SVGSRCDIR?=../svg
 PSLIBDIR?=../gs/lib
 ICCSRCDIR?=../gs/icclib
diff --git a/svg/svg_msvc.mak b/svg/svg_msvc.mak
index a67c77182..c37b1b0b5 100644
--- a/svg/svg_msvc.mak
+++ b/svg/svg_msvc.mak
@@ -37,7 +37,7 @@ MAINSRCDIR=..\main
 !endif
 
 !ifndef PSSRCDIR
-PSSRCDIR=..\gs\src
+PSSRCDIR=..\gs\psi
 !endif
 
 !ifndef SVGSRCDIR
diff --git a/tools/check_deps.py b/tools/check_deps.py
index 1d425f0b5..f3a0e64a2 100755
--- a/tools/check_deps.py
+++ b/tools/check_deps.py
@@ -5,7 +5,7 @@ import os, string
 # not used may use later
 def get_line_directives_table(file):
     # not intended to be portable or useful outside of gs universe.
-    CPP_FLAGS="-I../gs/src/ -I../pl/ -I../pcl -I../pxl -I../main/obj -DDEBUG"
+    CPP_FLAGS="-I../gs/base/ -I../gs/psi -I../pl/ -I../pcl -I../pxl -I../main/obj -DDEBUG"
     CPP="gcc -E"
     CPP_COMMAND=CPP + " " + CPP_FLAGS + " " + file
     CPP_IN=os.popen(CPP_COMMAND, 'r')
diff --git a/xps/xps_gcc.mak b/xps/xps_gcc.mak
index ee941d390..f48b9fedb 100644
--- a/xps/xps_gcc.mak
+++ b/xps/xps_gcc.mak
@@ -37,7 +37,7 @@ GENDIR?=./obj
 
 # The sources are taken from these directories:
 MAINSRCDIR?=../main
-PSSRCDIR?=../gs/src
+PSSRCDIR?=../gs/psi
 XPSSRCDIR?=../xps
 PSLIBDIR?=../gs/lib
 ICCSRCDIR?=../gs/icclib
diff --git a/xps/xps_msvc.mak b/xps/xps_msvc.mak
index 0692eb1ed..c60795ff4 100644
--- a/xps/xps_msvc.mak
+++ b/xps/xps_msvc.mak
@@ -37,7 +37,7 @@ MAINSRCDIR=..\main
 !endif
 
 !ifndef PSSRCDIR
-PSSRCDIR=..\gs\src
+PSSRCDIR=..\gs\psi
 !endif
 
 !ifndef XPSSRCDIR