248 files changed, 873 insertions, 747 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index 004c7fc07..d77847ed3 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -36,7 +36,8 @@ AK=$(GLGENDIR)\ccf32.tr
 clean_gs:
        nmake /f $(GLSRCDIR)\msvclib.mak \
        GLSRCDIR=$(GLSRCDIR) GLGENDIR=$(GLGENDIR) \
-        GLOBJDIR=$(GLOBJDIR) CONTRIBDIR=$(CONTRIBDIR) clean
+        GLOBJDIR=$(GLOBJDIR) CONTRIBDIR=$(CONTRIBDIR) \
+        DEVSRCDIR=$(DEVSRCDIR) DEVGENDIR=$(DEVGENDIR) clean
        -erase $(TARGET_XE).ilk
        -erase $(TARGET_XE).pdb
        -erase $(TARGET_XE).exp
@@ -107,11 +108,14 @@ $(GENDIR)/ldgs.tr: FORCE
        -if not exist $(GLGENDIR) mkdir $(GLGENDIR)
        -if not exist $(GLOBJDIR) mkdir $(GLOBJDIR)
        -if not exist $(AUXDIR) mkdir $(AUXDIR)
+        -if not exist $(DEVGENDIR) mkdir $(DEVGENDIR)
        $(MAKE) /F $(PSSRCDIR)\msvc32.mak MSVC_VERSION="$(MSVC_VERSION)" \
        BINDIR="$(BINDIR)" PSOBJDIR="$(PSOBJDIR)"\
        GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
+        DEVSRCDIR="$(DEVSRCDIR)" \
        DEBUGSYM=$(DEBUGSYM) TDEBUG=$(TDEBUG) AUXDIR="$(AUXDIR)" \
        GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
+        DEVGENDIR="$(DEVGENDIR)" DEVOBJDIR="$(DEVOBJDIR)" \
        CONTRIBDIR="$(CONTRIBDIR)" \
        EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
        EXPAT_CFLAGS="$(EXPAT_CFLAGS)" LCMSSRCDIR="$(LCMSSRCDIR)" \
@@ -161,8 +165,10 @@ $(GENDIR)/ldgs.tr: FORCE
        $(MAKE) /F $(GLSRCDIR)\msvclib.mak MSVC_VERSION="$(MSVC_VERSION)" \
        BINDIR="$(BINDIR)" PSOBJDIR="$(PSOBJDIR)"\
        GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
+        DEVSRCDIR="$(DEVSRCDIR)" \
        DEBUGSYM=$(DEBUGSYM) TDEBUG=$(TDEBUG) AUXDIR="$(AUXDIR)" \
        GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
+        DEVGENDIR="$(DEVGENDIR)" DEVOBJDIR="$(DEVOBJDIR)" \
        CONTRIBDIR="$(CONTRIBDIR)" \
        EXPATSRCDIR="$(EXPATSRCDIR)" SHARE_EXPAT="$(SHARE_EXPAT)" \
        EXPAT_CFLAGS="$(EXPAT_CFLAGS)" LCMSSRCDIR="$(LCMSSRCDIR)" \
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index 6d91b7926..024f044e5 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -59,8 +59,8 @@ include $(GLSRCDIR)/jbig2.mak
 include $(GLSRCDIR)/$(WHICH_CMS).mak
 include $(GLSRCDIR)/ijs.mak
 include $(GLSRCDIR)/tiff.mak
-include $(GLSRCDIR)/devs.mak
+include $(DEVSRCDIR)/devs.mak
-include $(GLSRCDIR)/contrib.mak
+include $(DEVSRCDIR)/contrib.mak
 include $(GLSRCDIR)/unix-aux.mak
 include $(GLSRCDIR)/unix-end.mak
 include $(GLSRCDIR)/version.mak
diff --git a/gs/base/Makefile.in b/gs/Makefile.in
index d37e9a686..c51d512a4 100644
--- a/gs/base/Makefile.in
+++ b/gs/Makefile.in
@@ -25,8 +25,11 @@
 BINDIR=./$(BUILDDIRPREFIX)bin
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
 GLOBJDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
+DEVGENDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
+DEVOBJDIR=./$(BUILDDIRPREFIX)@OBJDIR_BSDMAKE_WORKAROUND@
 AUXDIR=$(GLGENDIR)/aux@AUXDIRPOSTFIX@
 PSSRCDIR=./psi
 PSLIBDIR=./lib
@@ -602,8 +605,8 @@ include $(GLSRCDIR)/$(WHICH_CMS).mak
 include $(GLSRCDIR)/ijs.mak
 @LCUPSINCLUDE@
 @LCUPSIINCLUDE@
-include $(GLSRCDIR)/devs.mak
+include $(DEVSRCDIR)/devs.mak
-include $(GLSRCDIR)/contrib.mak
+include $(DEVSRCDIR)/contrib.mak
 include $(GLSRCDIR)/unix-aux.mak
 include $(GLSRCDIR)/unixlink.mak
 include $(GLSRCDIR)/unix-dll.mak
diff --git a/gs/autogen.sh b/gs/autogen.sh
index 8579b6937..30f865df4 100755
--- a/gs/autogen.sh
+++ b/gs/autogen.sh
@@ -19,11 +19,6 @@ cd "$srcdir"
 echo "Generating configuration files for $package, please wait...."
-echo "  creating links to configuration sources"
-rm -f configure.ac Makefile.in
-ln -s base/configure.ac .
-ln -s base/Makefile.in .
 echo "  running autoconf"
 autoconf || exit 1
diff --git a/gs/base/lib.mak b/gs/base/lib.mak
index 022b90b6f..a171c14f6 100644
--- a/gs/base/lib.mak
+++ b/gs/base/lib.mak
@@ -51,6 +51,13 @@ GLLCMS2CC=$(CC) $(CFLAGS) $(I_)$(GLI_) $(II)$(LCMS2SRCDIR)$(D)include$(_I) $(GLF
 lcms2_h=$(LCMS2SRCDIR)$(D)include$(D)lcms2.h
 lcms2_plugin_h=$(LCMS2SRCDIR)$(D)include$(D)lcms2_plugin.h
+ConvertUTF_h=$(GLSRC)ConvertUTF.h
+gdevdcrd_h=$(GLSRC)gdevdcrd.h
+gdevpccm_h=$(GLSRC)gdevpccm.h
+gs_mro_e_h=$(GLSRC)gs_mro_e.h
+gs_mgl_e_h=$(GLSRC)gs_mgl_e.h
 # All top-level makefiles define GLD.
 #GLD=$(GLGEN)
 # Define the name of this makefile.
@@ -474,7 +481,7 @@ gxclipm_h=$(GLSRC)gxclipm.h $(gxmclip_h)
 gxctable_h=$(GLSRC)gxctable.h $(gxfixed_h) $(gxfrac_h)
 gxfcache_h=$(GLSRC)gxfcache.h $(gsccode_h) $(gsuid_h) $(gsxfont_h)\
 $(gxbcache_h) $(gxfixed_h) $(gxftype_h)
-gxfcopy_h=$(GLSRC)gxfcopy.h $(gsccode_h)
 gxfont_h=$(GLSRC)gxfont.h\
 $(gsccode_h) $(gsfont_h) $(gsgdata_h) $(gsmatrix_h) $(gsnotify_h)\
 $(gsstype_h) $(gsuid_h)\
@@ -589,6 +596,16 @@ ttfoutl_h=$(GLSRC)ttfoutl.h
 gxttfb_h = $(GLSRC)gxttfb.h $(ttfoutl_h)
 gzspotan_h = $(GLSRC)gzspotan.h $(gxdevcli_h)
+gdevpxen_h=$(GLSRC)gdevpxen.h
+gdevpxat_h=$(GLSRC)gdevpxat.h
+gdevpxop_h=$(GLSRC)gdevpxop.h
+gsequivc_h=$(GLSRC)gsequivc.h
+gdevdevn_h=$(GLSRC)gdevdevn.h $(gsequivc_h)
+png__h=$(GLSRC)png_.h $(MAKEFILE)
+x__h=$(GLSRC)x_.h
 ### Executable code
 # gconfig and gscdefs are handled specially.  Currently they go in psbase
@@ -1035,6 +1052,15 @@ $(GLOBJ)gsiodevs.$(OBJ) : $(GLSRC)gsiodevs.c $(AK) $(gx_h)\
 ###### Internal devices
+### Device support
+# PC display color mapping
+$(GLOBJ)gdevpccm.$(OBJ) : $(GLSRC)gdevpccm.c $(AK)\
+ $(gx_h) $(gsmatrix_h) $(gxdevice_h) $(gdevpccm_h)
+        $(GLCC) $(GLO_)gdevpccm.$(OBJ) $(C_) $(GLSRC)gdevpccm.c
+$(GLOBJ)ConvertUTF.$(OBJ) : $(GLSRC)ConvertUTF.c $(ConvertUTF_h)
+        $(GLCC) $(GLO_)ConvertUTF.$(OBJ) $(C_) $(GLSRC)ConvertUTF.c
 ### Memory devices
 $(GLOBJ)gdevmem.$(OBJ) : $(GLSRC)gdevmem.c $(AK) $(gx_h) $(gserrors_h) \
@@ -1131,15 +1157,6 @@ $(GLOBJ)gdevhit.$(OBJ) : $(GLSRC)gdevhit.c $(AK) $(std_h)\
 $(MAKEDIRS)
        $(GLCC) $(GLO_)gdevhit.$(OBJ) $(C_) $(GLSRC)gdevhit.c
-# ink coverage device  --  a device that records the ink coverage
-# on each page, and discards the page.
-$(GLD)inkcov.dev : $(ECHOGS_XE) $(LIB_MAK) $(GLOBJ)gdevicov.$(OBJ)
-        $(SETDEV2) $(GLD)inkcov $(GLOBJ)gdevicov.$(OBJ)
-$(GLOBJ)gdevicov.$(OBJ) : $(GLSRC)gdevicov.c $(AK) $(MAKEDIRS) \
-  $(arch_h) $(gdevprn_h) $(stdio__h)  $(stdint__h)
-        $(GLCC) $(GLO_)gdevicov.$(OBJ) $(C_) $(GLSRC)gdevicov.c
 # A device that stores its data using run-length encoding.
 $(GLOBJ)gdevmrun.$(OBJ) : $(GLSRC)gdevmrun.c $(AK) $(gx_h)\
@@ -2518,75 +2535,6 @@ $(GLOBJ)gstype2.$(OBJ) : $(GLSRC)gstype2.c $(AK) $(gx_h) $(gserrors_h)\
 $(gxpath_h) $(gxhintn_h) $(MAKEDIRS)
        $(GLCC) $(GLO_)gstype2.$(OBJ) $(C_) $(GLSRC)gstype2.c
-# ---------------- Font writing ---------------- #
-# This is not really a library facility, but one piece of interpreter test
-# code uses it.
-# Support for PostScript and PDF font writing
-gdevpsf_h=$(GLSRC)gdevpsf.h $(gsccode_h) $(gsgdata_h)
-psf_1=$(GLOBJ)gdevpsf1.$(OBJ) $(GLOBJ)gdevpsf2.$(OBJ) $(GLOBJ)gdevpsfm.$(OBJ)
-psf_2=$(GLOBJ)gdevpsft.$(OBJ) $(GLOBJ)gdevpsfu.$(OBJ) $(GLOBJ)gdevpsfx.$(OBJ)
-psf_3=$(GLOBJ)spsdf.$(OBJ)
-psf_=$(psf_1) $(psf_2) $(psf_3)
-$(GLD)psf.dev : $(LIB_MAK) $(ECHOGS_XE) $(psf_)
-        $(SETMOD) $(DD)psf $(psf_1)
-        $(ADDMOD) $(DD)psf -obj $(psf_2)
-        $(ADDMOD) $(DD)psf -obj $(psf_3)
-$(GLOBJ)gdevpsf1.$(OBJ) : $(GLSRC)gdevpsf1.c $(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gsccode_h) $(gsmatrix_h)\
- $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
- $(sfilter_h) $(sstring_h) $(stream_h) $(strimpl_h)\
- $(gdevpsf_h) $(spprint_h) $(spsdf_h) $(math_h) $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsf1.$(OBJ) $(C_) $(GLSRC)gdevpsf1.c
-$(GLOBJ)gdevpsf2.$(OBJ) : $(GLSRC)gdevpsf2.c $(AK) $(gx_h)\
- $(gserrors_h) $(math__h) $(memory__h) $(gxarith_h) $(gsutil_h)\
- $(gsccode_h) $(gscencs_h) $(gscrypt1_h) $(gsmatrix_h)\
- $(gxfcid_h) $(gxfixed_h) $(gxfont_h) $(gxfont1_h)\
- $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsf2.$(OBJ) $(C_) $(GLSRC)gdevpsf2.c
-$(GLOBJ)gdevpsfm.$(OBJ) : $(GLSRC)gdevpsfm.c $(AK) $(gx_h)\
- $(gserrors_h) $(gdevpsf_h) $(gxfcmap_h) $(spprint_h) $(spsdf_h) $(stream_h)\
- $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsfm.$(OBJ) $(C_) $(GLSRC)gdevpsfm.c
-$(GLOBJ)gdevpsft.$(OBJ) : $(GLSRC)gdevpsft.c $(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gscencs_h) $(gsmatrix_h) $(gsutil_h)\
- $(gxfcid_h) $(gxfont_h) $(gxfont42_h) $(gxttf_h)\
- $(spprint_h) $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsft.$(OBJ) $(C_) $(GLSRC)gdevpsft.c
-$(GLOBJ)gdevpsfu.$(OBJ) : $(GLSRC)gdevpsfu.c $(AK) $(gx_h)\
- $(gserrors_h) $(memory__h) $(gsmatrix_h) $(gxfont_h) $(gdevpsf_h)\
- $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsfu.$(OBJ) $(C_) $(GLSRC)gdevpsfu.c
-$(GLOBJ)gdevpsfx.$(OBJ) : $(GLSRC)gdevpsfx.c $(AK) $(gx_h)\
- $(gserrors_h) $(math__h) $(memory__h)\
- $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
- $(stream_h) $(gdevpsf_h) $(gxistate_h) $(MAKEDIRS)
-        $(GLCC) $(GLO_)gdevpsfx.$(OBJ) $(C_) $(GLSRC)gdevpsfx.c
-# ---------------- Font copying ---------------- #
-# This facility is not included in the core library.  Currently it is used
-# only by pdfwrite.
-fcopy_=$(GLOBJ)gxfcopy.$(OBJ)
-$(GLD)fcopy.dev : $(DEVS_MAK) $(ECHOGS_XE) $(fcopy_)
-        $(SETMOD) $(GLD)fcopy $(fcopy_)
-$(GLOBJ)gxfcopy.$(OBJ) : $(GLSRC)gxfcopy.c $(memory__h) $(AK) $(gx_h)\
- $(gserrors_h) $(gscencs_h) $(gsline_h) $(gspaint_h) $(gspath_h) $(gsstruct_h)\
- $(gsutil_h) $(gschar_h) $(gxfont_h) $(gxfont1_h) $(gxfont42_h) $(gxchar_h)\
- $(gxfcid_h) $(gxfcopy_h) $(gxfcache_h) $(gxistate_h) $(gxtext_h) $(gxtype1_h)\
- $(smd5_h) $(gzstate_h) $(gdevpsf_h) $(stream_h) $(MAKEDIRS)
-        $(GLCC) $(GLO_)gxfcopy.$(OBJ) $(C_) $(GLSRC)gxfcopy.c
 # -------- Level 1 color extensions (CMYK color and colorimage) -------- #
 cmyklib_=$(GLOBJ)gscolor1.$(OBJ) $(GLOBJ)gsht1.$(OBJ)
@@ -2996,6 +2944,39 @@ traplib_=$(GLOBJ)gsparamx.$(OBJ) $(GLOBJ)gstrap.$(OBJ)
 $(GLD)traplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(traplib_)
        $(SETMOD) $(GLD)traplib $(traplib_)
+### ------------------------ The DeviceN device ------------------------ ###
+# Required by transparency
+devn_=$(GLOBJ)gdevdevn.$(OBJ)
+$(DD)spotcmyk.dev : $(LIB_MAK) $(devn_) $(GLD)page.dev $(GDEV)
+        $(SETDEV) $(DD)spotcmyk $(devn_)
+$(DD)devicen.dev : $(LIB_MAK) $(devn_) $(GLD)page.dev $(GDEV)
+        $(SETDEV) $(DD)devicen $(devn_)
+$(GLOBJ)gdevdevn.$(OBJ) : $(GLSRC)gdevdevn.c $(gx_h) $(math__h) $(string__h)\
+ $(gdevprn_h) $(gsparam_h) $(gscrd_h) $(gscrdp_h) $(gxlum_h) $(gdevdcrd_h)\
+ $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h) $(gdevp14_h)\
+ $(gxblend_h)
+        $(GLCC) $(GLO_)gdevdevn.$(OBJ) $(C_) $(GLSRC)gdevdevn.c
+# Provide a sample device CRD.
+# Required by transparency
+$(GLOBJ)gdevdcrd.$(OBJ) : $(GLSRC)gdevdcrd.c $(AK)\
+ $(math__h) $(memory__h) $(string__h)\
+ $(gscrd_h) $(gscrdp_h) $(gserrors_h) $(gsparam_h) $(gscspace_h)\
+ $(gx_h) $(gxdevcli_h) $(gdevdcrd_h)
+        $(GLCC) $(GLO_)gdevdcrd.$(OBJ) $(C_) $(GLSRC)gdevdcrd.c
+$(GLOBJ)gsequivc.$(OBJ) : $(GLSRC)gsequivc.c $(math__h)\
+ $(PDEVH) $(gsparam_h) $(gstypes_h) $(gxdconv_h) $(gdevdevn_h)\
+ $(gsequivc_h) $(gzstate_h) $(gsstate_h) $(gscspace_h) $(gxcspace_h)\
+ $(gsicc_manage_h) $(gxdevsop_h)
+        $(GLCC) $(GLO_)gsequivc.$(OBJ) $(C_) $(GLSRC)gsequivc.c
 # ---------------- Transparency ---------------- #
 gsipar3x_h=$(GLSRC)gsipar3x.h $(gsiparam_h) $(gsiparm3_h)
diff --git a/gs/base/macos-mcp.mak b/gs/base/macos-mcp.mak
index 5387a9967..0d1d4caa5 100644
--- a/gs/base/macos-mcp.mak
+++ b/gs/base/macos-mcp.mak
@@ -28,8 +28,11 @@
 BINDIR=./bin
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./obj
 GLOBJDIR=./obj
+DEVGENDIR=./obj
+DEVOBJDIR=./obj
 PSSRCDIR=./psi
 PSLIBDIR=./lib
 PSRESDIR=./Resource
diff --git a/gs/base/macosx.mak b/gs/base/macosx.mak
index c57553e8c..efc65f0aa 100644
--- a/gs/base/macosx.mak
+++ b/gs/base/macosx.mak
@@ -24,8 +24,11 @@
 BINDIR=./$(BUILDDIRPREFIX)bin
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./$(BUILDDIRPREFIX)obj
 GLOBJDIR=./$(BUILDDIRPREFIX)obj
+DEVGENDIR=./$(BUILDDIRPREFIX)obj
+DEVOBJDIR=./$(BUILDDIRPREFIX)obj
 AUXDIR=$(GLGENDIR)/aux
 PSSRCDIR=./psi
 PSLIBDIR=./lib
diff --git a/gs/base/msvclib.mak b/gs/base/msvclib.mak
index 0378d4fc5..5c493798d 100644
--- a/gs/base/msvclib.mak
+++ b/gs/base/msvclib.mak
@@ -100,6 +100,9 @@ BINDIR=.\bin
 !endif
 !ifndef GLSRCDIR
 GLSRCDIR=.\base
+!ifndef DEVSRCDIR
+DEVSRCDIR=.\devices
+!endif
 !ifndef PSRESDIR
 PSRESDIR=.\Resource
 !endif
@@ -119,6 +122,18 @@ GLOBJDIR=.\obj
 !endif
 !endif
+!ifndef DEVGENDIR
+!if "$(DEBUG)"="1"
+DEVGENDIR=.\debugobj
+!else
+DEVGENDIR=.\obj
+!endif
+!ifndef DEVOBJDIR
+DEVOBJDIR=$(DEVGENDIR)
+!endif
 # Do not edit the next group of lines.
 NUL=
 DD=$(GLGENDIR)\$(NUL)
diff --git a/gs/base/openvms.mak b/gs/base/openvms.mak
index 8e4c3ddfe..d3365c682 100644
--- a/gs/base/openvms.mak
+++ b/gs/base/openvms.mak
@@ -33,8 +33,11 @@
 BINDIR=[.bin]
 GLSRCDIR=[.base]
+DEVSRCDIR=[.devices]
 GLGENDIR=[.obj]
 GLOBJDIR=[.obj]
+DEVGENDIR=[.obj]
+DEVOBJDIR=[.obj]
 PSSRCDIR=[.psi]
 PSLIBDIR=[.lib]
 PSGENDIR=[.obj]
diff --git a/gs/base/openvms.mmk b/gs/base/openvms.mmk
index 1ac6cae7f..83c4765b3 100644
--- a/gs/base/openvms.mmk
+++ b/gs/base/openvms.mmk
@@ -32,8 +32,11 @@
 BINDIR=[.bin]
 GLSRCDIR=[.base]
+DEVSRCDIR=[.devices]
 GLGENDIR=[.obj]
 GLOBJDIR=[.obj]
+DEVGENDIR=[.obj]
+DEVOBJDIR=[.obj]
 PSSRCDIR=[.psi]
 PSGENDIR=[.obj]
 PSOBJDIR=[.obj]
diff --git a/gs/base/pcwin.mak b/gs/base/pcwin.mak
index bb7d08772..bebc7ffc5 100644
--- a/gs/base/pcwin.mak
+++ b/gs/base/pcwin.mak
@@ -28,24 +28,24 @@ gp_mswin_h=$(GLSRC)gp_mswin.h
 gsdll_h=$(GLSRC)gsdll.h
 gsdllwin_h=$(GLSRC)gsdllwin.h
-gdevmswn_h=$(GLSRC)gdevmswn.h $(GDEVH)\
+gdevmswn_h=$(DEVSRC)gdevmswn.h $(GDEVH)\
 $(dos__h) $(memory__h) $(string__h) $(windows__h)\
 $(gp_mswin_h)
 # This is deprecated and requires the interpreter / PSSRCDIR.
-$(GLOBJ)gdevmswn.$(OBJ): $(GLSRC)gdevmswn.c $(gdevmswn_h) $(gp_h) $(gpcheck_h)\
+$(GLOBJ)gdevmswn.$(OBJ): $(DEVSRC)gdevmswn.c $(gdevmswn_h) $(gp_h) $(gpcheck_h)\
 $(gsdll_h) $(gsdllwin_h) $(gsparam_h) $(gdevpccm_h)
-        $(GLCCWIN) -I$(PSSRCDIR) $(GLO_)gdevmswn.$(OBJ) $(C_) $(GLSRC)gdevmswn.c
+        $(GLCCWIN) -I$(PSSRCDIR) -I$(DEVSRCDIR) $(GLO_)gdevmswn.$(OBJ) $(C_) $(DEVSRC)gdevmswn.c
-$(GLOBJ)gdevmsxf.$(OBJ): $(GLSRC)gdevmsxf.c $(ctype__h) $(math__h) $(memory__h) $(string__h)\
+$(GLOBJ)gdevmsxf.$(OBJ): $(DEVSRC)gdevmsxf.c $(ctype__h) $(math__h) $(memory__h) $(string__h)\
 $(gdevmswn_h) $(gsstruct_h) $(gsutil_h) $(gxxfont_h)
-        $(GLCCWIN) $(GLO_)gdevmsxf.$(OBJ) $(C_) $(GLSRC)gdevmsxf.c
+        $(GLCCWIN) $(GLO_)gdevmsxf.$(OBJ) $(C_) $(DEVSRC)gdevmsxf.c
 # An implementation using a DIB filled by an image device.
 # This is deprecated and requires the interpreter / PSSRCDIR.
-$(GLOBJ)gdevwdib.$(OBJ): $(GLSRC)gdevwdib.c\
+$(GLOBJ)gdevwdib.$(OBJ): $(DEVSRC)gdevwdib.c\
 $(gdevmswn_h) $(gsdll_h) $(gsdllwin_h) $(gxdevmem_h)
-        $(GLCCWIN) -I$(PSSRCDIR) $(GLO_)gdevwdib.$(OBJ) $(C_) $(GLSRC)gdevwdib.c
+        $(GLCCWIN) -I$(PSSRCDIR) $(GLO_)gdevwdib.$(OBJ) $(C_) $(DEVSRC)gdevwdib.c
 mswindll1_=$(GLOBJ)gdevmswn.$(OBJ) $(GLOBJ)gdevmsxf.$(OBJ) $(GLOBJ)gdevwdib.$(OBJ)
 mswindll2_=$(GLOBJ)gdevemap.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
@@ -69,9 +69,9 @@ mswinpr2_=$(GLOBJ)gdevwpr2.$(OBJ)
 $(DD)mswinpr2.dev: $(mswinpr2_) $(GLD)page.dev
        $(SETPDEV) $(DD)mswinpr2 $(mswinpr2_)
-$(GLOBJ)gdevwpr2.$(OBJ): $(GLSRC)gdevwpr2.c $(PDEVH) $(windows__h)\
+$(GLOBJ)gdevwpr2.$(OBJ): $(DEVSRC)gdevwpr2.c $(PDEVH) $(windows__h)\
 $(gdevpccm_h) $(gp_h) $(gp_mswin_h) $(gsicc_manage_h)
-        $(GLCCWIN) $(GLO_)gdevwpr2.$(OBJ) $(C_) $(GLSRC)gdevwpr2.c
+        $(GLCCWIN) $(GLO_)gdevwpr2.$(OBJ) $(C_) $(DEVSRC)gdevwpr2.c
 ### --------------------------- The OS/2 printer ------------------------ ###
diff --git a/gs/base/ugcclib.mak b/gs/base/ugcclib.mak
index ba1385844..559409406 100644
--- a/gs/base/ugcclib.mak
+++ b/gs/base/ugcclib.mak
@@ -16,8 +16,11 @@
 BINDIR=./libobj
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./libobj
 GLOBJDIR=./libobj
+DEVGENDIR=./libobj
+DEVOBJDIR=./libobj
 PSRESDIR=./Resource
 DD=$(GLGENDIR)/
 GLD=$(GLGENDIR)/
diff --git a/gs/base/unix-dll.mak b/gs/base/unix-dll.mak
index 5bfa9b726..03f6cbd45 100644
--- a/gs/base/unix-dll.mak
+++ b/gs/base/unix-dll.mak
@@ -176,7 +176,7 @@ install-so-subtarget: so-subtarget$(FOR_MAC)
        ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
        $(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
        $(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
-        $(INSTALL_DATA) $(GLSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
+        $(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
 soinstall:
        $(MAKE) soinstall-subtarget BUILDDIRPREFIX=$(SODIRPREFIX)
diff --git a/gs/base/unix-gcc.mak b/gs/base/unix-gcc.mak
index 02642d98b..c65ab06c4 100644
--- a/gs/base/unix-gcc.mak
+++ b/gs/base/unix-gcc.mak
@@ -24,8 +24,11 @@
 BINDIR=./$(BUILDDIRPREFIX)bin
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./$(BUILDDIRPREFIX)obj
 GLOBJDIR=./$(BUILDDIRPREFIX)obj
+DEVGENDIR=./$(BUILDDIRPREFIX)obj
+DEVOBJDIR=./$(BUILDDIRPREFIX)obj
 AUXDIR=$(GLGENDIR)/aux
 PSSRCDIR=./psi
 PSLIBDIR=./lib
diff --git a/gs/base/unixansi.mak b/gs/base/unixansi.mak
index 9ac10d653..f006811a9 100644
--- a/gs/base/unixansi.mak
+++ b/gs/base/unixansi.mak
@@ -24,8 +24,11 @@
 BINDIR=./$(BUILDDIRPREFIX)bin
 GLSRCDIR=./base
+DEVSRCDIR=./devices
 GLGENDIR=./$(BUILDDIRPREFIX)obj
 GLOBJDIR=./$(BUILDDIRPREFIX)obj
+DEVGENDIR=./$(BUILDDIRPREFIX)obj
+DEVOBJDIR=./$(BUILDDIRPREFIX)obj
 AUXDIR=$(GLGENDIR)/aux
 PSSRCDIR=./psi
 PSLIBDIR=./lib
diff --git a/gs/base/winlib.mak b/gs/base/winlib.mak
index 6d89aa2f9..3a1d7882a 100644
--- a/gs/base/winlib.mak
+++ b/gs/base/winlib.mak
@@ -151,8 +151,8 @@ BEGINFILES=$(GLGENDIR)\ccf32.tr\
 !include $(GLSRCDIR)\ijs.mak
 !include $(GLSRCDIR)\lcups.mak
 !include $(GLSRCDIR)\lcupsi.mak
-!include $(GLSRCDIR)\devs.mak
+!include $(DEVSRCDIR)\devs.mak
-!include $(GLSRCDIR)\contrib.mak
+!include $(DEVSRCDIR)\contrib.mak
 !include $(CONTRIBDIR)\contrib.mak
 # Define the compilation rule for Windows devices.
diff --git a/gs/base/configure.ac b/gs/configure.ac
index c2b19f45e..c2b19f45e 100644
--- a/gs/base/configure.ac
+++ b/gs/configure.ac
diff --git a/gs/contrib/contrib.mak b/gs/contrib/contrib.mak
index bf3248bf9..08a80d131 100644
--- a/gs/contrib/contrib.mak
+++ b/gs/contrib/contrib.mak
@@ -155,13 +155,13 @@ CONTRIBSRC=$(CONTRIBDIR)$(D)
 bjc_h=$(CONTRIBSRC)gdevbjc_.h
-bjc_=$(GLOBJ)gdevbjc_.$(OBJ) $(GLOBJ)gdevbjca.$(OBJ)
+bjc_=$(DEVOBJ)gdevbjc_.$(OBJ) $(DEVOBJ)gdevbjca.$(OBJ)
-$(GLOBJ)gdevbjc_.$(OBJ) : $(CONTRIBSRC)gdevbjc_.c $(PDEVH) $(bjc_h)
+$(DEVOBJ)gdevbjc_.$(OBJ) : $(CONTRIBSRC)gdevbjc_.c $(PDEVH) $(bjc_h)
-        $(GLCC) $(GLO_)gdevbjc_.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjc_.c
+        $(DEVCC) $(DEVO_)gdevbjc_.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjc_.c
-$(GLOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h)
+$(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h)
-        $(GLCC) $(GLO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
+        $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c
 $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev
        $(SETPDEV) $(DD)bjcmono $(bjc_)
@@ -178,7 +178,7 @@ $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev
 ### -------------- cdj850 - HP 850c Driver under development ------------- ###
-cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
+cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL)
 # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de)
 # Printer: HP 670
@@ -200,9 +200,9 @@ $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
 $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
        $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
-$(GLOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
+$(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\
 $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(CONTRIBSRC)gdevcd8.c
+        $(DEVCC) $(DEVO_)gdevcd8.$(OBJ) $(C_) $(CONTRIBSRC)gdevcd8.c
 ### -------------- cdj880 - HP 880c Driver under development ------------- ###
@@ -220,16 +220,16 @@ $(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
 ### ------------- cdj970 - HP 970Cxi Driver under development ------------- ###
-cdeskjet9_=$(GLOBJ)gdevdj9.$(OBJ) $(HPPCL)
+cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL)
 # Author: Rene Harsch (rene@harsch.net)
 # Printer: HP 970Cxi
 $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev
        $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
-$(GLOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
+$(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\
 $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(CONTRIBSRC)gdevdj9.c
+        $(DEVCC) $(DEVO_)gdevdj9.$(OBJ) $(C_) $(CONTRIBSRC)gdevdj9.c
 
 ### -------------- cdnj500 - HP DesignJet 500 ------------- ###
@@ -252,7 +252,7 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
 ### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
 ###
-GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
+GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL)
 $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev
        $(SETPDEV) $(DD)gdi $(GDIMONO)
@@ -260,15 +260,15 @@ $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev
 $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev
        $(SETPDEV) $(DD)samsunggdi $(GDIMONO)
-$(GLOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(CONTRIBSRC)gdevgdi.c
+        $(DEVCC) $(DEVO_)gdevgdi.$(OBJ) $(C_) $(CONTRIBSRC)gdevgdi.c
 ### ---------------- The Brother HL-1240/HL-1250 printers --------------- ###
 ### These printers are ljet4-compatible, plus support for source tray     ###
 ### selection and special 1200x600 dpi mode.                              ###
-hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
+hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM)
 $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
        $(SETPDEV) $(DD)hl1250 $(hl1250_)
@@ -277,13 +277,13 @@ $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
 # Author: Marek Michalkiewicz <marekm@linux.org.pl>
 # Printer: Brother HL-1250 (may work with some other models too)
-$(GLOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
+$(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
-        $(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
+        $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c
 ### -------- The DEC LN03/DL2100/LA50/LA70/LA75 printer devices -------- ###
-ln03_=$(GLOBJ)gdevln03.$(OBJ)
+ln03_=$(DEVOBJ)gdevln03.$(OBJ)
 # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch)
 # Printer: DEC LN03
@@ -315,8 +315,8 @@ $(DD)la75.dev : $(ln03_) $(DD)page.dev
 $(DD)la75plus.dev : $(ln03_) $(DD)page.dev
        $(SETPDEV) $(DD)la75plus $(ln03_)
-$(GLOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH)
+$(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevln03.$(OBJ) $(C_) $(CONTRIBSRC)gdevln03.c
+        $(DEVCC) $(DEVO_)gdevln03.$(OBJ) $(C_) $(CONTRIBSRC)gdevln03.c
 ### -------------------------- EPSON Page/Color -------------------------- ###
@@ -327,10 +327,10 @@ ESCV_DIR=$(CONTRIBSRC)eplaser
 ESCV_SRC=$(ESCV_DIR)$(D)
 escv_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR)
-escv_=$(GLOBJ)gdevescv.$(OBJ)
+escv_=$(DEVOBJ)gdevescv.$(OBJ)
-$(GLOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) $(time__h)
+$(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) $(time__h)
-        $(GLCC) -DA4 $(GLO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
+        $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c
 $(DD)alc1900.dev : $(escv_) $(DD)page.dev
        $(SETPDEV) $(DD)alc1900 $(escv_)
@@ -490,32 +490,32 @@ $(DD)eplmono.dev: $(escv_) $(DD)page.dev
 # ------ The Lexmark 5700 and 7000 devices ------ #
-lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
+lex7000_=$(DEVOBJ)gdevlx7.$(OBJ)
 $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev
        $(SETPDEV) $(DD)lex7000 $(lex7000_)
-lex5700_=$(GLOBJ)gdevlx7.$(OBJ)
+lex5700_=$(DEVOBJ)gdevlx7.$(OBJ)
 $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev
        $(SETPDEV) $(DD)lex5700 $(lex5700_)
-lex3200_=$(GLOBJ)gdevlx7.$(OBJ)
+lex3200_=$(DEVOBJ)gdevlx7.$(OBJ)
 $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev
        $(SETPDEV) $(DD)lex3200 $(lex3200_)
-lex2050_=$(GLOBJ)gdevlx7.$(OBJ)
+lex2050_=$(DEVOBJ)gdevlx7.$(OBJ)
 $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev
        $(SETPDEV) $(DD)lex2050 $(lex2050_)
-$(GLOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH)
+$(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx7.c
+        $(DEVCC) $(DEVO_)gdevlx7.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx7.c
 ### ----------- Lexmark 3200 device ------------ ###
-lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
+lxm3200_=$(DEVOBJ)gdevlx32.$(OBJ)
-$(GLOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
+$(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
-        $(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
+        $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c
 $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev
        $(SETPDEV) $(DD)lxm3200 $(lxm3200_)
@@ -527,32 +527,32 @@ LIPS_DIR=$(CONTRIBSRC)lips4
 LIPS_SRC=$(LIPS_DIR)$(D)
 LIPS_OPT=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) $(I_)$(LIPS_SRC) $(II)$(PSSRC)$(_I)
-$(GLOBJ)gdevlprn.$(OBJ) : $(LIPS_SRC)gdevlprn.c $(LIPS_SRC)gdevlprn.h\
+$(DEVOBJ)gdevlprn.$(OBJ) : $(LIPS_SRC)gdevlprn.c $(LIPS_SRC)gdevlprn.h\
 $(gdevprn_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlprn.c
+        $(DEVCC) $(DEVO_)gdevlprn.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlprn.c
-lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
+lipsr_=$(DEVOBJ)gdevl4r.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) $(DEVOBJ)gdevlprn.$(OBJ)
-$(GLOBJ)gdevl4r.$(OBJ) : $(LIPS_SRC)gdevl4r.c $(LIPS_SRC)gdevlips.h $(PDEVH)
+$(DEVOBJ)gdevl4r.$(OBJ) : $(LIPS_SRC)gdevl4r.c $(LIPS_SRC)gdevlips.h $(PDEVH)
-        $(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(LIPS_OPT) $(C_)\
+        $(DEVCC) -DA4 $(DEVO_)gdevl4r.$(OBJ) $(LIPS_OPT) $(C_)\
 $(LIPS_SRC)gdevl4r.c
-$(GLOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h)
+$(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h)
-        $(GLCC) $(GLO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
+        $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c
 $(DD)lips4.dev : $(lipsr_) $(DD)page.dev
        $(SETPDEV) $(DD)lips4 $(lipsr_)
-lipsv_=$(GLOBJ)gdevl4v.$(OBJ) $(GLOBJ)gdevlips.$(OBJ)
+lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
 $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev
        $(SETDEV) $(DD)lips4v $(lipsv_)
        $(ADDMOD) $(DD)lips4v -include $(GLD)vector
-$(GLOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\
+$(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\
 $(math__h) $(gscspace_h) $(gsutil_h) $(gsparam_h) $(gsmatrix_h) $(gdevvec_h)\
 $(ghost_h) $(gzstate_h) $(igstate_h)
-        $(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(LIPS_OPT) $(C_)\
+        $(DEVCC) -DA4 $(DEVO_)gdevl4v.$(OBJ) $(LIPS_OPT) $(C_)\
 $(LIPS_SRC)gdevl4v.c
 ### --------------- Some extra devices: lips2p, bjc880j ---------------- ###
@@ -566,7 +566,7 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev
 ### ------------ ALPS MD series printer devices ------------ ###
-md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
+md2k_=$(DEVOBJ)gdevmd2k.$(OBJ)
 $(DD)md2k.dev : $(md2k_) $(DD)page.dev
        $(SETPDEV) $(DD)md2k $(md2k_)
@@ -574,30 +574,30 @@ $(DD)md2k.dev : $(md2k_) $(DD)page.dev
 $(DD)md5k.dev : $(md2k_) $(DD)page.dev
        $(SETPDEV) $(DD)md5k $(md2k_)
-$(GLOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
+$(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
-        $(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
+        $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c
 
 ###--------------- IBM Omni Driver Framework --------------------------###
 epclr_h1=$(CONTRIBSRC)defs.h
-$(DD)omni.dev : $(GLOBJ)gomni.$(OBJ) $(DD)page.dev
+$(DD)omni.dev : $(DEVOBJ)gomni.$(OBJ) $(DD)page.dev
-        $(SETPDEV) $(DD)omni $(GLOBJ)gomni.$(OBJ)
+        $(SETPDEV) $(DD)omni $(DEVOBJ)gomni.$(OBJ)
-$(GLOBJ)gomni.$(OBJ) : $(CONTRIBSRC)gomni.c $(epclr_h1) $(PDEVH)
+$(DEVOBJ)gomni.$(OBJ) : $(CONTRIBSRC)gomni.c $(epclr_h1) $(PDEVH)
-        $(GLCC) $(GLO_)gomni.$(OBJ) $(C_) $(CONTRIBSRC)gomni.c
+        $(DEVCC) $(DEVO_)gomni.$(OBJ) $(C_) $(CONTRIBSRC)gomni.c
 ### ----------------- The Okidata OkiPage 4w+ device ------------------- ###
-oki4w_=$(GLOBJ)gdevop4w.$(OBJ)
+oki4w_=$(DEVOBJ)gdevop4w.$(OBJ)
 $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev
        $(SETPDEV) $(DD)oki4w $(oki4w_)
 # Author: Ivan Schreter (ivan@shadow.sk)
 # Printer: Okidata OkiPage 4w+
-$(GLOBJ)gdevop4w.$(OBJ) : $(CONTRIBSRC)gdevop4w.c $(PDEVH)
+$(DEVOBJ)gdevop4w.$(OBJ) : $(CONTRIBSRC)gdevop4w.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevop4w.$(OBJ) $(C_) $(CONTRIBSRC)gdevop4w.c
+        $(DEVCC) $(DEVO_)gdevop4w.$(OBJ) $(C_) $(CONTRIBSRC)gdevop4w.c
 ### ---------------- OpenPrinting Vector Printer Driver ---------------- ###
@@ -606,11 +606,11 @@ OPVP_DIR=$(CONTRIBSRC)opvp
 OPVP_SRC=$(OPVP_DIR)$(D)
 OPVP_OPT=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) $(I_)$(PSSRC)$(_I)
-opvp_=$(GLOBJ)gdevopvp.$(OBJ)
+opvp_=$(DEVOBJ)gdevopvp.$(OBJ)
-$(GLOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\
+$(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\
 $(PDEVH)
-        $(GLCC) $(GLO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
+        $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c
 $(DD)opvp.dev : $(opvp_) $(DD)page.dev
        $(SETPDEV) $(DD)opvp $(opvp_)
@@ -696,9 +696,9 @@ eprn_dir=$(CONTRIBSRC)pcl3$(D)eprn
 eprn_src=$(eprn_dir)$(D)
 # List of all eprn object files
-eprn_=$(GLOBJ)gdeveprn.$(OBJ) $(GLOBJ)pagecount.$(OBJ) \
+eprn_=$(DEVOBJ)gdeveprn.$(OBJ) $(DEVOBJ)pagecount.$(OBJ) \
-  $(GLOBJ)mediasize.$(OBJ) $(GLOBJ)eprnparm.$(OBJ) $(GLOBJ)eprnrend.$(OBJ) \
+  $(DEVOBJ)mediasize.$(OBJ) $(DEVOBJ)eprnparm.$(OBJ) $(DEVOBJ)eprnrend.$(OBJ) \
-  $(GLOBJ)eprnfs.$(OBJ)
+  $(DEVOBJ)eprnfs.$(OBJ)
 # List of eprn headers needed when gdeveprn.h is included:
 eprn_headers=$(eprn_src)mediasize.h $(eprn_src)gdeveprn.h $(PDEVH)
@@ -707,27 +707,27 @@ eprn_headers=$(eprn_src)mediasize.h $(eprn_src)gdeveprn.h $(PDEVH)
 # Rules for individual files
-$(GLOBJ)mediasize.$(OBJ) : $(std_h) \
+$(DEVOBJ)mediasize.$(OBJ) : $(std_h) \
  $(eprn_src)mediasize.c $(eprn_src)mediasize.h
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)mediasize.c
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)mediasize.c
-$(GLOBJ)gdeveprn.$(OBJ) : $(eprn_headers) $(eprn_src)pagecount.h
+$(DEVOBJ)gdeveprn.$(OBJ) : $(eprn_headers) $(eprn_src)pagecount.h
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)gdeveprn.c
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)gdeveprn.c
-$(GLOBJ)eprnparm.$(OBJ) : $(eprn_src)eprnparm.c $(eprn_headers)
+$(DEVOBJ)eprnparm.$(OBJ) : $(eprn_src)eprnparm.c $(eprn_headers)
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)eprnparm.c
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)eprnparm.c
-$(GLOBJ)eprnrend.$(OBJ) : $(eprn_src)eprnrend.c $(eprn_headers)
+$(DEVOBJ)eprnrend.$(OBJ) : $(eprn_src)eprnrend.c $(eprn_headers)
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)eprnrend.c
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)eprnrend.c
-$(GLOBJ)eprnfs.$(OBJ) : $(eprn_src)eprnfs.c $(eprn_headers)
+$(DEVOBJ)eprnfs.$(OBJ) : $(eprn_src)eprnfs.c $(eprn_headers)
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_fs_options) \
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_fs_options) \
          $(eprn_src)eprnfs.c
 # File also used by hpdj:
-$(GLOBJ)pagecount.$(OBJ) : $(std_h) \
+$(DEVOBJ)pagecount.$(OBJ) : $(std_h) \
  $(eprn_src)pagecount.c $(eprn_src)pagecount.h
-        $(GLCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)pagecount.c
+        $(DEVCC) $(C_) $(O_)$@ $(eprn_opts) $(eprn_src)pagecount.c
 #==============================================================================
@@ -748,29 +748,29 @@ pcl3_headers=$(eprn_headers) \
  $(pcl3_src)pclgen.h $(pcl3_src)pclcap.h $(pcl3_src)pclsize.h
 # List of all object files needed for pcl3
-pcl3_=$(eprn_) $(GLOBJ)gdevpcl3.$(OBJ) $(GLOBJ)pclcap.$(OBJ) \
+pcl3_=$(eprn_) $(DEVOBJ)gdevpcl3.$(OBJ) $(DEVOBJ)pclcap.$(OBJ) \
-  $(GLOBJ)pclgen.$(OBJ) $(GLOBJ)pclcomp.$(OBJ) $(GLOBJ)pclsize.$(OBJ)
+  $(DEVOBJ)pclgen.$(OBJ) $(DEVOBJ)pclcomp.$(OBJ) $(DEVOBJ)pclsize.$(OBJ)
 #------------------------------------------------------------------------------
 # Rules for individual files
-$(GLOBJ)pclgen.$(OBJ) : $(pcl3_src)pclgen.c $(pcl3_src)pclgen.h
+$(DEVOBJ)pclgen.$(OBJ) : $(pcl3_src)pclgen.c $(pcl3_src)pclgen.h
-        $(GLCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclgen.c
+        $(DEVCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclgen.c
-$(GLOBJ)pclsize.$(OBJ) : $(pcl3_src)pclsize.c $(eprn_src)mediasize.h \
+$(DEVOBJ)pclsize.$(OBJ) : $(pcl3_src)pclsize.c $(eprn_src)mediasize.h \
          $(pcl3_src)pclsize.h $(pcl3_src)pclgen.h
-        $(GLCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclsize.c
+        $(DEVCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclsize.c
-$(GLOBJ)pclcap.$(OBJ) : $(pcl3_src)pclcap.c $(pcl3_headers)
+$(DEVOBJ)pclcap.$(OBJ) : $(pcl3_src)pclcap.c $(pcl3_headers)
-        $(GLCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclcap.c
+        $(DEVCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclcap.c
-$(GLOBJ)gdevpcl3.$(OBJ) : $(pcl3_src)gdevpcl3.c $(pcl3_headers)
+$(DEVOBJ)gdevpcl3.$(OBJ) : $(pcl3_src)gdevpcl3.c $(pcl3_headers)
-        $(GLCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)gdevpcl3.c
+        $(DEVCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)gdevpcl3.c
 # File also used by hpdj:
-$(GLOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h
+$(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h
-        $(GLCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclcomp.c
+        $(DEVCC) $(C_) $(O_)$@ $(pcl3_opts) $(pcl3_src)pclcomp.c
 #------------------------------------------------------------------------------
@@ -842,8 +842,8 @@ pcl3opts_=$(pcl3_src)pcl3opts.c $(pcl3_src)pclscan.c $(eprn_src)mediasize.c \
 $(BINDIR)$(D)pcl3opts$(XE): $(pcl3opts_)
        $(CC_) -o $@ -I$(eprn_src) $(pcl3opts_)
-        gencat $(GLOBJ)pcl3opts-en.cat $(pcl3_src)pcl3opts-en.msg
+        gencat $(DEVOBJ)pcl3opts-en.cat $(pcl3_src)pcl3opts-en.msg
-        #gencat $(GLOBJ)pcl3opts-de.cat $(pcl3_src)pcl3opts-de.msg
+        #gencat $(DEVOBJ)pcl3opts-de.cat $(pcl3_src)pcl3opts-de.msg
 #------------------------------------------------------------------------------
@@ -859,14 +859,14 @@ pcl3-install:
 ### ----------------- The Xerox XES printer device --------------------- ###
-xes_=$(GLOBJ)gdevxes.$(OBJ)
+xes_=$(DEVOBJ)gdevxes.$(OBJ)
 $(DD)xes.dev : $(xes_) $(DD)page.dev
        $(SETPDEV) $(DD)xes $(xes_)
 # Author: Peter Flass (flass@lbdrscs.bitnet)
 # Printer: Xerox XES (2700, 3700, 4045, etc.)
-$(GLOBJ)gdevxes.$(OBJ) : $(CONTRIBSRC)gdevxes.c $(PDEVH)
+$(DEVOBJ)gdevxes.$(OBJ) : $(CONTRIBSRC)gdevxes.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevxes.$(OBJ) $(C_) $(CONTRIBSRC)gdevxes.c
+        $(DEVCC) $(DEVO_)gdevxes.$(OBJ) $(C_) $(CONTRIBSRC)gdevxes.c
 #########################################################################
 ### --------------------Japanese printer addons --------------------- ###
@@ -877,7 +877,7 @@ JAPSRC=$(JAPDIR)$(D)
 ### ----------------- The NEC PC-PR201 printer device ----------------- ###
-pr201_=$(GLOBJ)gdevp201.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)pr201.dev : $(pr201_)
        $(SETPDEV) $(DD)pr201 $(pr201_)
@@ -891,22 +891,22 @@ $(DD)pr1000.dev : $(pr201_)
 $(DD)pr1000_4.dev : $(pr201_)
        $(SETPDEV) $(DD)pr1000_4 $(pr201_)
-$(GLOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH)
+$(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevp201.$(OBJ) $(C_) $(JAPSRC)gdevp201.c
+        $(DEVCC) $(DEVO_)gdevp201.$(OBJ) $(C_) $(JAPSRC)gdevp201.c
 ### ----------------- The Star JJ-100 printer device ----------------- ###
-jj100_=$(GLOBJ)gdevj100.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)jj100.dev : $(jj100_)
        $(SETPDEV) $(DD)jj100 $(jj100_)
-$(GLOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH)
+$(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevj100.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevj100.c
 ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
-bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)bj10v.dev : $(bj10v_)
        $(SETPDEV) $(DD)bj10v $(bj10v_)
@@ -916,16 +916,16 @@ $(DD)bj10vh.dev : $(bj10v_)
 # Uncomment the following line if you are using MS-DOS on PC9801 series.
-$(GLOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH)
+$(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdev10v.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdev10v.c
-#       $(GLCC) -DPC9801 $(O_)$@ $(C_) $(JAPSRC)gdev10v.c
+#       $(DEVCC) -DPC9801 $(O_)$@ $(C_) $(JAPSRC)gdev10v.c
 ### ------------------------- MAG file formats ------------------------- ###
-maguro_=$(GLOBJ)gdevmag.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+maguro_=$(DEVOBJ)gdevmag.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
-$(GLOBJ)gdevmag.$(OBJ) : $(JAPSRC)gdevmag.c $(PDEVH)
+$(DEVOBJ)gdevmag.$(OBJ) : $(JAPSRC)gdevmag.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevmag.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevmag.c
 $(DD)mag16.dev : $(maguro_)
        $(SETDEV) $(DD)mag16 $(maguro_)
@@ -934,17 +934,17 @@ $(DD)mag256.dev : $(maguro_)
        $(SETDEV) $(DD)mag256 $(maguro_)
 ### ---------------- Dot matrix printer device ---------------- ###
-dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev
        $(SETDEV) $(DD)dmprt $(dmprt_)
        $(ADDMOD) $(DD)dmprt -ps dmp_init
-$(GLOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
+$(DEVOBJ)gdevdmpr.$(OBJ) : $(JAPSRC)gdevdmpr.c $(JAPSRC)dviprlib.h $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevdmpr.c
-$(GLOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
+$(DEVOBJ)dviprlib.$(OBJ) : $(JAPSRC)dviprlib.c $(JAPSRC)dviprlib.h
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
 extra-dmprt-install:
        $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
@@ -957,10 +957,10 @@ extra-dmprt-install:
 ## EPSON MachJet driver 
 ##
-mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL)
+mj700v2c_=$(DEVOBJ)gdevmjc.$(OBJ) $(HPPCL)
-$(GLOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevpcl_h)
-        $(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
+        $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c
 $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev
        $(SETPDEV) $(DD)mj700v2c $(mj700v2c_)
@@ -976,23 +976,23 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev
 ### ----------------- The Fujitsu FMPR printer device ----------------- ###
-fmpr_=$(GLOBJ)gdevfmpr.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev
        $(SETPDEV) $(DD)fmpr $(fmpr_)
-$(GLOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH)
+$(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevfmpr.$(OBJ) $(C_) $(JAPSRC)gdevfmpr.c
+        $(DEVCC) $(DEVO_)gdevfmpr.$(OBJ) $(C_) $(JAPSRC)gdevfmpr.c
 ### --------------- The Fujitsu FMLBP-2xx printer device --------------- ###
-fmlbp_=$(GLOBJ)gdevfmlbp.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev
        $(SETPDEV) $(DD)fmlbp $(fmlbp_)
-$(GLOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH)
+$(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH)
-        $(GLCC) -DFMLBP_NOADJUST_MARGIN $(O_)$@ $(C_) $(JAPSRC)gdevfmlbp.c
+        $(DEVCC) -DFMLBP_NOADJUST_MARGIN $(O_)$@ $(C_) $(JAPSRC)gdevfmlbp.c
 ### ------ The OKI MICROLINE620CL (IPL) printer device ------- ###
 #
@@ -1001,18 +1001,18 @@ $(GLOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH)
 #  $Id: gdevml6.mak,v 1.2 1998/03/16 13:32:33 tagawa Exp $
 #
-ml6_=$(GLOBJ)gdevml6.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
+ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ)
 $(DD)ml600.dev : $(ml6_) $(DD)page.dev
        $(SETPDEV) $(DD)ml600 $(ml6_)
-$(GLOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH)
+$(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevml6.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevml6.c
 #----------------------------------------------------------------------#
-lbp3x0_=$(GLOBJ)gdevlbp3.$(OBJ)
+lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ)
 $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev
        $(SETPDEV) $(DD)lbp310 $(lbp3x0_)
@@ -1020,25 +1020,25 @@ $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev
 $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev
        $(SETPDEV) $(DD)lbp320 $(lbp3x0_)
-$(GLOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
+$(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevlbp3.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevlbp3.c
 ### --- The NEC NPDL language printer device ------ ###
-npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
+npdl_=$(DEVOBJ)gdevnpdl.$(OBJ) $(DEVOBJ)gdevlprn.$(OBJ)
-$(GLOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
+$(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
-        $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
+        $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c
 $(DD)npdl.dev : $(npdl_) $(DD)page.dev
        $(SETPDEV) $(DD)npdl $(npdl_)
 ### ------- EPSON ESC/Page printer device ----------------- ###
-escpage_=$(GLOBJ)gdevespg.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ) $(GLOBJ)gdevlips.$(OBJ)
+escpage_=$(DEVOBJ)gdevespg.$(OBJ) $(DEVOBJ)gdevlprn.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ)
-$(GLOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
+$(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
-        $(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
+        $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c
 $(DD)escpage.dev : $(escpage_) $(DD)page.dev
        $(SETPDEV) $(DD)escpage $(escpage_)
@@ -1048,17 +1048,17 @@ $(DD)lp2000.dev : $(escpage_) $(DD)page.dev
 ### --- The RICOH RPDL language printer device ------ ###
-rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
+rpdl_=$(DEVOBJ)gdevrpdl.$(OBJ) $(DEVOBJ)gdevlprn.$(OBJ)
-$(GLOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
+$(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH)
-        $(GLCC) $(GLO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
+        $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c
 $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev
        $(SETPDEV) $(DD)rpdl $(rpdl_)
 ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ###
-#rpdl_=$(GLOBJ)gdevrpdl.$(OBJ)
+#rpdl_=$(DEVOBJ)gdevrpdl.$(OBJ)
-#$(GLOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c
+#$(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c
-#       $(GLCC) $(GLO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c
+#       $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c
 #
 #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev
 #       $(SETPDEV2) $(DD)nx100f $(rpdl_)
@@ -1068,7 +1068,7 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev
 ### ------------ The ALPS Micro Dry printer devices ------------ ###
-alps_=$(GLOBJ)gdevalps.$(OBJ)
+alps_=$(DEVOBJ)gdevalps.$(OBJ)
 $(DD)md50Mono.dev : $(alps_) $(DD)page.dev
        $(SETPDEV) $(DD)md50Mono $(alps_)
@@ -1079,8 +1079,8 @@ $(DD)md50Eco.dev : $(alps_) $(DD)page.dev
 $(DD)md1xMono.dev : $(alps_) $(DD)page.dev
        $(SETPDEV) $(DD)md1xMono $(alps_)
-$(GLOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH)
+$(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH)
-        $(GLCC) $(O_)$@ $(C_) $(JAPSRC)gdevalps.c
+        $(DEVCC) $(O_)$@ $(C_) $(JAPSRC)gdevalps.c
 #########################################################################
 #########################################################################
diff --git a/gs/base/contrib.mak b/gs/devices/contrib.mak
index 0509d528d..103ec9dac 100644
--- a/gs/base/contrib.mak
+++ b/gs/devices/contrib.mak
@@ -16,7 +16,7 @@
 # makefile for contributed device drivers.
 # Define the name of this makefile.
-CONTRIB_MAK=$(GLSRC)contrib.mak
+CONTRIB_MAK=$(DEVSRC)contrib.mak
 ###### --------------------------- Catalog -------------------------- ######
@@ -131,24 +131,24 @@ CONTRIB_MAK=$(GLSRC)contrib.mak
 ### ------------------- The Hercules Graphics display ------------------- ###
-herc_=$(GLOBJ)gdevherc.$(OBJ)
+herc_=$(DEVOBJ)gdevherc.$(OBJ)
 $(DD)herc.dev : $(herc_)
        $(SETDEV) $(DD)herc $(herc_)
-$(GLOBJ)gdevherc.$(OBJ) : $(GLSRC)gdevherc.c $(GDEV) $(dos__h)\
+$(DEVOBJ)gdevherc.$(OBJ) : $(DEVSRC)gdevherc.c $(GDEV) $(dos__h)\
 $(gsmatrix_h) $(gxbitmap_h)
-        $(GLCC) $(GLO_)gdevherc.$(OBJ) $(C_) $(GLSRC)gdevherc.c
+        $(DEVCC) $(DEVO_)gdevherc.$(OBJ) $(C_) $(DEVSRC)gdevherc.c
 ### ---------------------- The Private Eye display ---------------------- ###
 ### Note: this driver was contributed by a user:                          ###
 ###   please contact narf@media-lab.media.mit.edu if you have questions.  ###
-pe_=$(GLOBJ)gdevpe.$(OBJ)
+pe_=$(DEVOBJ)gdevpe.$(OBJ)
 $(DD)pe.dev : $(pe_)
        $(SETDEV) $(DD)pe $(pe_)
-$(GLOBJ)gdevpe.$(OBJ) : $(GLSRC)gdevpe.c $(GDEV) $(memory__h)
+$(DEVOBJ)gdevpe.$(OBJ) : $(DEVSRC)gdevpe.c $(GDEV) $(memory__h)
-        $(GLCC) $(GLO_)gdevpe.$(OBJ) $(C_) $(GLSRC)gdevpe.c
+        $(DEVCC) $(DEVO_)gdevpe.$(OBJ) $(C_) $(DEVSRC)gdevpe.c
 ###### ----------------------- Other displays ------------------------ ######
@@ -156,37 +156,37 @@ $(GLOBJ)gdevpe.$(OBJ) : $(GLSRC)gdevpe.c $(GDEV) $(memory__h)
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Andy Fyfe (andy@cs.caltech.edu) if you have questions.          ###
-att3b1_=$(GLOBJ)gdev3b1.$(OBJ)
+att3b1_=$(DEVOBJ)gdev3b1.$(OBJ)
 $(DD)att3b1.dev : $(att3b1_)
        $(SETDEV) $(DD)att3b1 $(att3b1_)
-$(GLOBJ)gdev3b1.$(OBJ) : $(GLSRC)gdev3b1.c $(GDEV)
+$(DEVOBJ)gdev3b1.$(OBJ) : $(DEVSRC)gdev3b1.c $(GDEV)
-        $(GLCC) $(GLO_)gdev3b1.$(OBJ) $(C_) $(GLSRC)gdev3b1.c
+        $(DEVCC) $(DEVO_)gdev3b1.$(OBJ) $(C_) $(DEVSRC)gdev3b1.c
 ### ------------------- Sony NeWS frame buffer device ------------------ ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Mike Smolenski (mike@intertech.com) if you have questions.     ###
 # This is implemented as a 'printer' device.
-sonyfb_=$(GLOBJ)gdevsnfb.$(OBJ)
+sonyfb_=$(DEVOBJ)gdevsnfb.$(OBJ)
 $(DD)sonyfb.dev : $(sonyfb_) $(DD)page.dev
        $(SETPDEV) $(DD)sonyfb $(sonyfb_)
-$(GLOBJ)gdevsnfb.$(OBJ) : $(GLSRC)gdevsnfb.c $(PDEVH)
+$(DEVOBJ)gdevsnfb.$(OBJ) : $(DEVSRC)gdevsnfb.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevsnfb.$(OBJ) $(C_) $(GLSRC)gdevsnfb.c
+        $(DEVCC) $(DEVO_)gdevsnfb.$(OBJ) $(C_) $(DEVSRC)gdevsnfb.c
 ### ------------------------ The SunView device ------------------------ ###
 ### Note: this driver is maintained by a user: if you have questions,    ###
 ###       please contact Andreas Stolcke (stolcke@icsi.berkeley.edu).    ###
-sunview_=$(GLOBJ)gdevsun.$(OBJ)
+sunview_=$(DEVOBJ)gdevsun.$(OBJ)
 $(DD)sunview.dev : $(sunview_)
        $(SETDEV) $(DD)sunview $(sunview_)
-        $(ADDMOD) $(GLGEN)sunview -lib suntool sunwindow pixrect
+        $(ADDMOD) $(DEVGENDIR)sunview -lib suntool sunwindow pixrect
-$(GLOBJ)gdevsun.$(OBJ) : $(GLSRC)gdevsun.c $(GDEV) $(malloc__h)\
+$(DEVOBJ)gdevsun.$(OBJ) : $(DEVSRC)gdevsun.c $(GDEV) $(malloc__h)\
 $(gscdefs_h) $(gserrors_h) $(gsmatrix_h)
-        $(GLCC) $(GLO_)gdevsun.$(OBJ) $(C_) $(GLSRC)gdevsun.c
+        $(DEVCC) $(DEVO_)gdevsun.$(OBJ) $(C_) $(DEVSRC)gdevsun.c
 ###### --------------- Memory-buffered printer devices --------------- ######
@@ -199,10 +199,10 @@ $(GLOBJ)gdevsun.$(OBJ) : $(GLSRC)gdevsun.c $(GDEV) $(malloc__h)\
 ###   If you have questions about the Imagewriter LQ driver, please       ###
 ###     contact Scott Barker (barkers@cuug.ab.ca).                        ###
-appledmp_=$(GLOBJ)gdevadmp.$(OBJ)
+appledmp_=$(DEVOBJ)gdevadmp.$(OBJ)
-$(GLOBJ)gdevadmp.$(OBJ) : $(GLSRC)gdevadmp.c $(PDEVH)
+$(DEVOBJ)gdevadmp.$(OBJ) : $(DEVSRC)gdevadmp.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevadmp.$(OBJ) $(C_) $(GLSRC)gdevadmp.c
+        $(DEVCC) $(DEVO_)gdevadmp.$(OBJ) $(C_) $(DEVSRC)gdevadmp.c
 $(DD)appledmp.dev : $(appledmp_) $(DD)page.dev
        $(SETPDEV) $(DD)appledmp $(appledmp_)
@@ -218,7 +218,7 @@ $(DD)iwlq.dev : $(appledmp_) $(DD)page.dev
 ### ------------ The Canon BubbleJet BJ10e and BJ200 devices ------------ ###
-bj10e_=$(GLOBJ)gdevbj10.$(OBJ)
+bj10e_=$(DEVOBJ)gdevbj10.$(OBJ)
 $(DD)bj10e.dev : $(bj10e_) $(DD)page.dev
        $(SETPDEV) $(DD)bj10e $(bj10e_)
@@ -226,20 +226,20 @@ $(DD)bj10e.dev : $(bj10e_) $(DD)page.dev
 $(DD)bj200.dev : $(bj10e_) $(DD)page.dev
        $(SETPDEV) $(DD)bj200 $(bj10e_)
-$(GLOBJ)gdevbj10.$(OBJ) : $(GLSRC)gdevbj10.c $(PDEVH)
+$(DEVOBJ)gdevbj10.$(OBJ) : $(DEVSRC)gdevbj10.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevbj10.$(OBJ) $(C_) $(GLSRC)gdevbj10.c
+        $(DEVCC) $(DEVO_)gdevbj10.$(OBJ) $(C_) $(DEVSRC)gdevbj10.c
 ### ------------- The CalComp Raster Format ----------------------------- ###
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Ernst Muellner (ernst.muellner@oenzl.siemens.de) if you have    ###
 ###       questions.                                                      ###
-ccr_=$(GLOBJ)gdevccr.$(OBJ)
+ccr_=$(DEVOBJ)gdevccr.$(OBJ)
 $(DD)ccr.dev : $(ccr_) $(DD)page.dev
        $(SETPDEV) $(DD)ccr $(ccr_)
-$(GLOBJ)gdevccr.$(OBJ) : $(GLSRC)gdevccr.c $(PDEVH)
+$(DEVOBJ)gdevccr.$(OBJ) : $(DEVSRC)gdevccr.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevccr.$(OBJ) $(C_) $(GLSRC)gdevccr.c
+        $(DEVCC) $(DEVO_)gdevccr.$(OBJ) $(C_) $(DEVSRC)gdevccr.c
 ### The H-P DeskJet, PaintJet, and DesignJet family color printer devices.###
 ### Note: there are two different 500C drivers, both contributed by users.###
@@ -255,7 +255,7 @@ $(GLOBJ)gdevccr.$(OBJ) : $(GLSRC)gdevccr.c $(PDEVH)
 ###       by yves.arrouye@usa.net, but he no longer answers questions     ###
 ###       about them.                                                     ###
-cdeskjet_=$(GLOBJ)gdevcdj.$(OBJ) $(HPPCL)
+cdeskjet_=$(DEVOBJ)gdevcdj.$(OBJ) $(HPPCL)
 $(DD)cdeskjet.dev : $(cdeskjet_) $(DD)page.dev
        $(SETPDEV) $(DD)cdeskjet $(cdeskjet_)
@@ -305,19 +305,19 @@ $(DD)escp.dev : $(cdeskjet_) $(DD)page.dev
 # -DBitsPerPixel=<number> if you wish the default to be other than 24
 # for the generic drivers (cdj500, cdj550, pjxl300, pjtest, pjxltest).
-gdevbjc_h=$(GLSRC)gdevbjc.h
+gdevbjc_h=$(DEVSRC)gdevbjc.h
-$(GLOBJ)gdevcdj.$(OBJ) : $(GLSRC)gdevcdj.c $(std_h) $(PDEVH)\
+$(DEVOBJ)gdevcdj.$(OBJ) : $(DEVSRC)gdevcdj.c $(std_h) $(PDEVH)\
 $(gsparam_h) $(gsstate_h) $(gxlum_h)\
 $(gdevbjc_h) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevcdj.$(OBJ) $(C_) $(GLSRC)gdevcdj.c
+        $(DEVCC) $(DEVO_)gdevcdj.$(OBJ) $(C_) $(DEVSRC)gdevcdj.c
-djet500c_=$(GLOBJ)gdevdjtc.$(OBJ) $(HPPCL)
+djet500c_=$(DEVOBJ)gdevdjtc.$(OBJ) $(HPPCL)
 $(DD)djet500c.dev : $(djet500c_) $(DD)page.dev
        $(SETPDEV) $(DD)djet500c $(djet500c_)
-$(GLOBJ)gdevdjtc.$(OBJ) : $(GLSRC)gdevdjtc.c $(PDEVH) $(malloc__h) $(gdevpcl_h)
+$(DEVOBJ)gdevdjtc.$(OBJ) : $(DEVSRC)gdevdjtc.c $(PDEVH) $(malloc__h) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevdjtc.$(OBJ) $(C_) $(GLSRC)gdevdjtc.c
+        $(DEVCC) $(DEVO_)gdevdjtc.$(OBJ) $(C_) $(DEVSRC)gdevdjtc.c
 ### -------------------- The H-P Color LaserJet 5/5M -------------------- ###
@@ -330,7 +330,7 @@ $(GLOBJ)gdevdjtc.$(OBJ) : $(GLSRC)gdevdjtc.c $(PDEVH) $(malloc__h) $(gdevpcl_h)
 ### wider than it is high.  To print portrait pages, specify the page size
 ### explicitly, e.g. -c letter or -c a4 on the command line.
-cljet5_=$(GLOBJ)gdevclj.$(OBJ) $(HPPCL)
+cljet5_=$(DEVOBJ)gdevclj.$(OBJ) $(HPPCL)
 $(DD)cljet5.dev : $(DEVS_MAK) $(cljet5_) $(GLD)page.dev
        $(SETPDEV) $(DD)cljet5 $(cljet5_)
@@ -340,16 +340,16 @@ $(DD)cljet5.dev : $(DEVS_MAK) $(cljet5_) $(GLD)page.dev
 $(DD)cljet5pr.dev : $(DEVS_MAK) $(cljet5_) $(GLD)page.dev
        $(SETPDEV) $(DD)cljet5pr $(cljet5_)
-$(GLOBJ)gdevclj.$(OBJ) : $(GLSRC)gdevclj.c $(math__h) $(PDEVH)\
+$(DEVOBJ)gdevclj.$(OBJ) : $(DEVSRC)gdevclj.c $(math__h) $(PDEVH)\
 $(gx_h) $(gsparam_h) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevclj.$(OBJ) $(C_) $(GLSRC)gdevclj.c
+        $(DEVCC) $(DEVO_)gdevclj.$(OBJ) $(C_) $(DEVSRC)gdevclj.c
-cljet5c_=$(GLOBJ)gdevcljc.$(OBJ) $(HPPCL)
+cljet5c_=$(DEVOBJ)gdevcljc.$(OBJ) $(HPPCL)
 $(DD)cljet5c.dev : $(DEVS_MAK) $(cljet5c_) $(GLD)page.dev
        $(SETPDEV) $(DD)cljet5c $(cljet5c_)
-$(GLOBJ)gdevcljc.$(OBJ) : $(GLSRC)gdevcljc.c $(math__h) $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdevcljc.$(OBJ) : $(DEVSRC)gdevcljc.c $(math__h) $(PDEVH) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevcljc.$(OBJ) $(C_) $(GLSRC)gdevcljc.c
+        $(DEVCC) $(DEVO_)gdevcljc.$(OBJ) $(C_) $(DEVSRC)gdevcljc.c
 ### --------------- The H-P LaserJet 3100 software device --------------- ###
@@ -359,22 +359,22 @@ $(GLOBJ)gdevcljc.$(OBJ) : $(GLSRC)gdevcljc.c $(math__h) $(PDEVH) $(gdevpcl_h)
 ### NOTE: this driver was contributed by a user: please contact           ###
 ###       Ulrich Schmid (uschmid@mail.hh.provi.de) if you have questions. ###
-lj3100sw_=$(GLOBJ)gdevl31s.$(OBJ) $(GLOBJ)gdevmeds.$(OBJ)
+lj3100sw_=$(DEVOBJ)gdevl31s.$(OBJ) $(DEVOBJ)gdevmeds.$(OBJ)
 $(DD)lj3100sw.dev : $(lj3100sw_) $(DD)page.dev
        $(SETPDEV) $(DD)lj3100sw $(lj3100sw_)
-gdevmeds_h=$(GLSRC)gdevmeds.h $(gdevprn_h)
+gdevmeds_h=$(DEVSRC)gdevmeds.h $(gdevprn_h)
-$(GLOBJ)gdevl31s.$(OBJ) : $(GLSRC)gdevl31s.c $(gdevmeds_h) $(PDEVH)
+$(DEVOBJ)gdevl31s.$(OBJ) : $(DEVSRC)gdevl31s.c $(gdevmeds_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevl31s.$(OBJ) $(C_) $(GLSRC)gdevl31s.c
+        $(DEVCC) $(DEVO_)gdevl31s.$(OBJ) $(C_) $(DEVSRC)gdevl31s.c
-$(GLOBJ)gdevmeds.$(OBJ) : $(GLSRC)gdevmeds.c $(AK) $(gdevmeds_h)
+$(DEVOBJ)gdevmeds.$(OBJ) : $(DEVSRC)gdevmeds.c $(AK) $(gdevmeds_h)
-        $(GLCC) $(GLO_)gdevmeds.$(OBJ) $(C_) $(GLSRC)gdevmeds.c
+        $(DEVCC) $(DEVO_)gdevmeds.$(OBJ) $(C_) $(DEVSRC)gdevmeds.c
 ### ------ CoStar LabelWriter II II/Plus device ------ ###
 ### Contributed by Mike McCauley mikem@open.com.au     ###
-coslw_=$(GLOBJ)gdevcslw.$(OBJ)
+coslw_=$(DEVOBJ)gdevcslw.$(OBJ)
 $(DD)coslw2p.dev : $(coslw_) $(DD)page.dev
        $(SETPDEV) $(DD)coslw2p $(coslw_)
@@ -382,19 +382,19 @@ $(DD)coslw2p.dev : $(coslw_) $(DD)page.dev
 $(DD)coslwxl.dev : $(coslw_) $(DD)page.dev
        $(SETPDEV) $(DD)coslwxl $(coslw_)
-$(GLOBJ)gdevcslw.$(OBJ) : $(GLSRC)gdevcslw.c $(PDEVH)
+$(DEVOBJ)gdevcslw.$(OBJ) : $(DEVSRC)gdevcslw.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevcslw.$(OBJ) $(C_) $(GLSRC)gdevcslw.c
+        $(DEVCC) $(DEVO_)gdevcslw.$(OBJ) $(C_) $(DEVSRC)gdevcslw.c
 ### -------------------- The Mitsubishi CP50 printer -------------------- ###
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Michael Hu (michael@ximage.com) if you have questions.          ###
-cp50_=$(GLOBJ)gdevcp50.$(OBJ)
+cp50_=$(DEVOBJ)gdevcp50.$(OBJ)
 $(DD)cp50.dev : $(cp50_) $(DD)page.dev
        $(SETPDEV) $(DD)cp50 $(cp50_)
-$(GLOBJ)gdevcp50.$(OBJ) : $(GLSRC)gdevcp50.c $(PDEVH)
+$(DEVOBJ)gdevcp50.$(OBJ) : $(DEVSRC)gdevcp50.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevcp50.$(OBJ) $(C_) $(GLSRC)gdevcp50.c
+        $(DEVCC) $(DEVO_)gdevcp50.$(OBJ) $(C_) $(DEVSRC)gdevcp50.c
 ### ----------------- The generic Epson printer device ----------------- ###
 ### Note: most of this code was contributed by users.  Please contact    ###
@@ -403,7 +403,7 @@ $(GLOBJ)gdevcp50.$(OBJ) : $(GLSRC)gdevcp50.c $(PDEVH)
 ###   eps9high - David Wexelblat (dwex@mtgzfs3.att.com)                  ###
 ###   ibmpro - James W. Birdsall (jwbirdsa@picarefy.picarefy.com)        ###
-epson_=$(GLOBJ)gdevepsn.$(OBJ)
+epson_=$(DEVOBJ)gdevepsn.$(OBJ)
 $(DD)epson.dev : $(epson_) $(DD)page.dev
        $(SETPDEV) $(DD)epson $(epson_)
@@ -414,8 +414,8 @@ $(DD)eps9mid.dev : $(epson_) $(DD)page.dev
 $(DD)eps9high.dev : $(epson_) $(DD)page.dev
        $(SETPDEV) $(DD)eps9high $(epson_)
-$(GLOBJ)gdevepsn.$(OBJ) : $(GLSRC)gdevepsn.c $(PDEVH)
+$(DEVOBJ)gdevepsn.$(OBJ) : $(DEVSRC)gdevepsn.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevepsn.$(OBJ) $(C_) $(GLSRC)gdevepsn.c
+        $(DEVCC) $(DEVO_)gdevepsn.$(OBJ) $(C_) $(DEVSRC)gdevepsn.c
 ### ----------------- The IBM Proprinter printer device ---------------- ###
@@ -426,12 +426,12 @@ $(DD)ibmpro.dev : $(epson_) $(DD)page.dev
 ### Note: this driver was contributed by users: please contact           ###
 ###       Dave St. Clair (dave@exlog.com) if you have questions.         ###
-epsonc_=$(GLOBJ)gdevepsc.$(OBJ)
+epsonc_=$(DEVOBJ)gdevepsc.$(OBJ)
 $(DD)epsonc.dev : $(epsonc_) $(DD)page.dev
        $(SETPDEV) $(DD)epsonc $(epsonc_)
-$(GLOBJ)gdevepsc.$(OBJ) : $(GLSRC)gdevepsc.c $(PDEVH)
+$(DEVOBJ)gdevepsc.$(OBJ) : $(DEVSRC)gdevepsc.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevepsc.$(OBJ) $(C_) $(GLSRC)gdevepsc.c
+        $(DEVCC) $(DEVO_)gdevepsc.$(OBJ) $(C_) $(DEVSRC)gdevepsc.c
 ### ------------- The Epson ESC/P 2 language printer devices ------------- ###
 ### Note: these drivers were contributed by users.                         ###
@@ -440,10 +440,10 @@ $(GLOBJ)gdevepsc.$(OBJ) : $(GLSRC)gdevepsc.c $(PDEVH)
 ### For questions about the Stylus Color drivers, please contact           ###
 ###        Gunther Hess (gunther@elmos.de).                                ###
-ESCP2=$(GLOBJ)gdevescp.$(OBJ)
+ESCP2=$(DEVOBJ)gdevescp.$(OBJ)
-$(GLOBJ)gdevescp.$(OBJ) : $(GLSRC)gdevescp.c $(PDEVH)
+$(DEVOBJ)gdevescp.$(OBJ) : $(DEVSRC)gdevescp.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevescp.$(OBJ) $(C_) $(GLSRC)gdevescp.c
+        $(DEVCC) $(DEVO_)gdevescp.$(OBJ) $(C_) $(DEVSRC)gdevescp.c
 $(DD)ap3250.dev : $(ESCP2) $(DD)page.dev
        $(SETPDEV) $(DD)ap3250 $(ESCP2)
@@ -451,39 +451,39 @@ $(DD)ap3250.dev : $(ESCP2) $(DD)page.dev
 $(DD)st800.dev : $(ESCP2) $(DD)page.dev
        $(SETPDEV) $(DD)st800 $(ESCP2)
-stcolor1_=$(GLOBJ)gdevstc.$(OBJ) $(GLOBJ)gdevstc1.$(OBJ) $(GLOBJ)gdevstc2.$(OBJ)
+stcolor1_=$(DEVOBJ)gdevstc.$(OBJ) $(DEVOBJ)gdevstc1.$(OBJ) $(DEVOBJ)gdevstc2.$(OBJ)
-stcolor2_=$(GLOBJ)gdevstc3.$(OBJ) $(GLOBJ)gdevstc4.$(OBJ)
+stcolor2_=$(DEVOBJ)gdevstc3.$(OBJ) $(DEVOBJ)gdevstc4.$(OBJ)
 $(DD)stcolor.dev : $(stcolor1_) $(stcolor2_) $(DD)page.dev
        $(SETPDEV) $(DD)stcolor $(stcolor1_)
-        $(ADDMOD) $(GLGEN)stcolor -obj $(stcolor2_)
+        $(ADDMOD) $(DD)stcolor -obj $(stcolor2_)
-gdevstc_h=$(GLSRC)gdevstc.h $(gdevprn_h) $(gsparam_h) $(gsstate_h)
+gdevstc_h=$(DEVSRC)gdevstc.h $(gdevprn_h) $(gsparam_h) $(gsstate_h)
-$(GLOBJ)gdevstc.$(OBJ) : $(GLSRC)gdevstc.c $(gdevstc_h) $(PDEVH)
+$(DEVOBJ)gdevstc.$(OBJ) : $(DEVSRC)gdevstc.c $(gdevstc_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevstc.$(OBJ) $(C_) $(GLSRC)gdevstc.c
+        $(DEVCC) $(DEVO_)gdevstc.$(OBJ) $(C_) $(DEVSRC)gdevstc.c
-$(GLOBJ)gdevstc1.$(OBJ) : $(GLSRC)gdevstc1.c $(gdevstc_h) $(PDEVH)
+$(DEVOBJ)gdevstc1.$(OBJ) : $(DEVSRC)gdevstc1.c $(gdevstc_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevstc1.$(OBJ) $(C_) $(GLSRC)gdevstc1.c
+        $(DEVCC) $(DEVO_)gdevstc1.$(OBJ) $(C_) $(DEVSRC)gdevstc1.c
-$(GLOBJ)gdevstc2.$(OBJ) : $(GLSRC)gdevstc2.c $(gdevstc_h) $(PDEVH)
+$(DEVOBJ)gdevstc2.$(OBJ) : $(DEVSRC)gdevstc2.c $(gdevstc_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevstc2.$(OBJ) $(C_) $(GLSRC)gdevstc2.c
+        $(DEVCC) $(DEVO_)gdevstc2.$(OBJ) $(C_) $(DEVSRC)gdevstc2.c
-$(GLOBJ)gdevstc3.$(OBJ) : $(GLSRC)gdevstc3.c $(gdevstc_h) $(PDEVH)
+$(DEVOBJ)gdevstc3.$(OBJ) : $(DEVSRC)gdevstc3.c $(gdevstc_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevstc3.$(OBJ) $(C_) $(GLSRC)gdevstc3.c
+        $(DEVCC) $(DEVO_)gdevstc3.$(OBJ) $(C_) $(DEVSRC)gdevstc3.c
-$(GLOBJ)gdevstc4.$(OBJ) : $(GLSRC)gdevstc4.c $(gdevstc_h) $(PDEVH)
+$(DEVOBJ)gdevstc4.$(OBJ) : $(DEVSRC)gdevstc4.c $(gdevstc_h) $(PDEVH)
-        $(GLCC) $(GLO_)gdevstc4.$(OBJ) $(C_) $(GLSRC)gdevstc4.c
+        $(DEVCC) $(DEVO_)gdevstc4.$(OBJ) $(C_) $(DEVSRC)gdevstc4.c
 ### --------------- Ugly/Update -> Unified Printer Driver ---------------- ###
 ### For questions about this driver, please contact:                       ###
 ###        Gunther Hess (gunther@elmos.de)                                 ###
-uniprint_=$(GLOBJ)gdevupd.$(OBJ)
+uniprint_=$(DEVOBJ)gdevupd.$(OBJ)
 $(DD)uniprint.dev : $(uniprint_) $(DD)page.dev
        $(SETPDEV) $(DD)uniprint $(uniprint_)
-$(GLOBJ)gdevupd.$(OBJ) : $(GLSRC)gdevupd.c $(PDEVH) $(gsparam_h)
+$(DEVOBJ)gdevupd.$(OBJ) : $(DEVSRC)gdevupd.c $(PDEVH) $(gsparam_h)
-        $(GLCC) $(GLO_)gdevupd.$(OBJ) $(C_) $(GLSRC)gdevupd.c
+        $(DEVCC) $(DEVO_)gdevupd.$(OBJ) $(C_) $(DEVSRC)gdevupd.c
 ### ------------ The H-P PaintJet color printer device ----------------- ###
 ### Note: this driver also supports the DEC LJ250 color printer, which   ###
@@ -491,10 +491,10 @@ $(GLOBJ)gdevupd.$(OBJ) : $(GLSRC)gdevupd.c $(PDEVH) $(gsparam_h)
 ### If you have questions about the XL, please contact Rob Reiss         ###
 ###       (rob@moray.berkeley.edu).                                      ###
-PJET=$(GLOBJ)gdevpjet.$(OBJ) $(HPPCL)
+PJET=$(DEVOBJ)gdevpjet.$(OBJ) $(HPPCL)
-$(GLOBJ)gdevpjet.$(OBJ) : $(GLSRC)gdevpjet.c $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdevpjet.$(OBJ) : $(DEVSRC)gdevpjet.c $(PDEVH) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevpjet.$(OBJ) $(C_) $(GLSRC)gdevpjet.c
+        $(DEVCC) $(DEVO_)gdevpjet.$(OBJ) $(C_) $(DEVSRC)gdevpjet.c
 $(DD)lj250.dev : $(PJET) $(DD)page.dev
        $(SETPDEV) $(DD)lj250 $(PJET)
@@ -512,12 +512,12 @@ $(DD)pjetxl.dev : $(PJET) $(DD)page.dev
 ###       Ross Martin (ross@ross.interwrx.com, martin@walnut.eas.asu.edu) ###
 ###         for questions about usage with the MFC6550MC Fax Machine.     ###
-hl7x0_=$(GLOBJ)gdevhl7x.$(OBJ)
+hl7x0_=$(DEVOBJ)gdevhl7x.$(OBJ)
 $(DD)hl7x0.dev : $(hl7x0_) $(DD)page.dev
        $(SETPDEV) $(DD)hl7x0 $(hl7x0_)
-$(GLOBJ)gdevhl7x.$(OBJ) : $(GLSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdevhl7x.$(OBJ) : $(DEVSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdevhl7x.$(OBJ) $(C_) $(GLSRC)gdevhl7x.c
+        $(DEVCC) $(DEVO_)gdevhl7x.$(OBJ) $(C_) $(DEVSRC)gdevhl7x.c
 ### -------------- Imagen ImPress Laser Printer device ----------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
@@ -526,15 +526,15 @@ $(GLOBJ)gdevhl7x.$(OBJ) : $(GLSRC)gdevhl7x.c $(PDEVH) $(gdevpcl_h)
 ### Don't set it if using 'ipr' spooler (default).                       ###
 ### You may also add -DA4 if needed for A4 paper.                        ###
-imagen_=$(GLOBJ)gdevimgn.$(OBJ)
+imagen_=$(DEVOBJ)gdevimgn.$(OBJ)
 $(DD)imagen.dev : $(imagen_) $(DD)page.dev
        $(SETPDEV) $(DD)imagen $(imagen_)
 # Uncomment the first line for the ipr spooler, the second line for parallel.
 IMGN_OPT=
 #IMGN_OPT=-DUSE_BYTE_STREAM
-$(GLOBJ)gdevimgn.$(OBJ) : $(GLSRC)gdevimgn.c $(PDEVH)
+$(DEVOBJ)gdevimgn.$(OBJ) : $(DEVSRC)gdevimgn.c $(PDEVH)
-        $(GLCC) $(IMGN_OPT) $(GLO_)gdevimgn.$(OBJ) $(C_) $(GLSRC)gdevimgn.c
+        $(DEVCC) $(IMGN_OPT) $(DEVO_)gdevimgn.$(OBJ) $(C_) $(DEVSRC)gdevimgn.c
 ### ------- The IBM 3852 JetPrinter color inkjet printer device -------- ###
 ### Note: this driver was contributed by users: please contact           ###
@@ -543,49 +543,49 @@ $(GLOBJ)gdevimgn.$(OBJ) : $(GLSRC)gdevimgn.c $(PDEVH)
 ###   used in this driver is fixed at 7-1/2 inches wide (the printable   ###
 ###   width of the jetprinter itself.)                                   ###
-jetp3852_=$(GLOBJ)gdev3852.$(OBJ)
+jetp3852_=$(DEVOBJ)gdev3852.$(OBJ)
 $(DD)jetp3852.dev : $(jetp3852_) $(DD)page.dev
        $(SETPDEV) $(DD)jetp3852 $(jetp3852_)
-$(GLOBJ)gdev3852.$(OBJ) : $(GLSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
+$(DEVOBJ)gdev3852.$(OBJ) : $(DEVSRC)gdev3852.c $(PDEVH) $(gdevpcl_h)
-        $(GLCC) $(GLO_)gdev3852.$(OBJ) $(C_) $(GLSRC)gdev3852.c
+        $(DEVCC) $(DEVO_)gdev3852.$(OBJ) $(C_) $(DEVSRC)gdev3852.c
 ### ---------- The Canon LBP-8II and LIPS III printer devices ---------- ###
 ### Note: these drivers were contributed by users.                       ###
 ### For questions about these drivers, please contact                    ###
 ###       Lauri Paatero, lauri.paatero@paatero.pp.fi                     ###
-lbp8_=$(GLOBJ)gdevlbp8.$(OBJ)
+lbp8_=$(DEVOBJ)gdevlbp8.$(OBJ)
 $(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
        $(SETPDEV) $(DD)lbp8 $(lbp8_)
 $(DD)lips3.dev : $(lbp8_) $(DD)page.dev
        $(SETPDEV) $(DD)lips3 $(lbp8_)
-$(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
+$(DEVOBJ)gdevlbp8.$(OBJ) : $(DEVSRC)gdevlbp8.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
+        $(DEVCC) $(DEVO_)gdevlbp8.$(OBJ) $(C_) $(DEVSRC)gdevlbp8.c
 ### -------------- The Epson LP-8000 laser printer device -------------- ###
 ### Note: this driver was contributed by a user: please contact Oleg     ###
 ###       Oleg Fat'yanov <faty1@rlem.titech.ac.jp> if you have questions.###
-lp8000_=$(GLOBJ)gdevlp8k.$(OBJ)
+lp8000_=$(DEVOBJ)gdevlp8k.$(OBJ)
 $(DD)lp8000.dev : $(lp8000_) $(DD)page.dev
        $(SETPDEV) $(DD)lp8000 $(lp8000_)
-$(GLOBJ)gdevlp8k.$(OBJ) : $(GLSRC)gdevlp8k.c $(PDEVH)
+$(DEVOBJ)gdevlp8k.$(OBJ) : $(DEVSRC)gdevlp8k.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevlp8k.$(OBJ) $(C_) $(GLSRC)gdevlp8k.c
+        $(DEVCC) $(DEVO_)gdevlp8k.$(OBJ) $(C_) $(DEVSRC)gdevlp8k.c
 ### -------------- The C.Itoh M8510 printer device --------------------- ###
 ### Note: this driver was contributed by a user: please contact Bob      ###
 ###       Smith <bob@snuffy.penfield.ny.us> if you have questions.       ###
-m8510_=$(GLOBJ)gdev8510.$(OBJ)
+m8510_=$(DEVOBJ)gdev8510.$(OBJ)
 $(DD)m8510.dev : $(m8510_) $(DD)page.dev
        $(SETPDEV) $(DD)m8510 $(m8510_)
-$(GLOBJ)gdev8510.$(OBJ) : $(GLSRC)gdev8510.c $(PDEVH)
+$(DEVOBJ)gdev8510.$(OBJ) : $(DEVSRC)gdev8510.c $(PDEVH)
-        $(GLCC) $(GLO_)gdev8510.$(OBJ) $(C_) $(GLSRC)gdev8510.c
+        $(DEVCC) $(DEVO_)gdev8510.$(OBJ) $(C_) $(DEVSRC)gdev8510.c
 ### -------------- 24pin Dot-matrix printer with 360DPI ---------------- ###
 ### Note: this driver was contributed by users.  Please contact:         ###
@@ -594,82 +594,82 @@ $(GLOBJ)gdev8510.$(OBJ) : $(GLSRC)gdev8510.c $(PDEVH)
 ###    Christian Felsch (felsch@tu-harburg.d400.de) for                  ###
 ###      questions about the Epson LQ850.                                ###
-dm24_=$(GLOBJ)gdevdm24.$(OBJ)
+dm24_=$(DEVOBJ)gdevdm24.$(OBJ)
 $(DD)necp6.dev : $(dm24_) $(DD)page.dev
        $(SETPDEV) $(DD)necp6 $(dm24_)
 $(DD)lq850.dev : $(dm24_) $(DD)page.dev
        $(SETPDEV) $(DD)lq850 $(dm24_)
-$(GLOBJ)gdevdm24.$(OBJ) : $(GLSRC)gdevdm24.c $(PDEVH)
+$(DEVOBJ)gdevdm24.$(OBJ) : $(DEVSRC)gdevdm24.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevdm24.$(OBJ) $(C_) $(GLSRC)gdevdm24.c
+        $(DEVCC) $(DEVO_)gdevdm24.$(OBJ) $(C_) $(DEVSRC)gdevdm24.c
 ### ----------------- Lexmark 5700 printer ----------------------------- ###
 ### Note: this driver was contributed by users.  Please contact:         ###
 ###   Stephen Taylor (setaylor@ma.ultranet.com) if you have questions.   ###
-lxm5700m_=$(GLOBJ)gdevlxm.$(OBJ)
+lxm5700m_=$(DEVOBJ)gdevlxm.$(OBJ)
 $(DD)lxm5700m.dev : $(lxm5700m_) $(DD)page.dev
        $(SETPDEV) $(DD)lxm5700m $(lxm5700m_)
-$(GLOBJ)gdevlxm.$(OBJ) : $(GLSRC)gdevlxm.c $(PDEVH) $(gsparams_h)
+$(DEVOBJ)gdevlxm.$(OBJ) : $(DEVSRC)gdevlxm.c $(PDEVH) $(gsparams_h)
-        $(GLCC) $(GLO_)gdevlxm.$(OBJ) $(C_) $(GLSRC)gdevlxm.c
+        $(DEVCC) $(DEVO_)gdevlxm.$(OBJ) $(C_) $(DEVSRC)gdevlxm.c
 ### ----------------- The Okidata MicroLine 182 device ----------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Maarten Koning (smeg@bnr.ca) if you have questions.            ###
-oki182_=$(GLOBJ)gdevo182.$(OBJ)
+oki182_=$(DEVOBJ)gdevo182.$(OBJ)
 $(DD)oki182.dev : $(oki182_) $(DD)page.dev
        $(SETPDEV) $(DD)oki182 $(oki182_)
-$(GLOBJ)gdevo182.$(OBJ) : $(GLSRC)gdevo182.c $(PDEVH)
+$(DEVOBJ)gdevo182.$(OBJ) : $(DEVSRC)gdevo182.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevo182.$(OBJ) $(C_) $(GLSRC)gdevo182.c
+        $(DEVCC) $(DEVO_)gdevo182.$(OBJ) $(C_) $(DEVSRC)gdevo182.c
 ### ------------- The Okidata IBM compatible printer device ------------ ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Charles Mack (chasm@netcom.com) if you have questions.         ###
-okiibm_=$(GLOBJ)gdevokii.$(OBJ)
+okiibm_=$(DEVOBJ)gdevokii.$(OBJ)
 $(DD)okiibm.dev : $(okiibm_) $(DD)page.dev
        $(SETPDEV) $(DD)okiibm $(okiibm_)
-$(GLOBJ)gdevokii.$(OBJ) : $(GLSRC)gdevokii.c $(PDEVH)
+$(DEVOBJ)gdevokii.$(OBJ) : $(DEVSRC)gdevokii.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevokii.$(OBJ) $(C_) $(GLSRC)gdevokii.c
+        $(DEVCC) $(DEVO_)gdevokii.$(OBJ) $(C_) $(DEVSRC)gdevokii.c
 ### ------------------ The Epson Stylus Photo devices ------------------ ###
 ### This driver was contributed by a user: please contact                ###
 ###     Zoltan Kocsi (zoltan@bendor.com.au) if you have questions.       ###
-photoex_=$(GLOBJ)gdevphex.$(OBJ)
+photoex_=$(DEVOBJ)gdevphex.$(OBJ)
 $(DD)photoex.dev : $(photoex_) $(DD)page.dev
        $(SETPDEV) $(DD)photoex $(photoex_)
-$(GLOBJ)gdevphex.$(OBJ) : $(GLSRC)gdevphex.c $(PDEVH)
+$(DEVOBJ)gdevphex.$(OBJ) : $(DEVSRC)gdevphex.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevphex.$(OBJ) $(C_) $(GLSRC)gdevphex.c
+        $(DEVCC) $(DEVO_)gdevphex.$(OBJ) $(C_) $(DEVSRC)gdevphex.c
 ### ------------- The Ricoh 4081 laser printer device ------------------ ###
 ### Note: this driver was contributed by users:                          ###
 ###       please contact kdw@oasis.icl.co.uk if you have questions.      ###
-r4081_=$(GLOBJ)gdev4081.$(OBJ)
+r4081_=$(DEVOBJ)gdev4081.$(OBJ)
 $(DD)r4081.dev : $(r4081_) $(DD)page.dev
        $(SETPDEV) $(DD)r4081 $(r4081_)
-$(GLOBJ)gdev4081.$(OBJ) : $(GLSRC)gdev4081.c $(PDEVH)
+$(DEVOBJ)gdev4081.$(OBJ) : $(DEVSRC)gdev4081.c $(PDEVH)
-        $(GLCC) $(GLO_)gdev4081.$(OBJ) $(C_) $(GLSRC)gdev4081.c
+        $(DEVCC) $(DEVO_)gdev4081.$(OBJ) $(C_) $(DEVSRC)gdev4081.c
 ### -------------------- Sony NWP533 printer device -------------------- ###
 ### Note: this driver was contributed by a user: please contact Tero     ###
 ###       Kivinen (kivinen@joker.cs.hut.fi) if you have questions.       ###
-nwp533_=$(GLOBJ)gdevn533.$(OBJ)
+nwp533_=$(DEVOBJ)gdevn533.$(OBJ)
 $(DD)nwp533.dev : $(nwp533_) $(DD)page.dev
        $(SETPDEV) $(DD)nwp533 $(nwp533_)
-$(GLOBJ)gdevn533.$(OBJ) : $(GLSRC)gdevn533.c $(PDEVH)
+$(DEVOBJ)gdevn533.$(OBJ) : $(DEVSRC)gdevn533.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevn533.$(OBJ) $(C_) $(GLSRC)gdevn533.c
+        $(DEVCC) $(DEVO_)gdevn533.$(OBJ) $(C_) $(DEVSRC)gdevn533.c
 ### ------------------------- The SPARCprinter ------------------------- ###
 ### Note: this driver was contributed by users: please contact Martin    ###
@@ -677,31 +677,31 @@ $(GLOBJ)gdevn533.$(OBJ) : $(GLSRC)gdevn533.c $(PDEVH)
 ###       He would also like to hear from anyone using the driver.       ###
 ### Please consult the source code for additional documentation.         ###
-sparc_=$(GLOBJ)gdevsppr.$(OBJ)
+sparc_=$(DEVOBJ)gdevsppr.$(OBJ)
 $(DD)sparc.dev : $(sparc_) $(DD)page.dev
        $(SETPDEV) $(DD)sparc $(sparc_)
-$(GLOBJ)gdevsppr.$(OBJ) : $(GLSRC)gdevsppr.c $(PDEVH)
+$(DEVOBJ)gdevsppr.$(OBJ) : $(DEVSRC)gdevsppr.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevsppr.$(OBJ) $(C_) $(GLSRC)gdevsppr.c
+        $(DEVCC) $(DEVO_)gdevsppr.$(OBJ) $(C_) $(DEVSRC)gdevsppr.c
 ### ----------------- The StarJet SJ48 device -------------------------- ###
 ### Note: this driver was contributed by a user: if you have questions,  ###
 ###                           .                                          ###
 ###       please contact Mats Akerblom (f86ma@dd.chalmers.se).           ###
-sj48_=$(GLOBJ)gdevsj48.$(OBJ)
+sj48_=$(DEVOBJ)gdevsj48.$(OBJ)
 $(DD)sj48.dev : $(sj48_) $(DD)page.dev
        $(SETPDEV) $(DD)sj48 $(sj48_)
-$(GLOBJ)gdevsj48.$(OBJ) : $(GLSRC)gdevsj48.c $(PDEVH)
+$(DEVOBJ)gdevsj48.$(OBJ) : $(DEVSRC)gdevsj48.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevsj48.$(OBJ) $(C_) $(GLSRC)gdevsj48.c
+        $(DEVCC) $(DEVO_)gdevsj48.$(OBJ) $(C_) $(DEVSRC)gdevsj48.c
 ### ----------------- Tektronix 4396d color printer -------------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Karl Hakimian (hakimian@haney.eecs.wsu.edu)                    ###
 ###       if you have questions.                                         ###
-t4693d_=$(GLOBJ)gdev4693.$(OBJ)
+t4693d_=$(DEVOBJ)gdev4693.$(OBJ)
 $(DD)t4693d2.dev : $(t4693d_) $(DD)page.dev
        $(SETPDEV) $(DD)t4693d2 $(t4693d_)
@@ -711,19 +711,19 @@ $(DD)t4693d4.dev : $(t4693d_) $(DD)page.dev
 $(DD)t4693d8.dev : $(t4693d_) $(DD)page.dev
        $(SETPDEV) $(DD)t4693d8 $(t4693d_)
-$(GLOBJ)gdev4693.$(OBJ) : $(GLSRC)gdev4693.c $(PDEVH)
+$(DEVOBJ)gdev4693.$(OBJ) : $(DEVSRC)gdev4693.c $(PDEVH)
-        $(GLCC) $(GLO_)gdev4693.$(OBJ) $(C_) $(GLSRC)gdev4693.c
+        $(DEVCC) $(DEVO_)gdev4693.$(OBJ) $(C_) $(DEVSRC)gdev4693.c
 ### -------------------- Tektronix ink-jet printers -------------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Karsten Spang (spang@nbivax.nbi.dk) if you have questions.     ###
-tek4696_=$(GLOBJ)gdevtknk.$(OBJ)
+tek4696_=$(DEVOBJ)gdevtknk.$(OBJ)
 $(DD)tek4696.dev : $(tek4696_) $(DD)page.dev
        $(SETPDEV) $(DD)tek4696 $(tek4696_)
-$(GLOBJ)gdevtknk.$(OBJ) : $(GLSRC)gdevtknk.c $(PDEVH) $(malloc__h)
+$(DEVOBJ)gdevtknk.$(OBJ) : $(DEVSRC)gdevtknk.c $(PDEVH) $(malloc__h)
-        $(GLCC) $(GLO_)gdevtknk.$(OBJ) $(C_) $(GLSRC)gdevtknk.c
+        $(DEVCC) $(DEVO_)gdevtknk.$(OBJ) $(C_) $(DEVSRC)gdevtknk.c
 ###### ------------------------- Fax devices ------------------------- ######
@@ -731,15 +731,15 @@ $(GLOBJ)gdevtknk.$(OBJ) : $(GLSRC)gdevtknk.c $(PDEVH) $(malloc__h)
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Peter Schaefer <peter.schaefer@gmx.de> if you have questions.   ###
-cfax_=$(GLOBJ)gdevcfax.$(OBJ)
+cfax_=$(DEVOBJ)gdevcfax.$(OBJ)
 $(DD)cfax.dev : $(cfax_) $(DD)fax.dev
        $(SETDEV) $(DD)cfax $(cfax_)
        $(ADDMOD) $(DD)cfax -include $(DD)fax
-$(GLOBJ)gdevcfax.$(OBJ) : $(GLSRC)gdevcfax.c $(PDEVH)\
+$(DEVOBJ)gdevcfax.$(OBJ) : $(DEVSRC)gdevcfax.c $(PDEVH)\
 $(gdevfax_h) $(scfx_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevcfax.$(OBJ) $(C_) $(GLSRC)gdevcfax.c
+        $(DEVCC) $(DEVO_)gdevcfax.$(OBJ) $(C_) $(DEVSRC)gdevcfax.c
 ### ------------------------- The DigiFAX device ------------------------ ###
 ###    This driver outputs images in a format suitable for use with       ###
@@ -748,19 +748,19 @@ $(GLOBJ)gdevcfax.$(OBJ) : $(GLSRC)gdevcfax.c $(PDEVH)\
 ### Note: this driver was contributed by a user: please contact           ###
 ###       Rick Richardson (rick@digibd.com) if you have questions.        ###
-dfax_=$(GLOBJ)gdevdfax.$(OBJ)
+dfax_=$(DEVOBJ)gdevdfax.$(OBJ)
 $(DD)dfaxlow.dev : $(dfax_) $(DD)tfax.dev
        $(SETDEV) $(DD)dfaxlow $(dfax_)
-        $(ADDMOD) $(GLGEN)dfaxlow -include $(DD)tfax
+        $(ADDMOD) $(DEVGEN)dfaxlow -include $(DD)tfax
 $(DD)dfaxhigh.dev : $(dfax_) $(DD)tfax.dev
        $(SETDEV) $(DD)dfaxhigh $(dfax_)
-        $(ADDMOD) $(GLGEN)dfaxhigh -include $(DD)tfax
+        $(ADDMOD) $(DEVGEN)dfaxhigh -include $(DD)tfax
-$(GLOBJ)gdevdfax.$(OBJ) : $(GLSRC)gdevdfax.c $(PDEVH)\
+$(DEVOBJ)gdevdfax.$(OBJ) : $(DEVSRC)gdevdfax.c $(PDEVH)\
 $(gdevfax_h) $(gdevtfax_h) $(scfx_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevdfax.$(OBJ) $(C_) $(GLSRC)gdevdfax.c
+        $(DEVCC) $(DEVO_)gdevdfax.$(OBJ) $(C_) $(DEVSRC)gdevdfax.c
 ###### --------------------- Raster file formats --------------------- ######
@@ -768,36 +768,36 @@ $(GLOBJ)gdevdfax.$(OBJ) : $(GLSRC)gdevdfax.c $(PDEVH)\
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Frederic Petrot (petrot@masi.ibp.fr) if you have questions.    ###
-cif_=$(GLOBJ)gdevcif.$(OBJ)
+cif_=$(DEVOBJ)gdevcif.$(OBJ)
 $(DD)cif.dev : $(cif_) $(DD)page.dev
        $(SETPDEV) $(DD)cif $(cif_)
-$(GLOBJ)gdevcif.$(OBJ) : $(GLSRC)gdevcif.c $(PDEVH)
+$(DEVOBJ)gdevcif.$(OBJ) : $(DEVSRC)gdevcif.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevcif.$(OBJ) $(C_) $(GLSRC)gdevcif.c
+        $(DEVCC) $(DEVO_)gdevcif.$(OBJ) $(C_) $(DEVSRC)gdevcif.c
 ### ------------------------- Inferno bitmaps -------------------------- ###
 ### Note: this driver was contributed by a user: please contact          ###
 ###       Russ Cox <rsc@plan9.bell-labs.com> if you have questions.      ###
-inferno_=$(GLOBJ)gdevifno.$(OBJ)
+inferno_=$(DEVOBJ)gdevifno.$(OBJ)
 $(DD)inferno.dev : $(inferno_) $(DD)page.dev
        $(SETPDEV) $(DD)inferno $(inferno_)
-$(GLOBJ)gdevifno.$(OBJ) : $(GLSRC)gdevifno.c $(PDEVH)\
+$(DEVOBJ)gdevifno.$(OBJ) : $(DEVSRC)gdevifno.c $(PDEVH)\
 $(gsparam_h)
-        $(GLCC) $(GLO_)gdevifno.$(OBJ) $(C_) $(GLSRC)gdevifno.c
+        $(DEVCC) $(DEVO_)gdevifno.$(OBJ) $(C_) $(DEVSRC)gdevifno.c
 ### --------------------------- MGR devices ---------------------------- ###
 ### Note: these drivers were contributed by a user: please contact       ###
 ###       Carsten Emde (ce@ceag.ch) if you have questions.               ###
-MGR=$(GLOBJ)gdevmgr.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+MGR=$(DEVOBJ)gdevmgr.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-gdevmgr_h= $(GLSRC)gdevmgr.h
+gdevmgr_h= $(DEVSRC)gdevmgr.h
-$(GLOBJ)gdevmgr.$(OBJ) : $(GLSRC)gdevmgr.c $(PDEVH)\
+$(DEVOBJ)gdevmgr.$(OBJ) : $(DEVSRC)gdevmgr.c $(PDEVH)\
 $(gdevmgr_h) $(gdevpccm_h)
-        $(GLCC) $(GLO_)gdevmgr.$(OBJ) $(C_) $(GLSRC)gdevmgr.c
+        $(DEVCC) $(DEVO_)gdevmgr.$(OBJ) $(C_) $(DEVSRC)gdevmgr.c
 $(DD)mgrmono.dev : $(MGR) $(DD)page.dev
        $(SETPDEV) $(DD)mgrmono $(MGR)
@@ -819,25 +819,25 @@ $(DD)mgr8.dev : $(MGR) $(DD)page.dev
 ### -------------------------- SGI RGB pixmaps -------------------------- ###
-sgirgb_=$(GLOBJ)gdevsgi.$(OBJ)
+sgirgb_=$(DEVOBJ)gdevsgi.$(OBJ)
 $(DD)sgirgb.dev : $(sgirgb_) $(DD)page.dev
        $(SETPDEV) $(DD)sgirgb $(sgirgb_)
-gdevsgi_h=$(GLSRC)gdevsgi.h
+gdevsgi_h=$(DEVSRC)gdevsgi.h
-$(GLOBJ)gdevsgi.$(OBJ) : $(GLSRC)gdevsgi.c $(PDEVH) $(gdevsgi_h)
+$(DEVOBJ)gdevsgi.$(OBJ) : $(DEVSRC)gdevsgi.c $(PDEVH) $(gdevsgi_h)
-        $(GLCC) $(GLO_)gdevsgi.$(OBJ) $(C_) $(GLSRC)gdevsgi.c
+        $(DEVCC) $(DEVO_)gdevsgi.$(OBJ) $(C_) $(DEVSRC)gdevsgi.c
 ### ---------------- Sun raster files ---------------- ###
-sunr_=$(GLOBJ)gdevsunr.$(OBJ)
+sunr_=$(DEVOBJ)gdevsunr.$(OBJ)
 # Harlequin variant, 1-bit
 $(DD)sunhmono.dev : $(sunr_) $(DD)page.dev
        $(SETPDEV) $(DD)sunhmono $(sunr_)
-$(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
+$(DEVOBJ)gdevsunr.$(OBJ) : $(DEVSRC)gdevsunr.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevsunr.$(OBJ) $(C_) $(GLSRC)gdevsunr.c
+        $(DEVCC) $(DEVO_)gdevsunr.$(OBJ) $(C_) $(DEVSRC)gdevsunr.c
 #########################################################################
diff --git a/gs/base/devs.mak b/gs/devices/devs.mak
index 0da9c82cf..667961e25 100644
--- a/gs/base/devs.mak
+++ b/gs/devices/devs.mak
@@ -15,12 +15,30 @@
 # makefile for Artifex's device drivers.
 # Define the name of this makefile.
-DEVS_MAK=$(GLSRC)devs.mak
+DEVS_MAK=$(DEVSRC)devs.mak
+DEVSRC=$(DEVSRCDIR)$(D)
+DEVVEC=$(DEVSRC)vector
+DEVVECSRC=$(DEVVEC)$(D)
+DEVI_=$(DEVGENDIR) $(II)$(GLSRCDIR) $(II)$(DEVSRCDIR) 
+DEVF_=
+DEVCCFLAGS=$(I_)$(DEVI_)$(_I) $(I_)$(DEVVEC)$(_I) $(DEVF_)
+DEVCC=$(CC_) $(DEVCCFLAGS)
+DEVJCC=$(GLJCC)
+DEVCCSHARED=$(GLCCSHARED)
 # All device drivers depend on the following:
 GDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h)
 GDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
+DEVOBJ=$(DEVOBJDIR)$(D)
+DEVO_=$(O_)$(DEVOBJ)
+DEVGEN=$(DEVGENDIR)$(D)
 ###### --------------------------- Overview -------------------------- ######
 # It is possible to build Ghostscript with an arbitrary collection of device
@@ -252,56 +270,42 @@ GDEV=$(AK) $(ECHOGS_XE) $(GDEVH)
 # "Printer" drivers depend on the following:
 PDEVH=$(AK) $(gdevprn_h)
+gxfcopy_h=$(DEVSRC)gxfcopy.h $(gsccode_h)
 # Define the header files for device drivers.  Every header file used by
 # more than one device driver family must be listed here.
-gdev8bcm_h=$(GLSRC)gdev8bcm.h
+gdev8bcm_h=$(DEVSRC)gdev8bcm.h
-gdevcbjc_h=$(GLSRC)gdevcbjc.h $(stream_h)
+gdevcbjc_h=$(DEVSRC)gdevcbjc.h $(stream_h)
-gdevdcrd_h=$(GLSRC)gdevdcrd.h
-gsequivc_h=$(GLSRC)gsequivc.h
+gdevpcfb_h=$(DEVSRC)gdevpcfb.h $(dos__h)
-gdevdevn_h=$(GLSRC)gdevdevn.h $(gsequivc_h)
+gdevpcl_h=$(DEVSRC)gdevpcl.h
-gdevpccm_h=$(GLSRC)gdevpccm.h
+gdevpsu_h=$(DEVVECSRC)gdevpsu.h
-gdevpcfb_h=$(GLSRC)gdevpcfb.h $(dos__h)
+gdevsvga_h=$(DEVSRC)gdevsvga.h
-gdevpcl_h=$(GLSRC)gdevpcl.h
-gdevpsu_h=$(GLSRC)gdevpsu.h
-gdevsvga_h=$(GLSRC)gdevsvga.h
 # Out of order
-gdevdljm_h=$(GLSRC)gdevdljm.h $(gdevpcl_h)
+gdevdljm_h=$(DEVSRC)gdevdljm.h $(gdevpcl_h)
-ConvertUTF_h=$(GLSRC)ConvertUTF.h
-GDEVLDFJB2CC=$(CC_) $(I_)$(GLI_) $(II)$(LDF_JB2I_)$(_I) $(JB2CF_) $(GLF_)
+GDEVLDFJB2CC=$(CC_) $(I_)$(DEVI_) $(II)$(LDF_JB2I_)$(_I) $(JB2CF_) $(GLF_)
-GDEVLWFJPXCC=$(CC_) $(I_)$(GLI_) $(II)$(LWF_JPXI_)$(_I) $(JPXCF_) $(GLF_)
+GDEVLWFJPXCC=$(CC_) $(I_)$(DEVI_) $(II)$(LWF_JPXI_)$(_I) $(JPXCF_) $(GLF_)
-GDEVLWFJB2JPXCC=$(CC_) $(I_)$(GLI_)  $(II)$(LDF_JB2I_) $(II)$(LWF_JPXI_)$(_I) $(JB2CF_) $(JPXCF_) $(GLF_)
+GDEVLWFJB2JPXCC=$(CC_) $(I_)$(DEVI_)  $(II)$(LDF_JB2I_) $(II)$(LWF_JPXI_)$(_I) $(JB2CF_) $(JPXCF_) $(GLF_)
 ###### ----------------------- Device support ----------------------- ######
 # Implement dynamic color management for 8-bit mapped color displays.
-$(GLOBJ)gdev8bcm.$(OBJ) : $(GLSRC)gdev8bcm.c $(AK)\
+$(DEVOBJ)gdev8bcm.$(OBJ) : $(DEVSRC)gdev8bcm.c $(AK)\
 $(gx_h) $(gxdevice_h) $(gdev8bcm_h)
-        $(GLCC) $(GLO_)gdev8bcm.$(OBJ) $(C_) $(GLSRC)gdev8bcm.c
+        $(DEVCC) $(DEVO_)gdev8bcm.$(OBJ) $(C_) $(DEVSRC)gdev8bcm.c
-# PC display color mapping
-$(GLOBJ)gdevpccm.$(OBJ) : $(GLSRC)gdevpccm.c $(AK)\
- $(gx_h) $(gsmatrix_h) $(gxdevice_h) $(gdevpccm_h)
-        $(GLCC) $(GLO_)gdevpccm.$(OBJ) $(C_) $(GLSRC)gdevpccm.c
 # Generate Canon BJC command sequences.
-$(GLOBJ)gdevcbjc.$(OBJ) : $(GLSRC)gdevcbjc.c $(AK)\
+$(DEVOBJ)gdevcbjc.$(OBJ) : $(DEVSRC)gdevcbjc.c $(AK)\
 $(std_h) $(stream_h) $(gdevcbjc_h)
-        $(GLCC) $(GLO_)gdevcbjc.$(OBJ) $(C_) $(GLSRC)gdevcbjc.c
+        $(DEVCC) $(DEVO_)gdevcbjc.$(OBJ) $(C_) $(DEVSRC)gdevcbjc.c
-# Provide a sample device CRD.
-$(GLOBJ)gdevdcrd.$(OBJ) : $(GLSRC)gdevdcrd.c $(AK)\
- $(math__h) $(memory__h) $(string__h)\
- $(gscrd_h) $(gscrdp_h) $(gserrors_h) $(gsparam_h) $(gscspace_h)\
- $(gx_h) $(gxdevcli_h) $(gdevdcrd_h)
-        $(GLCC) $(GLO_)gdevdcrd.$(OBJ) $(C_) $(GLSRC)gdevdcrd.c
 # Support for writing PostScript (high- or low-level).
-$(GLOBJ)gdevpsu.$(OBJ) : $(GLSRC)gdevpsu.c $(GX) $(GDEV) $(math__h) $(time__h)\
+$(DEVOBJ)gdevpsu.$(OBJ) : $(DEVVECSRC)gdevpsu.c $(GX) $(GDEV) $(math__h) $(time__h)\
 $(stat__h) $(unistd__h)\
 $(gdevpsu_h) $(gscdefs_h) $(gxdevice_h)\
 $(spprint_h) $(stream_h)
-        $(GLCC) $(GLO_)gdevpsu.$(OBJ) $(C_) $(GLSRC)gdevpsu.c
+        $(DEVCC) $(DEVO_)gdevpsu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsu.c
 ###### ------------------- MS-DOS display devices ------------------- ######
@@ -311,24 +315,24 @@ $(GLOBJ)gdevpsu.$(OBJ) : $(GLSRC)gdevpsu.c $(GX) $(GDEV) $(math__h) $(time__h)\
 ### ----------------------- EGA and VGA displays ----------------------- ###
-EGAVGA_DOS=$(GLOBJ)gdevevga.$(OBJ) $(GLOBJ)gdevpcfb.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+EGAVGA_DOS=$(DEVOBJ)gdevevga.$(OBJ) $(DEVOBJ)gdevpcfb.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-EGAVGA_SCO=$(GLOBJ)gdevsco.$(OBJ) $(GLOBJ)gdevpcfb.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+EGAVGA_SCO=$(DEVOBJ)gdevsco.$(OBJ) $(DEVOBJ)gdevpcfb.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
 # NOTE: for direct frame buffer addressing under SCO Unix or Xenix,
 # change DOS to SCO in the following line.
 EGAVGA=$(EGAVGA_DOS)
 #**************** $(CCD) gdevevga.c
-$(GLOBJ)gdevevga.$(OBJ) : $(GLSRC)gdevevga.c $(GDEV) $(memory__h) $(gdevpcfb_h)
+$(DEVOBJ)gdevevga.$(OBJ) : $(DEVSRC)gdevevga.c $(GDEV) $(memory__h) $(gdevpcfb_h)
-        $(GLCC) $(GLO_)gdevevga.$(OBJ) $(C_) $(GLSRC)gdevevga.c
+        $(DEVCC) $(DEVO_)gdevevga.$(OBJ) $(C_) $(DEVSRC)gdevevga.c
-$(GLOBJ)gdevsco.$(OBJ) : $(GLSRC)gdevsco.c $(GDEV) $(memory__h) $(gdevpcfb_h)
+$(DEVOBJ)gdevsco.$(OBJ) : $(DEVSRC)gdevsco.c $(GDEV) $(memory__h) $(gdevpcfb_h)
-        $(GLCC) $(GLO_)gdevsco.$(OBJ) $(C_) $(GLSRC)gdevsco.c
+        $(DEVCC) $(DEVO_)gdevsco.$(OBJ) $(C_) $(DEVSRC)gdevsco.c
 # Common code for MS-DOS and SCO.
 #**************** $(CCD) gdevpcfb.c
-$(GLOBJ)gdevpcfb.$(OBJ) : $(GLSRC)gdevpcfb.c $(GDEV) $(memory__h)\
+$(DEVOBJ)gdevpcfb.$(OBJ) : $(DEVSRC)gdevpcfb.c $(GDEV) $(memory__h)\
 $(gdevpccm_h) $(gdevpcfb_h) $(gsparam_h)
-        $(GLCC) $(GLO_)gdevpcfb.$(OBJ) $(C_) $(GLSRC)gdevpcfb.c
+        $(DEVCC) $(DEVO_)gdevpcfb.$(OBJ) $(C_) $(DEVSRC)gdevpcfb.c
 # The EGA/VGA family includes EGA and VGA.  Many SuperVGAs in 800x600,
 # 16-color mode can share the same code; see the next section below.
@@ -353,12 +357,12 @@ $(DD)svga16.dev : $(DEVS_MAK) $(EGAVGA) $(GDEV)
 # More capable SuperVGAs have a wide variety of slightly differing
 # interfaces, so we need a separate driver for each one.
-SVGA=$(GLOBJ)gdevsvga.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+SVGA=$(DEVOBJ)gdevsvga.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
 #**************** $(CCD) gdevsvga.c
-$(GLOBJ)gdevsvga.$(OBJ) : $(GLSRC)gdevsvga.c $(GDEV) $(memory__h)\
+$(DEVOBJ)gdevsvga.$(OBJ) : $(DEVSRC)gdevsvga.c $(GDEV) $(memory__h)\
 $(gsparam_h) $(gxarith_h) $(gdevpccm_h) $(gdevpcfb_h) $(gdevsvga_h)
-        $(GLCC) $(GLO_)gdevsvga.$(OBJ) $(C_) $(GLSRC)gdevsvga.c
+        $(DEVCC) $(DEVO_)gdevsvga.$(OBJ) $(C_) $(DEVSRC)gdevsvga.c
 # The SuperVGA family includes: Avance Logic Inc., ATI Wonder, S3,
 # Trident, Tseng ET3000/4000, and VESA.
@@ -383,28 +387,28 @@ $(DD)vesa.dev : $(DEVS_MAK) $(SVGA) $(GDEV)
 # The S3 driver doesn't share much code with the others.
-s3vga_=$(GLOBJ)gdevs3ga.$(OBJ) $(GLOBJ)gdevsvga.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+s3vga_=$(DEVOBJ)gdevs3ga.$(OBJ) $(DEVOBJ)gdevsvga.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
 $(DD)s3vga.dev : $(DEVS_MAK) $(SVGA) $(s3vga_) $(GDEV)
        $(SETDEV) $(DD)s3vga $(SVGA)
        $(ADDMOD) $(DD)s3vga -obj $(s3vga_)
 #**************** $(CCD) gdevs3ga.c
-$(GLOBJ)gdevs3ga.$(OBJ) : $(GLSRC)gdevs3ga.c $(GDEV) $(gdevpcfb_h) $(gdevsvga_h)
+$(DEVOBJ)gdevs3ga.$(OBJ) : $(DEVSRC)gdevs3ga.c $(GDEV) $(gdevpcfb_h) $(gdevsvga_h)
-        $(GLCC) $(GLO_)gdevs3ga.$(OBJ) $(C_) $(GLSRC)gdevs3ga.c
+        $(DEVCC) $(DEVO_)gdevs3ga.$(OBJ) $(C_) $(DEVSRC)gdevs3ga.c
 ###### ----------------------- Other displays ------------------------ ######
 ### ------------------ Display device for DLL platforms ----------------- ###
-display_=$(GLOBJ)gdevdsp.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ) $(GLOBJ)gdevdevn.$(OBJ) \
+display_=$(DEVOBJ)gdevdsp.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ) $(DEVOBJ)gdevdevn.$(OBJ) \
-         $(GLOBJ)gsequivc.$(OBJ) $(GLOBJ)gdevdcrd.$(OBJ)
+         $(DEVOBJ)gsequivc.$(OBJ) $(DEVOBJ)gdevdcrd.$(OBJ)
 $(DD)display.dev : $(display_) $(GDEV)
        $(SETDEV) $(DD)display $(display_)
-$(GLOBJ)gdevdsp.$(OBJ) : $(GLSRC)gdevdsp.c $(string__h)\
+$(DEVOBJ)gdevdsp.$(OBJ) : $(DEVSRC)gdevdsp.c $(string__h)\
 $(gp_h) $(gpcheck_h) $(gdevpccm_h) $(gsparam_h) $(gsdevice_h)\
 $(GDEVH) $(gxdevmem_h) $(gdevdevn_h) $(gsequivc_h) $(gdevdsp_h) $(gdevdsp2_h)
-        $(GLCC) $(GLO_)gdevdsp.$(OBJ) $(C_) $(GLSRC)gdevdsp.c
+        $(DEVCC) $(DEVO_)gdevdsp.$(OBJ) $(C_) $(DEVSRC)gdevdsp.c
 ### ---------------------- Linux PC with vgalib ------------------------- ###
@@ -415,30 +419,30 @@ $(GLOBJ)gdevdsp.$(OBJ) : $(GLSRC)gdevdsp.c $(string__h)\
 ###       Erik Talvola (talvola@gnu.ai.mit.edu).                          ###
 ### Note that the vgalib device supports only 16-color VGA modes.         ###
-lvga256_=$(GLOBJ)gdevl256.$(OBJ)
+lvga256_=$(DEVOBJ)gdevl256.$(OBJ)
 $(DD)lvga256.dev : $(DEVS_MAK) $(lvga256_) $(GDEV)
        $(SETDEV) $(DD)lvga256 $(lvga256_)
        $(ADDMOD) $(DD)lvga256 -lib vga vgagl
-$(GLOBJ)gdevl256.$(OBJ) : $(GLSRC)gdevl256.c $(GDEV) $(memory__h)
+$(DEVOBJ)gdevl256.$(OBJ) : $(DEVSRC)gdevl256.c $(GDEV) $(memory__h)
-        $(GLCCSHARED) $(GLO_)gdevl256.$(OBJ) $(C_) $(GLSRC)gdevl256.c
+        $(DEVCCSHARED) $(DEVO_)gdevl256.$(OBJ) $(C_) $(DEVSRC)gdevl256.c
-vgalib_=$(GLOBJ)gdevvglb.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+vgalib_=$(DEVOBJ)gdevvglb.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
 $(DD)vgalib.dev : $(DEVS_MAK) $(vgalib_) $(GDEV)
        $(SETDEV2) $(DD)vgalib $(vgalib_)
        $(ADDMOD) $(DD)vgalib -lib vga
-$(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvglb.c $(GDEV) $(gdevpccm_h) $(gsparam_h)
+$(DEVOBJ)gdevvglb.$(OBJ) : $(DEVSRC)gdevvglb.c $(GDEV) $(gdevpccm_h) $(gsparam_h)
-        $(GLCCSHARED) $(GLO_)gdevvglb.$(OBJ) $(C_) $(GLSRC)gdevvglb.c
+        $(DEVCCSHARED) $(DEVO_)gdevvglb.$(OBJ) $(C_) $(DEVSRC)gdevvglb.c
 ### Shared library object supporting vgalib.
 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
-$(GLOBJ)lvga256.so : $(lvga256_)
+$(DEVOBJ)lvga256.so : $(lvga256_)
-        $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl
+        $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)lvga256.so $(lvga256_) -lvga -lvgagl
-$(GLOBJ)vgalib.so : $(vgalib_)
+$(DEVOBJ)vgalib.so : $(vgalib_)
-        $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl
+        $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)vgalib.so $(vgalib_) -lvga -lvgagl
 ### -------------------------- The X11 device -------------------------- ###
@@ -446,13 +450,12 @@ $(GLOBJ)vgalib.so : $(vgalib_)
 # For more information about Ghostview, please contact Tim Theisen
 # (ghostview@cs.wisc.edu).
-x__h=$(GLSRC)x_.h
+gdevxcmp_h=$(DEVSRC)gdevxcmp.h
-gdevxcmp_h=$(GLSRC)gdevxcmp.h
+gdevx_h=$(DEVSRC)gdevx.h $(gdevbbox_h) $(gdevxcmp_h)
-gdevx_h=$(GLSRC)gdevx.h $(gdevbbox_h) $(gdevxcmp_h)
 # See the main makefile for the definition of XLIBDIRS and XLIBS.
-x11_=$(GLOBJ)gdevx.$(OBJ) $(GLOBJ)gdevxcmp.$(OBJ) $(GLOBJ)gdevxini.$(OBJ)\
+x11_=$(DEVOBJ)gdevx.$(OBJ) $(DEVOBJ)gdevxcmp.$(OBJ) $(DEVOBJ)gdevxini.$(OBJ)\
- $(GLOBJ)gdevxres.$(OBJ) $(GLOBJ)gsparamx.$(OBJ)
+ $(DEVOBJ)gdevxres.$(OBJ) $(DEVOBJ)gsparamx.$(OBJ)
 $(DD)x11_.dev : $(DEVS_MAK) $(x11_) $(GLD)bboxutil.dev $(GDEV)
        $(SETMOD) $(DD)x11_ $(x11_)
        $(ADDMOD) $(DD)x11_ -link $(XLIBDIRS)
@@ -464,23 +467,23 @@ $(DD)x11.dev : $(DEVS_MAK) $(DD)x11_.dev $(GDEV)
 # See the main makefile for the definition of XINCLUDE.
 GDEVX=$(GDEV) $(x__h) $(gdevx_h) $(TOP_MAKEFILES)
-$(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $(GDEVX) $(math__h) $(memory__h)\
+$(DEVOBJ)gdevx.$(OBJ) : $(DEVSRC)gdevx.c $(GDEVX) $(math__h) $(memory__h)\
 $(gscoord_h) $(gsdevice_h) $(gsiparm2_h) $(gsmatrix_h) $(gsparam_h)\
 $(gxdevmem_h) $(gxgetbit_h) $(gxiparam_h) $(gxpath_h)
-        $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
+        $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevx.$(OBJ) $(C_) $(DEVSRC)gdevx.c
-$(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
+$(DEVOBJ)gdevxcmp.$(OBJ) : $(DEVSRC)gdevxcmp.c $(GDEVX) $(math__h)
-        $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
+        $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxcmp.$(OBJ) $(C_) $(DEVSRC)gdevxcmp.c
-$(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
+$(DEVOBJ)gdevxini.$(OBJ) : $(DEVSRC)gdevxini.c $(GDEVX) $(memory__h)\
 $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
-        $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxini.$(OBJ) $(C_) $(GLSRC)gdevxini.c
+        $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxini.$(OBJ) $(C_) $(DEVSRC)gdevxini.c
 # We have to compile gdevxres without warnings, because there is a
 # const/non-const cast required by the X headers that we can't work around.
-$(GLOBJ)gdevxres.$(OBJ) : $(GLSRC)gdevxres.c $(std_h) $(x__h)\
+$(DEVOBJ)gdevxres.$(OBJ) : $(DEVSRC)gdevxres.c $(std_h) $(x__h)\
 $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h)
-        $(CC_NO_WARN) $(GLCCFLAGS) $(XINCLUDE) $(GLO_)gdevxres.$(OBJ) $(C_) $(GLSRC)gdevxres.c
+        $(CC_NO_WARN) $(GLCCFLAGS) $(XINCLUDE) $(DEVO_)gdevxres.$(OBJ) $(C_) $(DEVSRC)gdevxres.c
 # Alternate X11-based devices to help debug other drivers.
 # x11alpha pretends to have 4 bits of alpha channel.
@@ -493,7 +496,7 @@ $(GLOBJ)gdevxres.$(OBJ) : $(GLSRC)gdevxres.c $(std_h) $(x__h)\
 # x11mono pretends to be a black-and-white device.
 # x11rg16x pretends to be a G5/B5/R6 color device.
 # x11rg16x pretends to be a G11/B10/R11 color device.
-x11alt_=$(GLOBJ)gdevxalt.$(OBJ)
+x11alt_=$(DEVOBJ)gdevxalt.$(OBJ)
 $(DD)x11alt_.dev : $(DEVS_MAK) $(x11alt_) $(DD)x11_.dev $(GDEV)
        $(SETMOD) $(DD)x11alt_ $(x11alt_)
        $(ADDMOD) $(DD)x11alt_ -include $(DD)x11_
@@ -528,21 +531,21 @@ $(DD)x11rg16x.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV)
 $(DD)x11rg32x.dev : $(DEVS_MAK) $(DD)x11alt_.dev $(GDEV)
        $(SETDEV2) $(DD)x11rg32x -include $(DD)x11alt_
-$(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
+$(DEVOBJ)gdevxalt.$(OBJ) : $(DEVSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
 $(gsdevice_h) $(gsparam_h) $(gsstruct_h) $(GDEV)
-        $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxalt.$(OBJ) $(C_) $(GLSRC)gdevxalt.c
+        $(DEVCCSHARED) $(XINCLUDE) $(DEVO_)gdevxalt.$(OBJ) $(C_) $(DEVSRC)gdevxalt.c
 ### Shared library object supporting X11.
 ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
-$(GLOBJ)X11.so : $(x11alt_) $(x11_)
+$(DEVOBJ)X11.so : $(x11alt_) $(x11_)
-        $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+        $(CCLD) $(LDFLAGS) -shared -o $(DEVOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
 ###### --------------- Memory-buffered printer devices --------------- ######
 ### ---------------- Practical Automation label printers ---------------- ###
-atx_=$(GLOBJ)gdevatx.$(OBJ)
+atx_=$(DEVOBJ)gdevatx.$(OBJ)
 $(DD)atx23.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)atx23 $(atx_)
@@ -553,8 +556,8 @@ $(DD)atx24.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV)
 $(DD)atx38.dev : $(DEVS_MAK) $(atx_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)atx38 $(atx_)
-$(GLOBJ)gdevatx.$(OBJ) : $(GLSRC)gdevatx.c $(PDEVH) $(math__h) $(GDEV)
+$(DEVOBJ)gdevatx.$(OBJ) : $(DEVSRC)gdevatx.c $(PDEVH) $(math__h) $(GDEV)
-        $(GLCC) $(GLO_)gdevatx.$(OBJ) $(C_) $(GLSRC)gdevatx.c
+        $(DEVCC) $(DEVO_)gdevatx.$(OBJ) $(C_) $(DEVSRC)gdevatx.c
 ### ----------- The H-P DeskJet and LaserJet printer devices ----------- ###
@@ -566,19 +569,19 @@ $(GLOBJ)gdevatx.$(OBJ) : $(GLSRC)gdevatx.c $(PDEVH) $(math__h) $(GDEV)
 ### For questions about the fs600 device, please contact                  ###
 ### Peter Schildmann (peter.schildmann@etechnik.uni-rostock.de).          ###
-HPPCL=$(GLOBJ)gdevpcl.$(OBJ)
+HPPCL=$(DEVOBJ)gdevpcl.$(OBJ)
-HPDLJM=$(GLOBJ)gdevdljm.$(OBJ) $(HPPCL)
+HPDLJM=$(DEVOBJ)gdevdljm.$(OBJ) $(HPPCL)
-HPMONO=$(GLOBJ)gdevdjet.$(OBJ) $(HPDLJM)
+HPMONO=$(DEVOBJ)gdevdjet.$(OBJ) $(HPDLJM)
-$(GLOBJ)gdevpcl.$(OBJ) : $(GLSRC)gdevpcl.c $(PDEVH) $(math__h) $(gdevpcl_h)\
+$(DEVOBJ)gdevpcl.$(OBJ) : $(DEVSRC)gdevpcl.c $(PDEVH) $(math__h) $(gdevpcl_h)\
 $(GDEV)
-        $(GLCC) $(GLO_)gdevpcl.$(OBJ) $(C_) $(GLSRC)gdevpcl.c
+        $(DEVCC) $(DEVO_)gdevpcl.$(OBJ) $(C_) $(DEVSRC)gdevpcl.c
-$(GLOBJ)gdevdljm.$(OBJ) : $(GLSRC)gdevdljm.c $(PDEVH) $(gdevdljm_h) $(GDEV)
+$(DEVOBJ)gdevdljm.$(OBJ) : $(DEVSRC)gdevdljm.c $(PDEVH) $(gdevdljm_h) $(GDEV)
-        $(GLCC) $(GLO_)gdevdljm.$(OBJ) $(C_) $(GLSRC)gdevdljm.c
+        $(DEVCC) $(DEVO_)gdevdljm.$(OBJ) $(C_) $(DEVSRC)gdevdljm.c
-$(GLOBJ)gdevdjet.$(OBJ) : $(GLSRC)gdevdjet.c $(PDEVH) $(gdevdljm_h) $(GDEV)
+$(DEVOBJ)gdevdjet.$(OBJ) : $(DEVSRC)gdevdjet.c $(PDEVH) $(gdevdljm_h) $(GDEV)
-        $(GLCC) $(GLO_)gdevdjet.$(OBJ) $(C_) $(GLSRC)gdevdjet.c
+        $(DEVCC) $(DEVO_)gdevdjet.$(OBJ) $(C_) $(DEVSRC)gdevdjet.c
 $(DD)deskjet.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)deskjet $(HPMONO)
@@ -637,31 +640,29 @@ $(DD)oce9050.dev : $(DEVS_MAK) $(HPMONO) $(GLD)page.dev $(GDEV)
 ###     - If you have any other model of LJ 5 or 6, use the pxlmono
 ###     driver, which often produces much more compact output.
-gdevpxat_h=$(GLSRC)gdevpxat.h
-gdevpxen_h=$(GLSRC)gdevpxen.h
+gdevpxut_h=$(DEVVECSRC)gdevpxut.h
-gdevpxop_h=$(GLSRC)gdevpxop.h
-gdevpxut_h=$(GLSRC)gdevpxut.h
-$(GLOBJ)gdevpxut.$(OBJ) : $(GLSRC)gdevpxut.c $(math__h) $(string__h)\
+$(DEVOBJ)gdevpxut.$(OBJ) : $(DEVVECSRC)gdevpxut.c $(math__h) $(string__h)\
 $(gx_h) $(gxdevcli_h) $(stream_h)\
 $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(GDEV)
-        $(GLCC) $(GLO_)gdevpxut.$(OBJ) $(C_) $(GLSRC)gdevpxut.c
+        $(DEVCC) $(DEVO_)gdevpxut.$(OBJ) $(C_) $(DEVVECSRC)gdevpxut.c
-ljet5_=$(GLOBJ)gdevlj56.$(OBJ) $(GLOBJ)gdevpxut.$(OBJ) $(HPPCL)
+ljet5_=$(DEVOBJ)gdevlj56.$(OBJ) $(DEVOBJ)gdevpxut.$(OBJ) $(HPPCL)
 $(DD)lj5mono.dev : $(DEVS_MAK) $(ljet5_) $(GLD)page.dev $(GDEV)
        $(SETPDEV) $(DD)lj5mono $(ljet5_)
 $(DD)lj5gray.dev : $(DEVS_MAK) $(ljet5_) $(GLD)page.dev $(GDEV)
        $(SETPDEV) $(DD)lj5gray $(ljet5_)
-$(GLOBJ)gdevlj56.$(OBJ) : $(GLSRC)gdevlj56.c $(PDEVH) $(gdevpcl_h)\
+$(DEVOBJ)gdevlj56.$(OBJ) : $(DEVVECSRC)gdevlj56.c $(PDEVH) $(gdevpcl_h)\
 $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(stream_h)
-        $(GLCC) $(GLO_)gdevlj56.$(OBJ) $(C_) $(GLSRC)gdevlj56.c
+        $(DEVCC) $(DEVO_)gdevlj56.$(OBJ) $(C_) $(DEVVECSRC)gdevlj56.c
 ### -------------------- The ijs client ----------------- ###
-ijs_=$(GLOBJ)gdevijs.$(OBJ)
+ijs_=$(DEVOBJ)gdevijs.$(OBJ)
 #$(IJSOBJ)ijs.$(OBJ) $(IJSOBJ)ijs_client.$(OBJ) \
 # $(IJSOBJ)ijs_exec_$(IJSEXECTYPE).$(OBJ)
@@ -670,10 +671,10 @@ $(DD)ijs.dev : $(ijs_) $(GLD)page.dev $(DD)ijslib.dev $(GDEV)
        $(SETPDEV) $(DD)ijs $(ijs_)
        $(ADDMOD) $(DD)ijs -include $(GLD)ijslib
-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
+$(DEVOBJ)gdevijs.$(OBJ) : $(DEVSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
 $(GDEV)
-        $(CC_) $(I_)$(GLI_) $(II)$(IJSI_)$(_I) $(II)$(IJSI_)$(D)..$(_I) \
+        $(CC_) $(I_)$(DEVI_) $(II)$(IJSI_)$(_I) $(II)$(IJSI_)$(D)..$(_I) \
-            $(GLF_) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
+            $(GLF_) $(DEVO_)gdevijs.$(OBJ) $(C_) $(DEVSRC)gdevijs.c
 # Please see ijs.mak for the Makefile fragment which builds the IJS
 # library.
@@ -681,9 +682,9 @@ $(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH) $(unistd__h) $(gp_h)\
 ### -------------------------- The rinkj device ------------------------ ###
-RINKJ_SRCDIR=$(GLSRC)rinkj
+RINKJ_SRCDIR=$(DEVSRC)rinkj
 RINKJ_SRC=$(RINKJ_SRCDIR)$(D)
-RINKJ_OBJ=$(GLOBJ)
+RINKJ_OBJ=$(DEVOBJ)
 RINKJ_O_=$(O_)$(RINKJ_OBJ)
 RINKJ_INCL=$(I_)$(RINKJ_SRCDIR)$(_I)
@@ -715,30 +716,30 @@ $(RINKJ_OBJ)rinkj-epson870.$(OBJ) : $(RINKJ_SRC)rinkj-epson870.c
 $(RINKJ_OBJ)rinkj-screen-eb.$(OBJ) : $(RINKJ_SRC)rinkj-screen-eb.c
        $(RINKJ_CC) $(RINKJ_O_)rinkj-screen-eb.$(OBJ) $(C_) $(RINKJ_SRC)rinkj-screen-eb.c
-rinkj_=$(GLOBJ)gdevrinkj.$(OBJ) $(rinkj_core)
+rinkj_=$(DEVOBJ)gdevrinkj.$(OBJ) $(rinkj_core)
 $(DD)rinkj.dev : $(DEVS_MAK) $(rinkj_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)rinkj $(rinkj_)
-$(GLOBJ)gdevrinkj.$(OBJ) : $(GLSRC)gdevrinkj.c $(PDEVH) $(math__h)\
+$(DEVOBJ)gdevrinkj.$(OBJ) : $(DEVSRC)gdevrinkj.c $(PDEVH) $(math__h)\
 $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
 $(gxdcconv_h) $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h)
-        $(GLCC) $(GLO_)gdevrinkj.$(OBJ) $(C_) $(GLSRC)gdevrinkj.c
+        $(DEVCC) $(DEVO_)gdevrinkj.$(OBJ) $(C_) $(DEVSRC)gdevrinkj.c
 ###### ------------------- High-level file formats ------------------- ######
 # Support for PostScript and PDF
-gdevpsdf_h=$(GLSRC)gdevpsdf.h $(gdevvec_h) $(gsparam_h)\
+gdevpsdf_h=$(DEVVECSRC)gdevpsdf.h $(gdevvec_h) $(gsparam_h)\
 $(sa85x_h) $(scfx_h) $(spsdf_h) $(strimpl_h)
-gdevpsds_h=$(GLSRC)gdevpsds.h $(strimpl_h) $(gsiparam_h)
+gdevpsds_h=$(DEVVECSRC)gdevpsds.h $(strimpl_h) $(gsiparam_h)
-psdf_1=$(GLOBJ)gdevpsdi.$(OBJ) $(GLOBJ)gdevpsdp.$(OBJ)
+psdf_1=$(DEVOBJ)gdevpsdi.$(OBJ) $(DEVOBJ)gdevpsdp.$(OBJ)
-psdf_2=$(GLOBJ)gdevpsds.$(OBJ) $(GLOBJ)gdevpsdu.$(OBJ)
+psdf_2=$(DEVOBJ)gdevpsds.$(OBJ) $(DEVOBJ)gdevpsdu.$(OBJ)
-psdf_3=$(GLOBJ)scfparam.$(OBJ) $(GLOBJ)sdcparam.$(OBJ) $(GLOBJ)sdeparam.$(OBJ)
+psdf_3=$(DEVOBJ)scfparam.$(OBJ) $(DEVOBJ)sdcparam.$(OBJ) $(DEVOBJ)sdeparam.$(OBJ)
-psdf_4=$(GLOBJ)spprint.$(OBJ) $(GLOBJ)spsdf.$(OBJ) $(GLOBJ)sstring.$(OBJ)
+psdf_4=$(DEVOBJ)spprint.$(OBJ) $(DEVOBJ)spsdf.$(OBJ) $(DEVOBJ)sstring.$(OBJ)
-psdf_5=$(GLOBJ)gsparamx.$(OBJ)
+psdf_5=$(DEVOBJ)gsparamx.$(OBJ)
 psdf_=$(psdf_1) $(psdf_2) $(psdf_3) $(psdf_4) $(psdf_5)
 psdf_inc1=$(GLD)vector.dev $(GLD)pngp.dev $(GLD)seexec.dev
 psdf_inc2=$(GLD)sdcte.dev $(GLD)slzwe.dev $(GLD)szlibe.dev
@@ -752,36 +753,36 @@ $(DD)psdf.dev : $(DEVS_MAK) $(ECHOGS_XE) $(psdf_) $(psdf_inc) $(GDEV)
        $(ADDMOD) $(DD)psdf -include $(psdf_inc1)
        $(ADDMOD) $(DD)psdf -include $(psdf_inc2)
-$(GLOBJ)gdevpsdi.$(OBJ) : $(GLSRC)gdevpsdi.c $(GXERR)\
+$(DEVOBJ)gdevpsdi.$(OBJ) : $(DEVVECSRC)gdevpsdi.c $(GXERR)\
 $(jpeglib__h) $(math__h) $(stdio__h)\
 $(gscspace_h)\
 $(scfx_h) $(slzwx_h) $(spngpx_h)\
 $(strimpl_h) $(szlibx_h)\
 $(gdevpsdf_h) $(gdevpsds_h) $(gxdevmem_h) $(gxcspace_h) $(gxparamx_h)\
 $(sjbig2_luratech_h) $(sjpx_luratech_h) $(gsicc_manage_h)
-        $(GDEVLWFJB2JPXCC) $(GLO_)gdevpsdi.$(OBJ) $(C_) $(GLSRC)gdevpsdi.c
+        $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpsdi.$(OBJ) $(C_) $(DEVVECSRC)gdevpsdi.c
-$(GLOBJ)gdevpsdp.$(OBJ) : $(GLSRC)gdevpsdp.c $(GDEVH)\
+$(DEVOBJ)gdevpsdp.$(OBJ) : $(DEVVECSRC)gdevpsdp.c $(GDEVH)\
 $(string__h) $(jpeglib__h)\
 $(scfx_h) $(sdct_h) $(slzwx_h) $(srlx_h) $(strimpl_h) $(szlibx_h)\
 $(gsparamx_h) $(gsutil_h) $(gdevpsdf_h)\
 $(sjbig2_luratech_h) $(sjpx_luratech_h)
-        $(GDEVLWFJB2JPXCC) $(GLO_)gdevpsdp.$(OBJ) $(C_) $(GLSRC)gdevpsdp.c
+        $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpsdp.$(OBJ) $(C_) $(DEVVECSRC)gdevpsdp.c
-$(GLOBJ)gdevpsds.$(OBJ) : $(GLSRC)gdevpsds.c $(GX) $(memory__h)\
+$(DEVOBJ)gdevpsds.$(OBJ) : $(DEVVECSRC)gdevpsds.c $(GX) $(memory__h)\
 $(gserrors_h) $(gxdcconv_h) $(gdevpsds_h) $(gxbitmap_h)\
 $(gxcspace_h) $(gsdcolor_h) $(gscspace_h) $(gxdevcli_h)
-        $(GLCC) $(GLO_)gdevpsds.$(OBJ) $(C_) $(GLSRC)gdevpsds.c
+        $(DEVCC) $(DEVO_)gdevpsds.$(OBJ) $(C_) $(DEVVECSRC)gdevpsds.c
-$(GLOBJ)gdevpsdu.$(OBJ) : $(GLSRC)gdevpsdu.c $(GXERR)\
+$(DEVOBJ)gdevpsdu.$(OBJ) : $(DEVVECSRC)gdevpsdu.c $(GXERR)\
 $(jpeglib__h) $(memory__h) $(stdio__h)\
 $(sa85x_h) $(scfx_h) $(sdct_h) $(sjpeg_h) $(strimpl_h)\
 $(gdevpsdf_h) $(spprint_h) $(gsovrc_h)
-        $(GLJCC) $(GLO_)gdevpsdu.$(OBJ) $(C_) $(GLSRC)gdevpsdu.c
+        $(DEVJCC) $(DEVO_)gdevpsdu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsdu.c
 # PostScript and EPS writers
-pswrite_=$(GLOBJ)gdevps.$(OBJ) $(GLOBJ)gdevpsu.$(OBJ) $(GLOBJ)scantab.$(OBJ) $(GLOBJ)sfilter2.$(OBJ)
+pswrite_=$(DEVOBJ)gdevps.$(OBJ) $(DEVOBJ)gdevpsu.$(OBJ) $(DEVOBJ)scantab.$(OBJ) $(DEVOBJ)sfilter2.$(OBJ)
 $(DD)epswrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(pswrite_) $(GLD)psdf.dev $(GDEV)
        $(SETDEV2) $(DD)epswrite $(pswrite_)
        $(ADDMOD) $(DD)epswrite -include $(GLD)psdf
@@ -790,33 +791,33 @@ $(DD)pswrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(pswrite_) $(GLD)psdf.dev $(GDEV)
        $(SETDEV2) $(DD)pswrite $(pswrite_)
        $(ADDMOD) $(DD)pswrite -include $(GLD)psdf
-$(GLOBJ)gdevps.$(OBJ) : $(GLSRC)gdevps.c $(GDEV)\
+$(DEVOBJ)gdevps.$(OBJ) : $(DEVVECSRC)gdevps.c $(GDEV)\
 $(math__h) $(memory__h) $(string__h) $(time__h)\
 $(gscdefs_h) $(gscspace_h) $(gsline_h) $(gsparam_h) $(gsiparam_h) $(gsmatrix_h)\
 $(gxdcolor_h) $(gxpath_h)\
 $(sa85x_h) $(sstring_h) $(strimpl_h)\
 $(gdevpsdf_h) $(gdevpsu_h) $(spprint_h)
-        $(GLCC) $(GLO_)gdevps.$(OBJ) $(C_) $(GLSRC)gdevps.c
+        $(DEVCC) $(DEVO_)gdevps.$(OBJ) $(C_) $(DEVVECSRC)gdevps.c
 # Plain text writer
-gdevagl_h=$(GLSRC)gdevagl.h
+gdevagl_h=$(DEVVECSRC)gdevagl.h
-txtwrite_=$(GLOBJ)gdevtxtw.$(OBJ) $(GLOBJ)gdevagl.$(OBJ)
+txtwrite_=$(DEVOBJ)gdevtxtw.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ)
 $(DD)txtwrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(txtwrite_) $(GDEV)\
 $(gdevagl_h)
        $(SETDEV2) $(DD)txtwrite $(txtwrite_)
-$(GLOBJ)gdevtxtw.$(OBJ) : $(GLSRC)gdevtxtw.c $(GDEV)\
+$(DEVOBJ)gdevtxtw.$(OBJ) : $(DEVVECSRC)gdevtxtw.c $(GDEV)\
  $(memory__h) $(string__h) $(gp_h) $(gsparam_h) $(gsutil_h) \
  $(gsdevice_h) $(gxfont_h) $(gxfont0_h) $(gstext_h) $(gxfcid_h)\
  $(gxistate_h) $(gxpath_h) $(gdevagl_h)
-        $(GLCC) $(GLO_)gdevtxtw.$(OBJ) $(C_) $(GLSRC)gdevtxtw.c
+        $(DEVCC) $(DEVO_)gdevtxtw.$(OBJ) $(C_) $(DEVVECSRC)gdevtxtw.c
-$(GLOBJ)gdevagl.$(OBJ) : $(GLSRC)gdevagl.c $(GDEV)\
+$(DEVOBJ)gdevagl.$(OBJ) : $(DEVVECSRC)gdevagl.c $(GDEV)\
 $(gdevagl_h)
-        $(GLCC) $(GLO_)gdevagl.$(OBJ) $(C_) $(GLSRC)gdevagl.c
+        $(DEVCC) $(DEVO_)gdevagl.$(OBJ) $(C_) $(DEVVECSRC)gdevagl.c
 ################ BEGIN PDF WRITER ################
@@ -826,17 +827,17 @@ $(GLOBJ)gdevagl.$(OBJ) : $(GLSRC)gdevagl.c $(GDEV)\
 # includes a PostScript interpreter.
 # We reserve slots here for gdevpdfa...z, just in case we need them.
-pdfwrite1_=$(GLOBJ)gdevpdf.$(OBJ) $(GLOBJ)gdevpdfb.$(OBJ)
+pdfwrite1_=$(DEVOBJ)gdevpdf.$(OBJ) $(DEVOBJ)gdevpdfb.$(OBJ)
-pdfwrite2_=$(GLOBJ)gdevpdfc.$(OBJ) $(GLOBJ)gdevpdfd.$(OBJ) $(GLOBJ)gdevpdfe.$(OBJ)
+pdfwrite2_=$(DEVOBJ)gdevpdfc.$(OBJ) $(DEVOBJ)gdevpdfd.$(OBJ) $(DEVOBJ)gdevpdfe.$(OBJ)
-pdfwrite3_=$(GLOBJ)gdevpdfg.$(OBJ)
+pdfwrite3_=$(DEVOBJ)gdevpdfg.$(OBJ)
-pdfwrite4_=$(GLOBJ)gdevpdfi.$(OBJ) $(GLOBJ)gdevpdfj.$(OBJ) $(GLOBJ)gdevpdfk.$(OBJ)
+pdfwrite4_=$(DEVOBJ)gdevpdfi.$(OBJ) $(DEVOBJ)gdevpdfj.$(OBJ) $(DEVOBJ)gdevpdfk.$(OBJ)
-pdfwrite5_=$(GLOBJ)gdevpdfm.$(OBJ)
+pdfwrite5_=$(DEVOBJ)gdevpdfm.$(OBJ)
-pdfwrite6_=$(GLOBJ)gdevpdfo.$(OBJ) $(GLOBJ)gdevpdfp.$(OBJ) $(GLOBJ)gdevpdft.$(OBJ)
+pdfwrite6_=$(DEVOBJ)gdevpdfo.$(OBJ) $(DEVOBJ)gdevpdfp.$(OBJ) $(DEVOBJ)gdevpdft.$(OBJ)
-pdfwrite7_=$(GLOBJ)gdevpdfr.$(OBJ)
+pdfwrite7_=$(DEVOBJ)gdevpdfr.$(OBJ)
-pdfwrite8_=$(GLOBJ)gdevpdfu.$(OBJ) $(GLOBJ)gdevpdfv.$(OBJ) $(GLOBJ)gdevagl.$(OBJ)
+pdfwrite8_=$(DEVOBJ)gdevpdfu.$(OBJ) $(DEVOBJ)gdevpdfv.$(OBJ) $(DEVOBJ)gdevagl.$(OBJ)
 pdfwrite9_= $(GLOBJ)ConvertUTF.$(OBJ)
-pdfwrite10_=$(GLOBJ)gsflip.$(OBJ)
+pdfwrite10_=$(DEVOBJ)gsflip.$(OBJ)
-pdfwrite11_=$(GLOBJ)scantab.$(OBJ) $(GLOBJ)sfilter2.$(OBJ)
+pdfwrite11_=$(DEVOBJ)scantab.$(OBJ) $(DEVOBJ)sfilter2.$(OBJ)
 pdfwrite_=$(pdfwrite1_) $(pdfwrite2_) $(pdfwrite3_) $(pdfwrite4_)\
 $(pdfwrite5_) $(pdfwrite6_) $(pdfwrite7_) $(pdfwrite8_) $(pdfwrite9_)\
 $(pdfwrite10_) $(pdfwrite11_)
@@ -873,105 +874,103 @@ $(DD)pdfwrite.dev : $(DEVS_MAK) $(ECHOGS_XE) $(pdfwrite_)\
        $(ADDMOD) $(DD)pdfwrite -include $(GLD)psdf
        $(ADDMOD) $(DD)pdfwrite -include $(DD)pdtext
-gdevpdfb_h=$(GLSRC)gdevpdfb.h
+gdevpdfb_h=$(DEVVECSRC)gdevpdfb.h
-gdevpdfc_h=$(GLSRC)gdevpdfc.h
+gdevpdfc_h=$(DEVVECSRC)gdevpdfc.h
-gdevpdfg_h=$(GLSRC)gdevpdfg.h $(gscspace_h)
+gdevpdfg_h=$(DEVVECSRC)gdevpdfg.h $(gscspace_h)
-gdevpdfo_h=$(GLSRC)gdevpdfo.h $(gsparam_h)
+gdevpdfo_h=$(DEVVECSRC)gdevpdfo.h $(gsparam_h)
-gdevpdfx_h=$(GLSRC)gdevpdfx.h\
+gdevpdfx_h=$(DEVVECSRC)gdevpdfx.h\
 $(gsparam_h) $(gsuid_h) $(gxdevice_h) $(gxfont_h) $(gxline_h)\
 $(spprint_h) $(stream_h) $(gdevpsdf_h) $(gxdevmem_h) $(sarc4_h) 
-opdfread_h=$(GLSRC)opdfread.h
+opdfread_h=$(DEVVECSRC)opdfread.h
-gs_mro_e_h=$(GLSRC)gs_mro_e.h
-gs_mgl_e_h=$(GLSRC)gs_mgl_e.h
-$(GLOBJ)gdevpdf.$(OBJ) : $(GLSRC)gdevpdf.c $(GDEVH)\
+$(DEVOBJ)gdevpdf.$(OBJ) : $(DEVVECSRC)gdevpdf.c $(GDEVH)\
 $(fcntl__h) $(memory__h) $(string__h) $(time__h) $(unistd__h) $(gp_h)\
 $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h) $(smd5_h) $(sarc4_h)\
 $(gdevpdfb_h) $(gscms_h)
-        $(GLCC) $(GLO_)gdevpdf.$(OBJ) $(C_) $(GLSRC)gdevpdf.c
+        $(DEVCC) $(DEVO_)gdevpdf.$(OBJ) $(C_) $(DEVVECSRC)gdevpdf.c
-$(GLOBJ)gdevpdfb.$(OBJ) : $(GLSRC)gdevpdfb.c\
+$(DEVOBJ)gdevpdfb.$(OBJ) : $(DEVVECSRC)gdevpdfb.c\
 $(string__h) $(gx_h)\
 $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gserrors_h) $(gxcspace_h) $(gxdcolor_h) $(gxpcolor_h) $(gxhldevc_h)\
 $(gsptype1_h)
-        $(GLCC) $(GLO_)gdevpdfb.$(OBJ) $(C_) $(GLSRC)gdevpdfb.c
+        $(DEVCC) $(DEVO_)gdevpdfb.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfb.c
-$(GLOBJ)gdevpdfc.$(OBJ) : $(GLSRC)gdevpdfc.c $(GXERR) $(math__h) $(memory__h)\
+$(DEVOBJ)gdevpdfc.$(OBJ) : $(DEVVECSRC)gdevpdfc.c $(GXERR) $(math__h) $(memory__h)\
 $(gdevpdfc_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gscie_h) $(gscindex_h) $(gscspace_h) $(gscdevn_h) $(gscsepr_h) $(gsicc_h)\
 $(sstring_h) $(stream_h) $(strimpl_h) $(gxcspace_h) $(gxcdevn_h) $(gscspace_h)\
 $(gsicc_manage_h)
-        $(GLCC) $(GLO_)gdevpdfc.$(OBJ) $(C_) $(GLSRC)gdevpdfc.c
+        $(DEVCC) $(DEVO_)gdevpdfc.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfc.c
-$(GLOBJ)gdevpdfd.$(OBJ) : $(GLSRC)gdevpdfd.c $(math__h) $(memory__h)\
+$(DEVOBJ)gdevpdfd.$(OBJ) : $(DEVVECSRC)gdevpdfd.c $(math__h) $(memory__h)\
 $(gx_h) $(gxdevice_h) $(gxfixed_h) $(gxistate_h) $(gxpaint_h)\
 $(gxcoord_h) $(gxdevmem_h) $(gxcolor2_h) $(gxhldevc_h)\
 $(gsstate_h) $(gserrors_h) $(gsptype2_h) $(gsshade_h)\
 $(gzpath_h) $(gzcpath_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gsutil_h)
-        $(GLCC) $(GLO_)gdevpdfd.$(OBJ) $(C_) $(GLSRC)gdevpdfd.c
+        $(DEVCC) $(DEVO_)gdevpdfd.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfd.c
-$(GLOBJ)gdevpdfe.$(OBJ) : $(GLSRC)gdevpdfe.c\
+$(DEVOBJ)gdevpdfe.$(OBJ) : $(DEVVECSRC)gdevpdfe.c\
 $(gx_h) $(gserrors_h) $(string__h) $(time__h) $(stream_h) $(gp_h) $(smd5_h) $(gscdefs_h)\
 $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdtf_h) $(ConvertUTF_h)
-        $(GLCC) $(GLO_)gdevpdfe.$(OBJ) $(C_) $(GLSRC)gdevpdfe.c
+        $(DEVCC) $(DEVO_)gdevpdfe.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfe.c
-$(GLOBJ)gdevpdfg.$(OBJ) : $(GLSRC)gdevpdfg.c $(GXERR) $(math__h) $(string__h)\
+$(DEVOBJ)gdevpdfg.$(OBJ) : $(DEVVECSRC)gdevpdfg.c $(GXERR) $(math__h) $(string__h)\
 $(memory__h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gsfunc0_h) $(gsstate_h) $(gxdcolor_h) $(gxpcolor_h) $(gxcolor2_h) $(gsptype2_h)\
 $(gxbitmap_h) $(gxdht_h) $(gxfarith_h) $(gxfmap_h) $(gxht_h) $(gxistate_h)\
 $(gzht_h) $(gsicc_manage_h)
-        $(GLCC) $(GLO_)gdevpdfg.$(OBJ) $(C_) $(GLSRC)gdevpdfg.c
+        $(DEVCC) $(DEVO_)gdevpdfg.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfg.c
-$(GLOBJ)gdevpdfi.$(OBJ) : $(GLSRC)gdevpdfi.c $(memory__h) $(math__h)\
+$(DEVOBJ)gdevpdfi.$(OBJ) : $(DEVVECSRC)gdevpdfi.c $(memory__h) $(math__h)\
 $(gx_h)\
 $(gserrors_h) $(gsdevice_h) $(gsflip_h) $(gsiparm4_h) $(gsstate_h) $(gscolor2_h)\
 $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h)\
 $(gxcspace_h) $(gximage3_h) $(gximag3x_h) $(gxdcolor_h) $(gxpcolor_h)\
 $(gxhldevc_h) $(gsicc_manage_h)
-        $(GLCC) $(GLO_)gdevpdfi.$(OBJ) $(C_) $(GLSRC)gdevpdfi.c
+        $(DEVCC) $(DEVO_)gdevpdfi.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfi.c
-$(GLOBJ)gdevpdfj.$(OBJ) : $(GLSRC)gdevpdfj.c\
+$(DEVOBJ)gdevpdfj.$(OBJ) : $(DEVVECSRC)gdevpdfj.c\
 $(memory__h) $(string__h) $(gx_h) $(gserrors_h)\
 $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gxcspace_h)\
 $(gsiparm4_h) $(gdevpsds_h) $(spngpx_h)
-        $(GLJCC) $(GLO_)gdevpdfj.$(OBJ) $(C_) $(GLSRC)gdevpdfj.c
+        $(DEVJCC) $(DEVO_)gdevpdfj.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfj.c
-$(GLOBJ)gdevpdfk.$(OBJ) : $(GLSRC)gdevpdfk.c $(GXERR) $(math__h) $(memory__h)\
+$(DEVOBJ)gdevpdfk.$(OBJ) : $(DEVVECSRC)gdevpdfk.c $(GXERR) $(math__h) $(memory__h)\
 $(gdevpdfc_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gsicc_h) $(gxcie_h) $(gxcspace_h)\
 $(stream_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevpdfk.$(OBJ) $(C_) $(GLSRC)gdevpdfk.c
+        $(DEVCC) $(DEVO_)gdevpdfk.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfk.c
-$(GLOBJ)gdevpdfm.$(OBJ) : $(GLSRC)gdevpdfm.c\
+$(DEVOBJ)gdevpdfm.$(OBJ) : $(DEVVECSRC)gdevpdfm.c\
 $(math__h) $(memory__h) $(string__h) $(gx_h)\
 $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h)\
 $(szlibx_h) $(slzwx_h)
-        $(GLCC) $(GLO_)gdevpdfm.$(OBJ) $(C_) $(GLSRC)gdevpdfm.c
+        $(DEVCC) $(DEVO_)gdevpdfm.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfm.c
-$(GLOBJ)gdevpdfo.$(OBJ) : $(GLSRC)gdevpdfo.c $(memory__h) $(string__h)\
+$(DEVOBJ)gdevpdfo.$(OBJ) : $(DEVVECSRC)gdevpdfo.c $(memory__h) $(string__h)\
 $(gx_h)\
 $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsparam_h) $(gsutil_h)\
 $(sa85x_h) $(sarc4_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevpdfo.$(OBJ) $(C_) $(GLSRC)gdevpdfo.c
+        $(DEVCC) $(DEVO_)gdevpdfo.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfo.c
-$(GLOBJ)gdevpdfp.$(OBJ) : $(GLSRC)gdevpdfp.c $(memory__h) $(string__h) $(gx_h)\
+$(DEVOBJ)gdevpdfp.$(OBJ) : $(DEVVECSRC)gdevpdfp.c $(memory__h) $(string__h) $(gx_h)\
 $(gdevpdfo_h) $(gdevpdfg_h) $(gdevpdfx_h) $(gserrors_h) $(gsparamx_h)
-        $(GLCC) $(GLO_)gdevpdfp.$(OBJ) $(C_) $(GLSRC)gdevpdfp.c
+        $(DEVCC) $(DEVO_)gdevpdfp.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfp.c
-$(GLOBJ)gdevpdfr.$(OBJ) : $(GLSRC)gdevpdfr.c $(memory__h) $(string__h)\
+$(DEVOBJ)gdevpdfr.$(OBJ) : $(DEVVECSRC)gdevpdfr.c $(memory__h) $(string__h)\
 $(gx_h)\
 $(gdevpdfo_h) $(gdevpdfx_h) $(gserrors_h) $(gsutil_h)\
 $(scanchar_h) $(sstring_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevpdfr.$(OBJ) $(C_) $(GLSRC)gdevpdfr.c
+        $(DEVCC) $(DEVO_)gdevpdfr.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfr.c
-$(GLOBJ)gdevpdft.$(OBJ) : $(GLSRC)gdevpdft.c $(string__h)\
+$(DEVOBJ)gdevpdft.$(OBJ) : $(DEVVECSRC)gdevpdft.c $(string__h)\
 $(gx_h) $(gserrors_h) $(gstrans_h) $(gscolor2_h) $(gzstate_h)\
 $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdfo_h) $(gsccolor_h)
-        $(GLCC) $(GLO_)gdevpdft.$(OBJ) $(C_) $(GLSRC)gdevpdft.c
+        $(DEVCC) $(DEVO_)gdevpdft.$(OBJ) $(C_) $(DEVVECSRC)gdevpdft.c
-$(GLOBJ)gdevpdfu.$(OBJ) : $(GLSRC)gdevpdfu.c $(GXERR)\
+$(DEVOBJ)gdevpdfu.$(OBJ) : $(DEVVECSRC)gdevpdfu.c $(GXERR)\
 $(jpeglib__h) $(memory__h) $(string__h)\
 $(gdevpdfo_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtd_h) $(gscdefs_h)\
 $(gsdsrc_h) $(gsfunc_h) $(gsfunc3_h)\
@@ -979,16 +978,82 @@ $(GLOBJ)gdevpdfu.$(OBJ) : $(GLSRC)gdevpdfu.c $(GXERR)\
 $(srlx_h) $(sarc4_h) $(smd5_h) $(sstring_h) $(strimpl_h) $(szlibx_h)\
 $(strmio_h) $(sjbig2_luratech_h) $(sjpx_luratech_h)\
 $(opdfread_h) $(gdevagl_h) $(gs_mro_e_h) $(gs_mgl_e_h)
-        $(GDEVLWFJB2JPXCC) $(GLO_)gdevpdfu.$(OBJ) $(C_) $(GLSRC)gdevpdfu.c
+        $(GDEVLWFJB2JPXCC) $(DEVO_)gdevpdfu.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfu.c
-$(GLOBJ)gdevpdfv.$(OBJ) : $(GLSRC)gdevpdfv.c $(GXERR) $(math__h) $(string__h)\
+$(DEVOBJ)gdevpdfv.$(OBJ) : $(DEVVECSRC)gdevpdfv.c $(GXERR) $(math__h) $(string__h)\
 $(gdevpdfg_h) $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gscindex_h) $(gscoord_h) $(gsiparm3_h) $(gsmatrix_h) $(gsptype2_h)\
 $(gxcolor2_h) $(gxdcolor_h) $(gxpcolor_h) $(gxshade_h)
-        $(GLCC) $(GLO_)gdevpdfv.$(OBJ) $(C_) $(GLSRC)gdevpdfv.c
+        $(DEVCC) $(DEVO_)gdevpdfv.$(OBJ) $(C_) $(DEVVECSRC)gdevpdfv.c
-$(GLOBJ)ConvertUTF.$(OBJ) : $(GLSRC)ConvertUTF.c $(ConvertUTF_h)
+# ---------------- Font writing ---------------- #
-        $(GLCC) $(GLO_)ConvertUTF.$(OBJ) $(C_) $(GLSRC)ConvertUTF.c
+# This is not really a library facility, but one piece of interpreter test
+# code uses it.
+# Support for PostScript and PDF font writing
+gdevpsf_h=$(DEVVECSRC)gdevpsf.h $(gsccode_h) $(gsgdata_h)
+psf_1=$(DEVOBJ)gdevpsf1.$(OBJ) $(DEVOBJ)gdevpsf2.$(OBJ) $(DEVOBJ)gdevpsfm.$(OBJ)
+psf_2=$(DEVOBJ)gdevpsft.$(OBJ) $(DEVOBJ)gdevpsfu.$(OBJ) $(DEVOBJ)gdevpsfx.$(OBJ)
+psf_3=$(DEVOBJ)spsdf.$(OBJ)
+psf_=$(psf_1) $(psf_2) $(psf_3)
+$(DD)psf.dev : $(DEV_MAK) $(ECHOGS_XE) $(psf_)
+        $(SETMOD) $(DD)psf $(psf_1)
+        $(ADDMOD) $(DD)psf -obj $(psf_2)
+        $(ADDMOD) $(DD)psf -obj $(psf_3)
+$(DEVOBJ)gdevpsf1.$(OBJ) : $(DEVVECSRC)gdevpsf1.c $(AK) $(gx_h)\
+ $(gserrors_h) $(memory__h) $(gsccode_h) $(gsmatrix_h)\
+ $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
+ $(sfilter_h) $(sstring_h) $(stream_h) $(strimpl_h)\
+ $(gdevpsf_h) $(spprint_h) $(spsdf_h) $(math_h) $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsf1.$(OBJ) $(C_) $(DEVVECSRC)gdevpsf1.c
+$(DEVOBJ)gdevpsf2.$(OBJ) : $(DEVVECSRC)gdevpsf2.c $(AK) $(gx_h)\
+ $(gserrors_h) $(math__h) $(memory__h) $(gxarith_h) $(gsutil_h)\
+ $(gsccode_h) $(gscencs_h) $(gscrypt1_h) $(gsmatrix_h)\
+ $(gxfcid_h) $(gxfixed_h) $(gxfont_h) $(gxfont1_h)\
+ $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsf2.$(OBJ) $(C_) $(DEVVECSRC)gdevpsf2.c
+$(DEVOBJ)gdevpsfm.$(OBJ) : $(DEVVECSRC)gdevpsfm.c $(AK) $(gx_h)\
+ $(gserrors_h) $(gdevpsf_h) $(gxfcmap_h) $(spprint_h) $(spsdf_h) $(stream_h)\
+ $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsfm.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfm.c
+$(DEVOBJ)gdevpsft.$(OBJ) : $(DEVVECSRC)gdevpsft.c $(AK) $(gx_h)\
+ $(gserrors_h) $(memory__h) $(gscencs_h) $(gsmatrix_h) $(gsutil_h)\
+ $(gxfcid_h) $(gxfont_h) $(gxfont42_h) $(gxttf_h)\
+ $(spprint_h) $(stream_h) $(gdevpsf_h) $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsft.$(OBJ) $(C_) $(DEVVECSRC)gdevpsft.c
+$(DEVOBJ)gdevpsfu.$(OBJ) : $(DEVVECSRC)gdevpsfu.c $(AK) $(gx_h)\
+ $(gserrors_h) $(memory__h) $(gsmatrix_h) $(gxfont_h) $(gdevpsf_h)\
+ $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsfu.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfu.c
+$(DEVOBJ)gdevpsfx.$(OBJ) : $(DEVVECSRC)gdevpsfx.c $(AK) $(gx_h)\
+ $(gserrors_h) $(math__h) $(memory__h)\
+ $(gxfixed_h) $(gxfont_h) $(gxfont1_h) $(gxmatrix_h) $(gxtype1_h)\
+ $(stream_h) $(gdevpsf_h) $(gxistate_h) $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gdevpsfx.$(OBJ) $(C_) $(DEVVECSRC)gdevpsfx.c
+# ---------------- Font copying ---------------- #
+# This facility is not included in the core library.  Currently it is used
+# only by pdfwrite.
+fcopy_=$(DEVOBJ)gxfcopy.$(OBJ)
+$(GLD)fcopy.dev : $(DEVS_MAK) $(ECHOGS_XE) $(fcopy_)
+        $(SETMOD) $(GLD)fcopy $(fcopy_)
+$(DEVOBJ)gxfcopy.$(OBJ) : $(DEVSRC)gxfcopy.c $(memory__h) $(AK) $(gx_h)\
+ $(gserrors_h) $(gscencs_h) $(gsline_h) $(gspaint_h) $(gspath_h) $(gsstruct_h)\
+ $(gsutil_h) $(gschar_h) $(gxfont_h) $(gxfont1_h) $(gxfont42_h) $(gxchar_h)\
+ $(gxfcid_h) $(gxfcopy_h) $(gxfcache_h) $(gxistate_h) $(gxtext_h) $(gxtype1_h)\
+ $(smd5_h) $(gzstate_h) $(gdevpsf_h) $(stream_h) $(MAKEDIRS)
+        $(DEVCC) $(DEVO_)gxfcopy.$(OBJ) $(C_) $(DEVSRC)gxfcopy.c
 ######## pdfwrite text
@@ -1001,31 +1066,31 @@ $(DD)pdtext.dev : $(DEVS_MAK) $(DD)pdxtext.dev $(GDEV)
 # For a code roadmap, see gdevpdtx.h.
-gdevpdt_h=$(GLSRC)gdevpdt.h
+gdevpdt_h=$(DEVVECSRC)gdevpdt.h
-gdevpdtx_h=$(GLSRC)gdevpdtx.h $(gdevpdt_h)
+gdevpdtx_h=$(DEVVECSRC)gdevpdtx.h $(gdevpdt_h)
-gdevpdtb_h=$(GLSRC)gdevpdtb.h $(gdevpdtx_h)
+gdevpdtb_h=$(DEVVECSRC)gdevpdtb.h $(gdevpdtx_h)
-gdevpdtd_h=$(GLSRC)gdevpdtd.h $(gdevpdtb_h) $(gdevpdtx_h)
+gdevpdtd_h=$(DEVVECSRC)gdevpdtd.h $(gdevpdtb_h) $(gdevpdtx_h)
-gdevpdtf_h=$(GLSRC)gdevpdtf.h $(gdevpdtx_h)
+gdevpdtf_h=$(DEVVECSRC)gdevpdtf.h $(gdevpdtx_h)
-gdevpdti_h=$(GLSRC)gdevpdti.h $(gdevpdt_h)
+gdevpdti_h=$(DEVVECSRC)gdevpdti.h $(gdevpdt_h)
-gdevpdts_h=$(GLSRC)gdevpdts.h $(gsmatrix_h)
+gdevpdts_h=$(DEVVECSRC)gdevpdts.h $(gsmatrix_h)
-gdevpdtt_h=$(GLSRC)gdevpdtt.h
+gdevpdtt_h=$(DEVVECSRC)gdevpdtt.h
-gdevpdtv_h=$(GLSRC)gdevpdtv.h
+gdevpdtv_h=$(DEVVECSRC)gdevpdtv.h
-gdevpdtw_h=$(GLSRC)gdevpdtw.h
+gdevpdtw_h=$(DEVVECSRC)gdevpdtw.h
-whitelst_h=$(GLSRC)whitelst.h
+whitelst_h=$(DEVVECSRC)whitelst.h
 # We reserve space for all of a..z, just in case.
-pdxtext_ab=$(GLOBJ)gdevpdt.$(OBJ) $(GLOBJ)gdevpdtb.$(OBJ)
+pdxtext_ab=$(DEVOBJ)gdevpdt.$(OBJ) $(DEVOBJ)gdevpdtb.$(OBJ)
-pdxtext_cde=$(GLOBJ)gdevpdtc.$(OBJ) $(GLOBJ)gdevpdtd.$(OBJ) $(GLOBJ)gdevpdte.$(OBJ)
+pdxtext_cde=$(DEVOBJ)gdevpdtc.$(OBJ) $(DEVOBJ)gdevpdtd.$(OBJ) $(DEVOBJ)gdevpdte.$(OBJ)
-pdxtext_fgh=$(GLOBJ)gdevpdtf.$(OBJ)
+pdxtext_fgh=$(DEVOBJ)gdevpdtf.$(OBJ)
-pdxtext_ijk=$(GLOBJ)gdevpdti.$(OBJ)
+pdxtext_ijk=$(DEVOBJ)gdevpdti.$(OBJ)
 pdxtext_lmn=
 pdxtext_opq=
-pdxtext_rst=$(GLOBJ)gdevpdts.$(OBJ) $(GLOBJ)gdevpdtt.$(OBJ)
+pdxtext_rst=$(DEVOBJ)gdevpdts.$(OBJ) $(DEVOBJ)gdevpdtt.$(OBJ)
-pdxtext_uvw=$(GLOBJ)gdevpdtv.$(OBJ) $(GLOBJ)gdevpdtw.$(OBJ) $(GLOBJ)whitelst.$(OBJ)
+pdxtext_uvw=$(DEVOBJ)gdevpdtv.$(OBJ) $(DEVOBJ)gdevpdtw.$(OBJ) $(DEVOBJ)whitelst.$(OBJ)
 pdxtext_xyz=
 pdxtext_=$(pdxtext_ab) $(pdxtext_cde) $(pdxtext_fgh) $(pdxtext_ijk)\
 $(pdxtext_lmn) $(pdxtext_opq) $(pdxtext_rst) $(pdxtext_uvw) $(pdxtext_xyz)\
- $(GLOBJ)gsfont0c.$(OBJ)
+ $(DEVOBJ)gsfont0c.$(OBJ)
 $(DD)pdxtext.dev : $(DEVS_MAK) $(pdxtext_) $(GDEV)\
 $(GLD)fcopy.dev $(GLD)psf.dev
        $(SETMOD) $(DD)pdxtext $(pdxtext_ab)
@@ -1037,81 +1102,81 @@ $(DD)pdxtext.dev : $(DEVS_MAK) $(pdxtext_) $(GDEV)\
        $(ADDMOD) $(DD)pdxtext $(pdxtext_rst)
        $(ADDMOD) $(DD)pdxtext $(pdxtext_uvw)
        $(ADDMOD) $(DD)pdxtext $(pdxtext_xyz)
-        $(ADDMOD) $(DD)pdxtext $(GLOBJ)gsfont0c.$(OBJ)
+        $(ADDMOD) $(DD)pdxtext $(DEVOBJ)gsfont0c.$(OBJ)
        $(ADDMOD) $(DD)pdxtext -include $(GLD)fcopy $(GLD)psf
-$(GLOBJ)gdevpdt.$(OBJ) : $(GLSRC)gdevpdt.c $(gx_h) $(gxpath_h) $(memory__h)\
+$(DEVOBJ)gdevpdt.$(OBJ) : $(DEVVECSRC)gdevpdt.c $(gx_h) $(gxpath_h) $(memory__h)\
 $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdtx_h) $(gdevpdt_h)
-        $(GLCC) $(GLO_)gdevpdt.$(OBJ) $(C_) $(GLSRC)gdevpdt.c
+        $(DEVCC) $(DEVO_)gdevpdt.$(OBJ) $(C_) $(DEVVECSRC)gdevpdt.c
-$(GLOBJ)gdevpdtb.$(OBJ) : $(GLSRC)gdevpdtb.c $(memory__h) $(ctype__h) $(string__h)\
+$(DEVOBJ)gdevpdtb.$(OBJ) : $(DEVVECSRC)gdevpdtb.c $(memory__h) $(ctype__h) $(string__h)\
 $(memory__h) $(ctype__h) $(string__h) $(gx_h) $(gserrors_h) $(gsutil_h) $(gxfcid_h)\
 $(gxfcopy_h) $(gxfont_h) $(gxfont42_h) $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdfo_h)\
 $(gdevpdtb_h) $(gdevpdfg_h) $(gdevpdtf_h) $(smd5_h)
-        $(GLCC) $(GLO_)gdevpdtb.$(OBJ) $(C_) $(GLSRC)gdevpdtb.c
+        $(DEVCC) $(DEVO_)gdevpdtb.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtb.c
-$(GLOBJ)gdevpdtc.$(OBJ) : $(GLSRC)gdevpdtc.c $(gx_h) $(memory__h) $(string__h)\
+$(DEVOBJ)gdevpdtc.$(OBJ) : $(DEVVECSRC)gdevpdtc.c $(gx_h) $(memory__h) $(string__h)\
 $(gserrors_h) $(gxfcmap_h) $(gxfont_h) $(gxfont0_h) $(gxfont0c_h)\
 $(gzpath_h) $(gxchar_h) $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdtx_h)\
 $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) $(gdevpdtt_h)
-        $(GLCC) $(GLO_)gdevpdtc.$(OBJ) $(C_) $(GLSRC)gdevpdtc.c
+        $(DEVCC) $(DEVO_)gdevpdtc.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtc.c
-$(GLOBJ)gdevpdte.$(OBJ) : $(GLSRC)gdevpdte.c $(gx_h) $(math__h) $(memory__h) $(string__h)\
+$(DEVOBJ)gdevpdte.$(OBJ) : $(DEVVECSRC)gdevpdte.c $(gx_h) $(math__h) $(memory__h) $(string__h)\
 $(gserrors_h) $(gsutil_h) $(gxfcmap_h) $(gxfcopy_h) $(gxfont_h) \
 $(gxfont0_h) $(gxfont0c_h) $(gxpath_h) $(gdevpsf_h) $(gdevpdfx_h) \
 $(gdevpdfg_h)  $(gdevpdfo_h) $(gdevpdtx_h) $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) \
 $(gdevpdtt_h)
-        $(GLCC) $(GLO_)gdevpdte.$(OBJ) $(C_) $(GLSRC)gdevpdte.c
+        $(DEVCC) $(DEVO_)gdevpdte.$(OBJ) $(C_) $(DEVVECSRC)gdevpdte.c
-$(GLOBJ)gdevpdtd.$(OBJ) : $(GLSRC)gdevpdtd.c $(math__h) $(memory__h) $(gx_h)\
+$(DEVOBJ)gdevpdtd.$(OBJ) : $(DEVVECSRC)gdevpdtd.c $(math__h) $(memory__h) $(gx_h)\
 $(gserrors_h) $(gsrect_h) $(gscencs_h)\
 $(gdevpdfo_h) $(gdevpdfx_h)\
 $(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h)
-        $(GLCC) $(GLO_)gdevpdtd.$(OBJ) $(C_) $(GLSRC)gdevpdtd.c
+        $(DEVCC) $(DEVO_)gdevpdtd.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtd.c
-$(GLOBJ)gdevpdtf.$(OBJ) : $(GLSRC)gdevpdtf.c $(gx_h) $(memory__h)\
+$(DEVOBJ)gdevpdtf.$(OBJ) : $(DEVVECSRC)gdevpdtf.c $(gx_h) $(memory__h)\
 $(string__h) $(gserrors_h) $(gsutil_h)\
 $(gxfcache_h) $(gxfcid_h) $(gxfcmap_h) $(gxfcopy_h) $(gxfont_h) $(gxfont1_h)\
 $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdtb_h) $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdtw_h)\
 $(gdevpdti_h)
-        $(GLCC) $(GLO_)gdevpdtf.$(OBJ) $(C_) $(GLSRC)gdevpdtf.c
+        $(DEVCC) $(DEVO_)gdevpdtf.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtf.c
-$(GLOBJ)gdevpdti.$(OBJ) : $(GLSRC)gdevpdti.c $(memory__h) $(string__h) $(gx_h)\
+$(DEVOBJ)gdevpdti.$(OBJ) : $(DEVVECSRC)gdevpdti.c $(memory__h) $(string__h) $(gx_h)\
 $(gserrors_h) $(gsutil_h)\
 $(gdevpdfx_h) $(gdevpdfg_h)\
 $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdts_h) $(gdevpdtw_h) $(gdevpdtt_h) $(gdevpdfo_h)
-        $(GLCC) $(GLO_)gdevpdti.$(OBJ) $(C_) $(GLSRC)gdevpdti.c
+        $(DEVCC) $(DEVO_)gdevpdti.$(OBJ) $(C_) $(DEVVECSRC)gdevpdti.c
-$(GLOBJ)gdevpdts.$(OBJ) : $(GLSRC)gdevpdts.c $(gx_h) $(math__h) $(memory__h)\
+$(DEVOBJ)gdevpdts.$(OBJ) : $(DEVVECSRC)gdevpdts.c $(gx_h) $(math__h) $(memory__h)\
 $(gserrors_h) $(gdevpdfx_h) $(gdevpdfg_h) $(gdevpdtx_h) $(gdevpdtf_h)\
 $(gdevpdts_h) $(gdevpdtt_h)
-        $(GLCC) $(GLO_)gdevpdts.$(OBJ) $(C_) $(GLSRC)gdevpdts.c
+        $(DEVCC) $(DEVO_)gdevpdts.$(OBJ) $(C_) $(DEVVECSRC)gdevpdts.c
-$(GLOBJ)gdevpdtt.$(OBJ) : $(GLSRC)gdevpdtt.c $(gx_h) $(math__h) $(string__h)\
+$(DEVOBJ)gdevpdtt.$(OBJ) : $(DEVVECSRC)gdevpdtt.c $(gx_h) $(math__h) $(string__h)\
 $(gserrors_h) $(gsencs_h) $(gscedata_h) $(gsmatrix_h) $(gzstate_h)\
 $(gxfcache_h) $(gxfont_h) $(gxfont0_h) $(gxfcid_h) $(gxfcopy_h)\
 $(gxfcmap_h) $(gxpath_h) $(gxchar_h) $(gxstate_h) $(gdevpdfx_h) $(gdevpdfg_h)\
 $(gdevpdfo_h) $(gdevpdtx_h) $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdts_h) $(gdevpdtt_h)\
 $(gdevpdti_h) $(gxhldevc_h)
-        $(GLCC) $(GLO_)gdevpdtt.$(OBJ) $(C_) $(GLSRC)gdevpdtt.c
+        $(DEVCC) $(DEVO_)gdevpdtt.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtt.c
-$(GLOBJ)gdevpdtv.$(OBJ) : $(GLSRC)gdevpdtv.c $(gx_h) $(gdevpdtv_h)
+$(DEVOBJ)gdevpdtv.$(OBJ) : $(DEVVECSRC)gdevpdtv.c $(gx_h) $(gdevpdtv_h)
-        $(GLCC) $(GLO_)gdevpdtv.$(OBJ) $(C_) $(GLSRC)gdevpdtv.c
+        $(DEVCC) $(DEVO_)gdevpdtv.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtv.c
-$(GLOBJ)gdevpdtw.$(OBJ) : $(GLSRC)gdevpdtw.c $(gx_h) $(gserrors_h) $(memory__h)\
+$(DEVOBJ)gdevpdtw.$(OBJ) : $(DEVVECSRC)gdevpdtw.c $(gx_h) $(gserrors_h) $(memory__h)\
 $(gxfcmap_h) $(gxfont_h) $(gxfcopy_h) $(gscencs_h)\
 $(gdevpsf_h) $(gdevpdfx_h) $(gdevpdfo_h)\
 $(gdevpdtd_h) $(gdevpdtf_h) $(gdevpdti_h) $(gdevpdtw_h) $(gdevpdtv_h) $(sarc4_h)
-        $(GLCC) $(GLO_)gdevpdtw.$(OBJ) $(C_) $(GLSRC)gdevpdtw.c
+        $(DEVCC) $(DEVO_)gdevpdtw.$(OBJ) $(C_) $(DEVVECSRC)gdevpdtw.c
-$(GLOBJ)whitelst.$(OBJ) : $(GLSRC)whitelst.c $(whitelst_h)
+$(DEVOBJ)whitelst.$(OBJ) : $(DEVVECSRC)whitelst.c $(whitelst_h)
-        $(GLCC) $(GLO_)whitelst.$(OBJ) $(C_) $(GLSRC)whitelst.c
+        $(DEVCC) $(DEVO_)whitelst.$(OBJ) $(C_) $(DEVVECSRC)whitelst.c
 ################ END PDF WRITER ################
 # High-level PCL XL writer
-pxl_=$(GLOBJ)gdevpx.$(OBJ) $(GLOBJ)gdevpxut.$(OBJ) $(HPPCL)
+pxl_=$(DEVOBJ)gdevpx.$(OBJ) $(DEVOBJ)gdevpxut.$(OBJ) $(HPPCL)
 $(DD)pxlmono.dev : $(DEVS_MAK) $(pxl_) $(GDEV) $(GLD)vector.dev
        $(SETDEV2) $(DD)pxlmono $(pxl_)
        $(ADDMOD) $(DD)pxlmono -include $(GLD)vector
@@ -1120,32 +1185,32 @@ $(DD)pxlcolor.dev : $(DEVS_MAK) $(pxl_) $(GDEV) $(GLD)vector.dev
        $(SETDEV2) $(DD)pxlcolor $(pxl_)
        $(ADDMOD) $(DD)pxlcolor -include $(GLD)vector
-$(GLOBJ)gdevpx.$(OBJ) : $(GLSRC)gdevpx.c\
+$(DEVOBJ)gdevpx.$(OBJ) : $(DEVVECSRC)gdevpx.c\
 $(math__h) $(memory__h) $(string__h)\
 $(gx_h) $(gsccolor_h) $(gsdcolor_h) $(gxiparam_h) $(gserrors_h)\
 $(gxcspace_h) $(gxdevice_h) $(gxpath_h)\
 $(gdevpxat_h) $(gdevpxen_h) $(gdevpxop_h) $(gdevpxut_h) $(gdevvec_h)\
 $(srlx_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevpx.$(OBJ) $(C_) $(GLSRC)gdevpx.c
+        $(DEVCC) $(DEVO_)gdevpx.$(OBJ) $(C_) $(DEVVECSRC)gdevpx.c
 # Scalable Vector Graphics (SVG) output device
-svgwrite_=$(GLOBJ)gdevsvg.$(OBJ)
+svgwrite_=$(DEVOBJ)gdevsvg.$(OBJ)
 $(DD)svgwrite.dev : $(DEVS_MAK) $(svgwrite_) $(GDEV) $(GLD)vector.dev
        $(SETDEV2) $(DD)svgwrite $(svgwrite_)
        $(ADDMOD) $(DD)svgwrite -include $(GLD)vector
-$(GLOBJ)gdevsvg.$(OBJ) : $(GLSRC)gdevsvg.c $(gx_h) $(gdevvec_h)
+$(DEVOBJ)gdevsvg.$(OBJ) : $(DEVVECSRC)gdevsvg.c $(gx_h) $(gdevvec_h)
-        $(GLCC) $(GLO_)gdevsvg.$(OBJ) $(C_) $(GLSRC)gdevsvg.c
+        $(DEVCC) $(DEVO_)gdevsvg.$(OBJ) $(C_) $(DEVVECSRC)gdevsvg.c
-xpswrite_=$(GLOBJ)gdevxps.$(OBJ)
+xpswrite_=$(DEVOBJ)gdevxps.$(OBJ)
 $(DD)xpswrite.dev : $(DEVS_MAK) $(xpswrite_) $(GDEV) $(GLD)vector.dev
        $(SETDEV2) $(DD)xpswrite $(xpswrite_)
        $(ADDMOD) $(DD)xpswrite -include $(GLD)vector
-$(GLOBJ)gdevxps.$(OBJ) : $(GLSRC)gdevxps.c $(gx_h) $(gdevvec_h)
+$(DEVOBJ)gdevxps.$(OBJ) : $(DEVVECSRC)gdevxps.c $(gx_h) $(gdevvec_h)
-        $(GLCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(GLSRC)gdevxps.c
+        $(GLCC) $(I_)$(TI_)$(_I) $(GLO_)gdevxps.$(OBJ) $(C_) $(DEVVECSRC)gdevxps.c
 ###### --------------------- Raster file formats --------------------- ######
@@ -1154,7 +1219,7 @@ $(GLOBJ)gdevxps.$(OBJ) : $(GLSRC)gdevxps.c $(gx_h) $(gdevvec_h)
 # This device also exercises the driver CRD facilities, which is why it
 # needs some additional files.
-bit_=$(GLOBJ)gdevbit.$(OBJ) $(GLOBJ)gdevdcrd.$(OBJ)
+bit_=$(DEVOBJ)gdevbit.$(OBJ) $(DEVOBJ)gdevdcrd.$(OBJ)
 $(DD)bit.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev $(GDEV)
        $(SETPDEV2) $(DD)bit $(bit_)
@@ -1173,22 +1238,22 @@ $(DD)bitrgbtags.dev : $(DEVS_MAK) $(bit_) $(GLD)page.dev $(GLD)cielib.dev\
        $(SETPDEV2) $(DD)bitrgbtags $(bit_)
        $(ADDMOD) $(DD)bitrgbtags -include $(GLD)cielib
-$(GLOBJ)gdevbit.$(OBJ) : $(GLSRC)gdevbit.c $(PDEVH)\
+$(DEVOBJ)gdevbit.$(OBJ) : $(DEVSRC)gdevbit.c $(PDEVH)\
 $(gsparam_h) $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gxlum_h) $(gxdcconv_h)\
 $(gsutil_h)
-        $(GLCC) $(GLO_)gdevbit.$(OBJ) $(C_) $(GLSRC)gdevbit.c
+        $(DEVCC) $(DEVO_)gdevbit.$(OBJ) $(C_) $(DEVSRC)gdevbit.c
 ### ------------------------- .BMP file formats ------------------------- ###
-gdevbmp_h=$(GLSRC)gdevbmp.h
+gdevbmp_h=$(DEVSRC)gdevbmp.h
-bmp_=$(GLOBJ)gdevbmp.$(OBJ) $(GLOBJ)gdevbmpc.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+bmp_=$(DEVOBJ)gdevbmp.$(OBJ) $(DEVOBJ)gdevbmpc.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-$(GLOBJ)gdevbmp.$(OBJ) : $(GLSRC)gdevbmp.c $(PDEVH) $(gdevbmp_h) $(gdevpccm_h)
+$(DEVOBJ)gdevbmp.$(OBJ) : $(DEVSRC)gdevbmp.c $(PDEVH) $(gdevbmp_h) $(gdevpccm_h)
-        $(GLCC) $(GLO_)gdevbmp.$(OBJ) $(C_) $(GLSRC)gdevbmp.c
+        $(DEVCC) $(DEVO_)gdevbmp.$(OBJ) $(C_) $(DEVSRC)gdevbmp.c
-$(GLOBJ)gdevbmpc.$(OBJ) : $(GLSRC)gdevbmpc.c $(PDEVH) $(gdevbmp_h)
+$(DEVOBJ)gdevbmpc.$(OBJ) : $(DEVSRC)gdevbmpc.c $(PDEVH) $(gdevbmp_h)
-        $(GLCC) $(GLO_)gdevbmpc.$(OBJ) $(C_) $(GLSRC)gdevbmpc.c
+        $(DEVCC) $(DEVO_)gdevbmpc.$(OBJ) $(C_) $(DEVSRC)gdevbmpc.c
 $(DD)bmpmono.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)bmpmono $(bmp_)
@@ -1216,12 +1281,12 @@ $(DD)bmp32b.dev : $(DEVS_MAK) $(bmp_) $(GLD)page.dev $(GDEV)
 ### ------------- BMP driver that serves as demo of async rendering ---- ###
-bmpa_=$(GLOBJ)gdevbmpa.$(OBJ) $(GLOBJ)gdevbmpc.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ) $(GLOBJ)gdevppla.$(OBJ)
+bmpa_=$(DEVOBJ)gdevbmpa.$(OBJ) $(DEVOBJ)gdevbmpc.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ) $(DEVOBJ)gdevppla.$(OBJ)
-$(GLOBJ)gdevbmpa.$(OBJ) : $(GLSRC)gdevbmpa.c $(AK) $(stdio__h)\
+$(DEVOBJ)gdevbmpa.$(OBJ) : $(DEVSRC)gdevbmpa.c $(AK) $(stdio__h)\
 $(gdevbmp_h) $(gdevprna_h) $(gdevpccm_h) $(gdevppla_h)\
 $(gserrors_h) $(gpsync_h)
-        $(GLCC) $(GLO_)gdevbmpa.$(OBJ) $(C_) $(GLSRC)gdevbmpa.c
+        $(DEVCC) $(DEVO_)gdevbmpa.$(OBJ) $(C_) $(DEVSRC)gdevbmpa.c
 $(DD)bmpamono.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
 $(GDEV)
@@ -1258,24 +1323,9 @@ $(DD)bmpa32b.dev : $(DEVS_MAK) $(bmpa_) $(GLD)page.dev $(GLD)async.dev\
        $(SETPDEV2) $(DD)bmpa32b $(bmpa_)
        $(ADDMOD) $(DD)bmpa32b -include $(GLD)async
-### ------------------------ The DeviceN device ------------------------ ###
-devn_=$(GLOBJ)gdevdevn.$(OBJ)
-$(DD)spotcmyk.dev : $(DEVS_MAK) $(devn_) $(GLD)page.dev $(GDEV)
-        $(SETDEV) $(DD)spotcmyk $(devn_)
-$(DD)devicen.dev : $(DEVS_MAK) $(devn_) $(GLD)page.dev $(GDEV)
-        $(SETDEV) $(DD)devicen $(devn_)
-$(GLOBJ)gdevdevn.$(OBJ) : $(GLSRC)gdevdevn.c $(PDEVH) $(math__h) $(string__h)\
- $(gdevprn_h) $(gsparam_h) $(gscrd_h) $(gscrdp_h) $(gxlum_h) $(gdevdcrd_h)\
- $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h)
-        $(GLCC) $(GLO_)gdevdevn.$(OBJ) $(C_) $(GLSRC)gdevdevn.c
 ### --------------------------- The XCF device ------------------------- ###
-xcf_=$(GLOBJ)gdevxcf.$(OBJ)
+xcf_=$(DEVOBJ)gdevxcf.$(OBJ)
 $(DD)xcf.dev : $(DEVS_MAK) $(xcf_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)xcf $(xcf_)
@@ -1283,14 +1333,14 @@ $(DD)xcf.dev : $(DEVS_MAK) $(xcf_) $(GLD)page.dev $(GDEV)
 $(DD)xcfcmyk.dev : $(DEVS_MAK) $(xcf_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)xcfcmyk $(xcf_)
-$(GLOBJ)gdevxcf.$(OBJ) : $(GLSRC)gdevxcf.c $(PDEVH) $(math__h)\
+$(DEVOBJ)gdevxcf.$(OBJ) : $(DEVSRC)gdevxcf.c $(PDEVH) $(math__h)\
 $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
 $(gxdcconv_h) $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h)
-        $(GLCC) $(GLO_)gdevxcf.$(OBJ) $(C_) $(GLSRC)gdevxcf.c
+        $(DEVCC) $(DEVO_)gdevxcf.$(OBJ) $(C_) $(DEVSRC)gdevxcf.c
 ### --------------------------- The PSD device ------------------------- ###
-psd_=$(GLOBJ)gdevpsd.$(OBJ) $(GLOBJ)gdevdevn.$(OBJ) $(GLOBJ)gsequivc.$(OBJ)
+psd_=$(DEVOBJ)gdevpsd.$(OBJ) $(DEVOBJ)gdevdevn.$(OBJ) $(GLOBJ)gsequivc.$(OBJ)
 $(DD)psdrgb.dev : $(DEVS_MAK) $(psd_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)psdrgb $(psd_)
@@ -1298,45 +1348,39 @@ $(DD)psdrgb.dev : $(DEVS_MAK) $(psd_) $(GLD)page.dev $(GDEV)
 $(DD)psdcmyk.dev : $(DEVS_MAK) $(psd_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)psdcmyk $(psd_)
-$(GLOBJ)gdevpsd.$(OBJ) : $(GLSRC)gdevpsd.c $(PDEVH) $(math__h)\
+$(DEVOBJ)gdevpsd.$(OBJ) : $(DEVSRC)gdevpsd.c $(PDEVH) $(math__h)\
 $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)\
 $(gstypes_h) $(gxdcconv_h) $(gdevdevn_h) $(gsequivc_h)\
 $(gscms_h) $(gsicc_cache_h) $(gsicc_manage_h) $(gxgetbit_h)\
 $(gdevppla_h)
-        $(GLCC) $(GLO_)gdevpsd.$(OBJ) $(C_) $(GLSRC)gdevpsd.c
+        $(DEVCC) $(DEVO_)gdevpsd.$(OBJ) $(C_) $(DEVSRC)gdevpsd.c
-$(GLOBJ)gsequivc.$(OBJ) : $(GLSRC)gsequivc.c $(math__h)\
- $(PDEVH) $(gsparam_h) $(gstypes_h) $(gxdconv_h) $(gdevdevn_h)\
- $(gsequivc_h) $(gzstate_h) $(gsstate_h) $(gscspace_h) $(gxcspace_h)\
- $(gsicc_manage_h) $(gxdevsop_h)
-        $(GLCC) $(GLO_)gsequivc.$(OBJ) $(C_) $(GLSRC)gsequivc.c
 ### ----------------------- The permutation device --------------------- ###
-perm_=$(GLOBJ)gdevperm.$(OBJ)
+perm_=$(DEVOBJ)gdevperm.$(OBJ)
 $(DD)perm.dev : $(DEVS_MAK) $(perm_) $(GLD)page.dev $(GDEV)
        $(SETDEV) $(DD)perm $(perm_)
-$(GLOBJ)gdevperm.$(OBJ) : $(GLSRC)gdevperm.c $(PDEVH) $(math__h)\
+$(DEVOBJ)gdevperm.$(OBJ) : $(DEVSRC)gdevperm.c $(PDEVH) $(math__h)\
 $(gdevdcrd_h) $(gscrd_h) $(gscrdp_h) $(gsparam_h) $(gxlum_h)
-        $(GLCC) $(GLO_)gdevperm.$(OBJ) $(C_) $(GLSRC)gdevperm.c
+        $(DEVCC) $(DEVO_)gdevperm.$(OBJ) $(C_) $(DEVSRC)gdevperm.c
 ### ------------------------ JBIG2 testing device ---------------------- ###
-gdevjbig2_=$(GLOBJ)gdevjbig2.$(OBJ)
+gdevjbig2_=$(DEVOBJ)gdevjbig2.$(OBJ)
 $(DD)gdevjbig2.dev : $(DEVS_MAK) $(gdevjbig2_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)gdevjbig2 $(gdevjbig2_)
-$(GLOBJ)gdevjbig2.$(OBJ) : $(GLSRC)gdevjbig2.c $(PDEVH)\
+$(DEVOBJ)gdevjbig2.$(OBJ) : $(DEVSRC)gdevjbig2.c $(PDEVH)\
 $(stream_h) $(strimpl_h) $(sjbig2_luratech_h)
-        $(GDEVLDFJB2CC) $(GLO_)gdevjbig2.$(OBJ) $(C_) $(GLSRC)gdevjbig2.c
+        $(GDEVLDFJB2CC) $(DEVO_)gdevjbig2.$(OBJ) $(C_) $(DEVSRC)gdevjbig2.c
 ### ------------------------ JPX testing device ---------------------- 
 ###
-gdevjpx_=$(GLOBJ)gdevjpx.$(OBJ)
+gdevjpx_=$(DEVOBJ)gdevjpx.$(OBJ)
 $(DD)jpxrgb.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)jpxrgb $(gdevjpx_)
@@ -1347,13 +1391,13 @@ $(DD)jpxgray.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV)
 $(DD)jpxcmyk.dev : $(DEVS_MAK) $(gdevjpx_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)jpxcmyk $(gdevjpx_)
-$(GLOBJ)gdevjpx.$(OBJ) : $(GLSRC)gdevjpx.c $(PDEVH)\
+$(DEVOBJ)gdevjpx.$(OBJ) : $(DEVSRC)gdevjpx.c $(PDEVH)\
 $(stream_h) $(strimpl_h) $(sjpx_luratech_h)
-        $(GDEVLWFJPXCC) $(GLO_)gdevjpx.$(OBJ) $(C_) $(GLSRC)gdevjpx.c
+        $(GDEVLWFJPXCC) $(DEVO_)gdevjpx.$(OBJ) $(C_) $(DEVSRC)gdevjpx.c
 ### ------------------------- JPEG file format ------------------------- ###
-jpeg_=$(GLOBJ)gdevjpeg.$(OBJ)
+jpeg_=$(DEVOBJ)gdevjpeg.$(OBJ)
 # RGB output
 $(DD)jpeg.dev : $(DEVS_MAK) $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev $(GDEV)
@@ -1372,29 +1416,29 @@ $(DD)jpegcmyk.dev : $(DEVS_MAK) $(jpeg_) $(GLD)sdcte.dev $(GLD)page.dev\
        $(SETPDEV2) $(DD)jpegcmyk $(jpeg_)
        $(ADDMOD) $(DD)jpegcmyk -include $(GLD)sdcte
-$(GLOBJ)gdevjpeg.$(OBJ) : $(GLSRC)gdevjpeg.c $(PDEVH)\
+$(DEVOBJ)gdevjpeg.$(OBJ) : $(DEVSRC)gdevjpeg.c $(PDEVH)\
 $(stdio__h) $(jpeglib__h)\
 $(sdct_h) $(sjpeg_h) $(stream_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevjpeg.$(OBJ) $(C_) $(GLSRC)gdevjpeg.c
+        $(DEVCC) $(DEVO_)gdevjpeg.$(OBJ) $(C_) $(DEVSRC)gdevjpeg.c
 ### ------------------------- MIFF file format ------------------------- ###
 ### Right now we support only 24-bit direct color, but we might add more ###
 ### formats in the future.                                               ###
-miff_=$(GLOBJ)gdevmiff.$(OBJ)
+miff_=$(DEVOBJ)gdevmiff.$(OBJ)
 $(DD)miff24.dev : $(DEVS_MAK) $(miff_) $(GLD)page.dev $(GDEV)
        $(SETPDEV) $(DD)miff24 $(miff_)
-$(GLOBJ)gdevmiff.$(OBJ) : $(GLSRC)gdevmiff.c $(PDEVH)
+$(DEVOBJ)gdevmiff.$(OBJ) : $(DEVSRC)gdevmiff.c $(PDEVH)
-        $(GLCC) $(GLO_)gdevmiff.$(OBJ) $(C_) $(GLSRC)gdevmiff.c
+        $(DEVCC) $(DEVO_)gdevmiff.$(OBJ) $(C_) $(DEVSRC)gdevmiff.c
 ### ------------------------- PCX file formats ------------------------- ###
-pcx_=$(GLOBJ)gdevpcx.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
+pcx_=$(DEVOBJ)gdevpcx.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-$(GLOBJ)gdevpcx.$(OBJ) : $(GLSRC)gdevpcx.c $(PDEVH) $(gdevpccm_h) $(gxlum_h)
+$(DEVOBJ)gdevpcx.$(OBJ) : $(DEVSRC)gdevpcx.c $(PDEVH) $(gdevpccm_h) $(gxlum_h)
-        $(GLCC) $(GLO_)gdevpcx.$(OBJ) $(C_) $(GLSRC)gdevpcx.c
+        $(DEVCC) $(DEVO_)gdevpcx.$(OBJ) $(C_) $(DEVSRC)gdevpcx.c
 $(DD)pcxmono.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)pcxmono $(pcx_)
@@ -1416,25 +1460,25 @@ $(DD)pcxcmyk.dev : $(DEVS_MAK) $(pcx_) $(GLD)page.dev $(GDEV)
 # The 2-up PCX device is here only as an example, and for testing.
-$(DD)pcx2up.dev : $(DEVS_MAK) $(LIB_MAK) $(GLOBJ)gdevp2up.$(OBJ)\
+$(DD)pcx2up.dev : $(DEVS_MAK) $(LIB_MAK) $(DEVOBJ)gdevp2up.$(OBJ)\
 $(GLD)page.dev $(DD)pcx256.dev $(GDEV)
-        $(SETPDEV) $(DD)pcx2up $(GLOBJ)gdevp2up.$(OBJ)
+        $(SETPDEV) $(DD)pcx2up $(DEVOBJ)gdevp2up.$(OBJ)
        $(ADDMOD) $(DD)pcx2up -include $(DD)pcx256
-$(GLOBJ)gdevp2up.$(OBJ) : $(GLSRC)gdevp2up.c $(AK)\
+$(DEVOBJ)gdevp2up.$(OBJ) : $(DEVSRC)gdevp2up.c $(AK)\
 $(gdevpccm_h) $(gdevprn_h) $(gxclpage_h)
-        $(GLCC) $(GLO_)gdevp2up.$(OBJ) $(C_) $(GLSRC)gdevp2up.c
+        $(DEVCC) $(DEVO_)gdevp2up.$(OBJ) $(C_) $(DEVSRC)gdevp2up.c
 ### ------------------- Portable Bitmap file formats ------------------- ###
 ### For more information, see the pam(5), pbm(5), pgm(5), and ppm(5)     ###
 ### man pages.                                                           ###
-pxm_=$(GLOBJ)gdevpbm.$(OBJ) $(GLOBJ)gdevppla.$(OBJ) $(GLOBJ)gdevmpla.$(OBJ)
+pxm_=$(DEVOBJ)gdevpbm.$(OBJ) $(DEVOBJ)gdevppla.$(OBJ) $(DEVOBJ)gdevmpla.$(OBJ)
-$(GLOBJ)gdevpbm.$(OBJ) : $(GLSRC)gdevpbm.c $(PDEVH)\
+$(DEVOBJ)gdevpbm.$(OBJ) : $(DEVSRC)gdevpbm.c $(PDEVH)\
 $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
 $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h)
-        $(GLCC) $(GLO_)gdevpbm.$(OBJ) $(C_) $(GLSRC)gdevpbm.c
+        $(DEVCC) $(DEVO_)gdevpbm.$(OBJ) $(C_) $(DEVSRC)gdevpbm.c
 ### Portable Bitmap (PBM, plain or raw format, magic numbers "P1" or "P4")
@@ -1513,15 +1557,13 @@ $(DD)pam.dev : $(DEVS_MAK) $(pxm_) $(GLD)page.dev $(GDEV)
 ### Requires libpng 0.81 and zlib 0.95 (or more recent versions).         ###
 ### See png.mak and zlib.mak for more details.                         ###
-png__h=$(GLSRC)png_.h $(MAKEFILE)
+png_=$(DEVOBJ)gdevpng.$(OBJ) $(DEVOBJ)gdevpccm.$(OBJ)
-png_=$(GLOBJ)gdevpng.$(OBJ) $(GLOBJ)gdevpccm.$(OBJ)
 libpng_dev=$(PNGGENDIR)$(D)libpng.dev
 png_i_=-include $(PNGGENDIR)$(D)libpng
-$(GLOBJ)gdevpng.$(OBJ) : $(GLSRC)gdevpng.c\
+$(DEVOBJ)gdevpng.$(OBJ) : $(DEVSRC)gdevpng.c\
 $(gdevprn_h) $(gdevpccm_h) $(gscdefs_h) $(png__h)
-        $(CC_) $(I_)$(GLI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(GLO_)gdevpng.$(OBJ) $(C_) $(GLSRC)gdevpng.c
+        $(CC_) $(I_)$(DEVI_) $(II)$(PI_)$(_I) $(PCF_) $(GLF_) $(DEVO_)gdevpng.$(OBJ) $(C_) $(DEVSRC)gdevpng.c
 $(DD)pngmono.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)pngmono $(png_)
@@ -1561,12 +1603,12 @@ $(DD)pngalpha.dev : $(DEVS_MAK) $(libpng_dev) $(png_) $(GLD)page.dev $(GDEV)
 ###   format.  They also can convert big, complex color PostScript files  ###
 ###   to (often) smaller and more easily printed bitmaps.                 ###
-psim_=$(GLOBJ)gdevpsim.$(OBJ) $(GLOBJ)gdevpsu.$(OBJ)
+psim_=$(DEVOBJ)gdevpsim.$(OBJ) $(DEVOBJ)gdevpsu.$(OBJ)
-$(GLOBJ)gdevpsim.$(OBJ) : $(GLSRC)gdevpsim.c $(PDEVH)\
+$(DEVOBJ)gdevpsim.$(OBJ) : $(DEVSRC)gdevpsim.c $(PDEVH)\
 $(gdevpsu_h)\
 $(sa85x_h) $(srlx_h) $(stream_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevpsim.$(OBJ) $(C_) $(GLSRC)gdevpsim.c
+        $(DEVCC) $(DEVO_)gdevpsim.$(OBJ) $(C_) $(DEVSRC)gdevpsim.c
 # Monochrome, Level 1 output
@@ -1587,11 +1629,11 @@ $(DD)psrgb.dev : $(DEVS_MAK) $(psim_) $(GLD)page.dev $(GDEV)
 # within files means it is also pulled in for color/cmyk tiff functions
 # too.
-minftrsz_h=$(GLSRC)minftrsz.h $(std_h)
+minftrsz_h=$(DEVSRC)minftrsz.h $(std_h)
-minftrsz_=$(minftrsz_h) $(GLOBJ)minftrsz.$(OBJ)
+minftrsz_=$(minftrsz_h) $(DEVOBJ)minftrsz.$(OBJ)
-$(GLOBJ)minftrsz.$(OBJ) : $(GLSRC)minftrsz.c $(minftrsz_h)
+$(DEVOBJ)minftrsz.$(OBJ) : $(DEVSRC)minftrsz.c $(minftrsz_h)
-        $(GLCC) $(GLO_)minftrsz.$(OBJ) $(C_) $(GLSRC)minftrsz.c
+        $(DEVCC) $(DEVO_)minftrsz.$(OBJ) $(C_) $(DEVSRC)minftrsz.c
 ### ---------------- Fax encoding ---------------- ###
@@ -1601,19 +1643,19 @@ $(GLOBJ)minftrsz.$(OBJ) : $(GLSRC)minftrsz.c $(minftrsz_h)
 # systems (1728 or 2048 pixels).  To suppress this, set the device parameter
 # AdjustWidth to 0 (e.g., -dAdjustWidth=0 on the command line).
-gdevfax_h=$(GLSRC)gdevfax.h
+gdevfax_h=$(DEVSRC)gdevfax.h
 libtiff_dev=$(TIFFGENDIR)$(D)libtiff.dev
 tiff_i_=-include $(TIFFGENDIR)$(D)libtiff
-fax_=$(GLOBJ)gdevfax.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+fax_=$(DEVOBJ)gdevfax.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)fax.dev : $(DEVS_MAK) $(libtiff_dev) $(fax_) $(GLD)cfe.dev $(minftrsz_h)\
 $(GDEV)
        $(SETMOD) $(DD)fax $(fax_)
        $(ADDMOD) $(DD)fax -include $(GLD)cfe $(tiff_i_)
-$(GLOBJ)gdevfax.$(OBJ) : $(GLSRC)gdevfax.c $(PDEVH)\
+$(DEVOBJ)gdevfax.$(OBJ) : $(DEVSRC)gdevfax.c $(PDEVH)\
 $(gdevfax_h) $(scfx_h) $(strimpl_h)
-        $(GLCC) $(GLO_)gdevfax.$(OBJ) $(C_) $(GLSRC)gdevfax.c
+        $(DEVCC) $(DEVO_)gdevfax.$(OBJ) $(C_) $(DEVSRC)gdevfax.c
 $(DD)faxg3.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)fax.dev $(GDEV)
        $(SETDEV2) $(DD)faxg3 -include $(DD)fax
@@ -1632,9 +1674,9 @@ $(DD)faxg4.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)fax.dev $(GDEV)
 ###       -r204x98 for low resolution output, or                          ###
 ###       -r204x196 for high resolution output                            ###
-gdevtifs_h=$(GLSRC)gdevtifs.h
+gdevtifs_h=$(DEVSRC)gdevtifs.h
-tfax_=$(GLOBJ)gdevtfax.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tfax_=$(DEVOBJ)gdevtfax.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tfax.dev : $(DEVS_MAK) $(libtiff_dev) $(tfax_) $(GLD)cfe.dev\
 $(GLD)lzwe.dev $(GLD)rle.dev $(DD)fax.dev $(DD)tiffs.dev $(minftrsz_h)\
 $(GDEV)
@@ -1642,22 +1684,22 @@ $(DD)tfax.dev : $(DEVS_MAK) $(libtiff_dev) $(tfax_) $(GLD)cfe.dev\
        $(ADDMOD) $(DD)tfax -include $(GLD)cfe $(GLD)lzwe $(GLD)rle
        $(ADDMOD) $(DD)tfax -include $(DD)fax $(DD)tiffs $(tiff_i_)
-$(GLOBJ)gdevtfax.$(OBJ) : $(GLSRC)gdevtfax.c $(PDEVH)\
+$(DEVOBJ)gdevtfax.$(OBJ) : $(DEVSRC)gdevtfax.c $(PDEVH)\
 $(stdint__h) $(gdevfax_h) $(gdevtifs_h)\
 $(scfx_h) $(slzwx_h) $(srlx_h) $(strimpl_h)
-        $(GLCC) $(I_)$(TI_)$(_I) $(GLO_)gdevtfax.$(OBJ) $(C_) $(GLSRC)gdevtfax.c
+        $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtfax.$(OBJ) $(C_) $(DEVSRC)gdevtfax.c
 ### ---------------------------- TIFF formats --------------------------- ###
-tiffs_=$(GLOBJ)gdevtifs.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffs_=$(DEVOBJ)gdevtifs.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffs.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffs_) $(GLD)page.dev\
 $(minftrsz_) $(GDEV)
        $(SETMOD) $(DD)tiffs $(tiffs_)
        $(ADDMOD) $(DD)tiffs -include $(GLD)page $(tiff_i_)
-$(GLOBJ)gdevtifs.$(OBJ) : $(GLSRC)gdevtifs.c $(PDEVH) $(stdint__h) $(stdio__h) $(time__h)\
+$(DEVOBJ)gdevtifs.$(OBJ) : $(DEVSRC)gdevtifs.c $(PDEVH) $(stdint__h) $(stdio__h) $(time__h)\
 $(gdevtifs_h) $(gscdefs_h) $(gstypes_h) $(stream_h) $(strmio_h)
-        $(GLCC) $(I_)$(GLI_) $(II)$(TI_)$(_I) $(GLO_)gdevtifs.$(OBJ) $(C_) $(GLSRC)gdevtifs.c
+        $(DEVCC) $(I_)$(DEVI_) $(II)$(TI_)$(_I) $(DEVO_)gdevtifs.$(OBJ) $(C_) $(DEVSRC)gdevtifs.c
 # Black & white, G3/G4 fax
 # NOTE: see under faxg* above regarding page width adjustment.
@@ -1698,21 +1740,21 @@ $(DD)tiffpack.dev : $(DEVS_MAK) $(libtiff_dev) $(DD)tfax.dev $(minftrsz_)\
 # TIFF Gray, no compression
-tiffgray_=$(GLOBJ)gdevtsep.$(OBJ) $(GLOBJ)gsequivc.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffgray_=$(DEVOBJ)gdevtsep.$(OBJ) $(DEVOBJ)gsequivc.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffgray.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
 $(minftrsz_h) $(GDEV)
        $(SETPDEV2) $(DD)tiffgray $(tiffgray_)
        $(ADDMOD) $(DD)tiffgray -include $(DD)tiffs $(tiff_i_)
-$(GLOBJ)gdevtsep.$(OBJ) : $(GLSRC)gdevtsep.c $(PDEVH) $(stdint__h)\
+$(DEVOBJ)gdevtsep.$(OBJ) : $(DEVSRC)gdevtsep.c $(PDEVH) $(stdint__h)\
 $(gdevtifs_h) $(gdevdevn_h) $(gsequivc_h) $(stdio__h) $(ctype__h)\
 $(gxgetbit_h) $(gdevppla_h) $(gp_h) $(GDEV)
-        $(GLCC) $(I_)$(TI_)$(_I) $(GLO_)gdevtsep.$(OBJ) $(C_) $(GLSRC)gdevtsep.c
+        $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtsep.$(OBJ) $(C_) $(DEVSRC)gdevtsep.c
 # TIFF Scaled (downscaled gray -> mono), configurable compression
-tiffscaled_=$(tiffgray_) $(GLOBJ)gdevtsep.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffscaled_=$(tiffgray_) $(DEVOBJ)gdevtsep.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffscaled.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled_) $(DD)tiffs.dev\
 $(minftrsz_h) $(GDEV)
@@ -1721,7 +1763,7 @@ $(DD)tiffscaled.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled_) $(DD)tiffs.dev\
 # TIFF Scaled 8 (downscaled gray -> gray), configurable compression
-tiffscaled8_=$(tiffgray_) $(GLOBJ)gdevtsep.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffscaled8_=$(tiffgray_) $(DEVOBJ)gdevtsep.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffscaled8.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled8_)\
 $(DD)tiffs.dev $(minftrsz_h) $(GDEV)
@@ -1730,7 +1772,7 @@ $(DD)tiffscaled8.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled8_)\
 # TIFF Scaled 24 (downscaled rgb -> rgb), configurable compression
-tiffscaled24_=$(tiffgray_) $(GLOBJ)gdevtsep.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffscaled24_=$(tiffgray_) $(DEVOBJ)gdevtsep.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffscaled24.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled24_)\
 $(DD)tiffs.dev $(minftrsz_h) $(GDEV)
@@ -1739,7 +1781,7 @@ $(DD)tiffscaled24.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled24_)\
 # TIFF Scaled 4 (downscaled cmyk -> cmyk), configurable compression
-tiffscaled4_=$(tiffgray_) $(GLOBJ)gdevtsep.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffscaled4_=$(tiffgray_) $(DEVOBJ)gdevtsep.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiffscaled4.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled4_)\
 $(DD)tiffs.dev $(minftrsz_h) $(GDEV)
@@ -1748,7 +1790,7 @@ $(DD)tiffscaled4.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffscaled4_)\
 # TIFF RGB, no compression
-tiffrgb_=$(GLOBJ)gdevtfnx.$(OBJ) $(GLOBJ)minftrsz.$(OBJ)
+tiffrgb_=$(DEVOBJ)gdevtfnx.$(OBJ) $(DEVOBJ)minftrsz.$(OBJ)
 $(DD)tiff12nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
 $(minftrsz_h) $(GDEV)
@@ -1765,9 +1807,9 @@ $(DD)tiff48nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffrgb_) $(DD)tiffs.dev\
        $(SETPDEV2) $(DD)tiff48nc $(tiffrgb_)
        $(ADDMOD) $(DD)tiff48nc -include $(DD)tiffs $(tiff_i_)
-$(GLOBJ)gdevtfnx.$(OBJ) : $(GLSRC)gdevtfnx.c $(PDEVH) $(stdint__h)\
+$(DEVOBJ)gdevtfnx.$(OBJ) : $(DEVSRC)gdevtfnx.c $(PDEVH) $(stdint__h)\
 $(gdevtifs_h) $(gscms_h) $(GDEV)
-        $(GLCC) $(I_)$(TI_)$(_I) $(GLO_)gdevtfnx.$(OBJ) $(C_) $(GLSRC)gdevtfnx.c
+        $(DEVCC) $(I_)$(TI_)$(_I) $(DEVO_)gdevtfnx.$(OBJ) $(C_) $(DEVSRC)gdevtfnx.c
 # TIFF CMYK, no compression
@@ -1784,7 +1826,7 @@ $(DD)tiff64nc.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
 #
 # Create separation files (tiffgray) plus CMYK composite (tiff32nc)
-tiffsep_=$(tiffgray_) $(GLOBJ)gdevdevn.$(OBJ) $(GLOBJ)gsequivc.$(OBJ)
+tiffsep_=$(tiffgray_) $(DEVOBJ)gdevdevn.$(OBJ) $(DEVOBJ)gsequivc.$(OBJ)
 $(DD)tiffsep.dev : $(DEVS_MAK) $(libtiff_dev) $(tiffgray_) $(DD)tiffs.dev\
 $(minftrsz_h) $(GDEV)
@@ -1802,12 +1844,12 @@ $(DD)tiffsep1.dev : $(DEVS_MAK) $(tiffgray_) $(DD)tiffs.dev $(minftrsz_h)\
 #
 # PLANar device
-plan_=$(GLOBJ)gdevplan.$(OBJ) $(GLOBJ)gdevppla.$(OBJ) $(GLOBJ)gdevmpla.$(OBJ)
+plan_=$(DEVOBJ)gdevplan.$(OBJ) $(DEVOBJ)gdevppla.$(OBJ) $(DEVOBJ)gdevmpla.$(OBJ)
-$(GLOBJ)gdevplan.$(OBJ) : $(GLSRC)gdevplan.c $(PDEVH)\
+$(DEVOBJ)gdevplan.$(OBJ) : $(DEVSRC)gdevplan.c $(PDEVH)\
 $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
 $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h)
-        $(GLCC) $(GLO_)gdevplan.$(OBJ) $(C_) $(GLSRC)gdevplan.c
+        $(DEVCC) $(DEVO_)gdevplan.$(OBJ) $(C_) $(DEVSRC)gdevplan.c
 $(DD)plan.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)plan $(plan_)
@@ -1827,12 +1869,12 @@ $(DD)plank.dev : $(DEVS_MAK) $(plan_) $(GLD)page.dev $(GDEV)
 #
 # PLanar Interlaced Buffer device
-plib_=$(GLOBJ)gdevplib.$(OBJ) $(GLOBJ)gdevppla.$(OBJ) $(GLOBJ)gdevmpla.$(OBJ)
+plib_=$(DEVOBJ)gdevplib.$(OBJ) $(DEVOBJ)gdevppla.$(OBJ) $(DEVOBJ)gdevmpla.$(OBJ)
-$(GLOBJ)gdevplib.$(OBJ) : $(GLSRC)gdevplib.c $(PDEVH)\
+$(DEVOBJ)gdevplib.$(OBJ) : $(DEVSRC)gdevplib.c $(PDEVH)\
 $(gdevmpla_h) $(gdevplnx_h) $(gdevppla_h)\
 $(gscdefs_h) $(gscspace_h) $(gxgetbit_h) $(gxiparam_h) $(gxlum_h)
-        $(GLCC) $(GLO_)gdevplib.$(OBJ) $(C_) $(GLSRC)gdevplib.c
+        $(DEVCC) $(DEVO_)gdevplib.$(OBJ) $(C_) $(DEVSRC)gdevplib.c
 $(DD)plib.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)plib $(plib_)
@@ -1849,15 +1891,28 @@ $(DD)plibc.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV)
 $(DD)plibk.dev : $(DEVS_MAK) $(plib_) $(GLD)page.dev $(GDEV)
        $(SETPDEV2) $(DD)plibk $(plib_)
+# ink coverage device  --  a device that records the ink coverage
+# on each page, and discards the page.
+$(DD)inkcov.dev : $(ECHOGS_XE) $(LIB_MAK) $(DEVOBJ)gdevicov.$(OBJ)
+        $(SETDEV2) $(DD)inkcov $(DEVOBJ)gdevicov.$(OBJ)
+$(DEVOBJ)gdevicov.$(OBJ) : $(DEVSRC)gdevicov.c $(AK) $(MAKEDIRS) \
+  $(arch_h) $(gdevprn_h) $(stdio__h)  $(stdint__h)
+        $(DEVCC) $(DEVO_)gdevicov.$(OBJ) $(C_) $(DEVSRC)gdevicov.c
 ### ------------------------------- CUPS ------------------------------- ###
 lcups_dev=$(LCUPSGENDIR)$(D)lcups.dev
 lcupsi_dev=$(LCUPSIGENDIR)$(D)lcupsi.dev
-cups_=$(GLOBJ)gdevcups.$(OBJ)
+cups_=$(DEVOBJ)gdevcups.$(OBJ)
 $(DD)cups.dev : $(DEVS_MAK) $(lcups_dev) $(lcupsi_dev) $(cups_) $(GDEV)
        $(SETPDEV2) $(DD)cups $(cups_)
        $(ADDMOD) $(DD)cups -include $(lcups_dev)
        $(ADDMOD) $(DD)cups -include $(lcupsi_dev)
-$(GLOBJ)gdevcups.$(OBJ) : cups$(D)gdevcups.c $(std_h)
+$(DEVOBJ)gdevcups.$(OBJ) : cups$(D)gdevcups.c $(std_h)
-        $(CUPS_CC) $(GLO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(I_)$(GLSRC) $(I_)$(GLOBJ) $(I_)$(LCUPSSRCDIR)$(D)libs $(LCUPSSRCDIR)$(D)gdevcups.c
+        $(CUPS_CC) $(DEVO_)gdevcups.$(OBJ) $(C_) $(CFLAGS) $(I_)$(GLSRC) \
+            $(I_)$(DEVSRC) \
+            $(I_)$(DEVOBJ) $(I_)$(LCUPSSRCDIR)$(D)libs \
+            $(LCUPSSRCDIR)$(D)gdevcups.c
diff --git a/gs/base/gdev3852.c b/gs/devices/gdev3852.c
index bddf24ecf..bddf24ecf 100644
--- a/gs/base/gdev3852.c
+++ b/gs/devices/gdev3852.c
diff --git a/gs/base/gdev3b1.c b/gs/devices/gdev3b1.c
index 4ad9065fe..4ad9065fe 100644
--- a/gs/base/gdev3b1.c
+++ b/gs/devices/gdev3b1.c
diff --git a/gs/base/gdev4081.c b/gs/devices/gdev4081.c
index e844edd18..e844edd18 100644
--- a/gs/base/gdev4081.c
+++ b/gs/devices/gdev4081.c
diff --git a/gs/base/gdev4693.c b/gs/devices/gdev4693.c
index 2feece696..2feece696 100644
--- a/gs/base/gdev4693.c
+++ b/gs/devices/gdev4693.c
diff --git a/gs/base/gdev8510.c b/gs/devices/gdev8510.c
index 2250a16f2..2250a16f2 100644
--- a/gs/base/gdev8510.c
+++ b/gs/devices/gdev8510.c
diff --git a/gs/base/gdev8bcm.c b/gs/devices/gdev8bcm.c
index e40a981ec..e40a981ec 100644
--- a/gs/base/gdev8bcm.c
+++ b/gs/devices/gdev8bcm.c
diff --git a/gs/base/gdev8bcm.h b/gs/devices/gdev8bcm.h
index 49040567b..49040567b 100644
--- a/gs/base/gdev8bcm.h
+++ b/gs/devices/gdev8bcm.h
diff --git a/gs/base/gdevadmp.c b/gs/devices/gdevadmp.c
index bcf15bc32..bcf15bc32 100644
--- a/gs/base/gdevadmp.c
+++ b/gs/devices/gdevadmp.c
diff --git a/gs/base/gdevatx.c b/gs/devices/gdevatx.c
index e9097c6a4..e9097c6a4 100644
--- a/gs/base/gdevatx.c
+++ b/gs/devices/gdevatx.c
diff --git a/gs/base/gdevbit.c b/gs/devices/gdevbit.c
index 95b5f0508..95b5f0508 100644
--- a/gs/base/gdevbit.c
+++ b/gs/devices/gdevbit.c
diff --git a/gs/base/gdevbj10.c b/gs/devices/gdevbj10.c
index 988ee2fea..988ee2fea 100644
--- a/gs/base/gdevbj10.c
+++ b/gs/devices/gdevbj10.c
diff --git a/gs/base/gdevbjc.h b/gs/devices/gdevbjc.h
index d5cfea2fb..d5cfea2fb 100644
--- a/gs/base/gdevbjc.h
+++ b/gs/devices/gdevbjc.h
diff --git a/gs/base/gdevbjcl.c b/gs/devices/gdevbjcl.c
index 86bb8b4c9..86bb8b4c9 100644
--- a/gs/base/gdevbjcl.c
+++ b/gs/devices/gdevbjcl.c
diff --git a/gs/base/gdevbjcl.h b/gs/devices/gdevbjcl.h
index 045cdb651..045cdb651 100644
--- a/gs/base/gdevbjcl.h
+++ b/gs/devices/gdevbjcl.h
diff --git a/gs/base/gdevbmp.c b/gs/devices/gdevbmp.c
index 76c501bf4..76c501bf4 100644
--- a/gs/base/gdevbmp.c
+++ b/gs/devices/gdevbmp.c
diff --git a/gs/base/gdevbmp.h b/gs/devices/gdevbmp.h
index 400fdb6dc..400fdb6dc 100644
--- a/gs/base/gdevbmp.h
+++ b/gs/devices/gdevbmp.h
diff --git a/gs/base/gdevbmpa.c b/gs/devices/gdevbmpa.c
index 420a6b2ca..420a6b2ca 100644
--- a/gs/base/gdevbmpa.c
+++ b/gs/devices/gdevbmpa.c
diff --git a/gs/base/gdevbmpc.c b/gs/devices/gdevbmpc.c
index 0970a4aba..0970a4aba 100644
--- a/gs/base/gdevbmpc.c
+++ b/gs/devices/gdevbmpc.c
diff --git a/gs/base/gdevccr.c b/gs/devices/gdevccr.c
index 24348e8d6..24348e8d6 100644
--- a/gs/base/gdevccr.c
+++ b/gs/devices/gdevccr.c
diff --git a/gs/base/gdevcdj.c b/gs/devices/gdevcdj.c
index a0903d856..a0903d856 100644
--- a/gs/base/gdevcdj.c
+++ b/gs/devices/gdevcdj.c
diff --git a/gs/base/gdevcfax.c b/gs/devices/gdevcfax.c
index 64ae1eb2f..64ae1eb2f 100644
--- a/gs/base/gdevcfax.c
+++ b/gs/devices/gdevcfax.c
diff --git a/gs/base/gdevcif.c b/gs/devices/gdevcif.c
index 720eaec21..720eaec21 100644
--- a/gs/base/gdevcif.c
+++ b/gs/devices/gdevcif.c
diff --git a/gs/base/gdevclj.c b/gs/devices/gdevclj.c
index 635164c08..635164c08 100644
--- a/gs/base/gdevclj.c
+++ b/gs/devices/gdevclj.c
diff --git a/gs/base/gdevcljc.c b/gs/devices/gdevcljc.c
index f302099ba..f302099ba 100644
--- a/gs/base/gdevcljc.c
+++ b/gs/devices/gdevcljc.c
diff --git a/gs/base/gdevcp50.c b/gs/devices/gdevcp50.c
index d8b242f09..d8b242f09 100644
--- a/gs/base/gdevcp50.c
+++ b/gs/devices/gdevcp50.c
diff --git a/gs/base/gdevcslw.c b/gs/devices/gdevcslw.c
index 7485e38e5..7485e38e5 100644
--- a/gs/base/gdevcslw.c
+++ b/gs/devices/gdevcslw.c
diff --git a/gs/base/gdevdfax.c b/gs/devices/gdevdfax.c
index 5cb2ddb54..5cb2ddb54 100644
--- a/gs/base/gdevdfax.c
+++ b/gs/devices/gdevdfax.c
diff --git a/gs/base/gdevdjet.c b/gs/devices/gdevdjet.c
index 601d2793a..601d2793a 100644
--- a/gs/base/gdevdjet.c
+++ b/gs/devices/gdevdjet.c
diff --git a/gs/base/gdevdjtc.c b/gs/devices/gdevdjtc.c
index 103e9b3ef..103e9b3ef 100644
--- a/gs/base/gdevdjtc.c
+++ b/gs/devices/gdevdjtc.c
diff --git a/gs/base/gdevdljm.c b/gs/devices/gdevdljm.c
index afb05376f..afb05376f 100644
--- a/gs/base/gdevdljm.c
+++ b/gs/devices/gdevdljm.c
diff --git a/gs/base/gdevdljm.h b/gs/devices/gdevdljm.h
index 87325ddee..87325ddee 100644
--- a/gs/base/gdevdljm.h
+++ b/gs/devices/gdevdljm.h
diff --git a/gs/base/gdevdm24.c b/gs/devices/gdevdm24.c
index 18e8e11be..18e8e11be 100644
--- a/gs/base/gdevdm24.c
+++ b/gs/devices/gdevdm24.c
diff --git a/gs/base/gdevdsp.c b/gs/devices/gdevdsp.c
index 38d95b5e5..38d95b5e5 100644
--- a/gs/base/gdevdsp.c
+++ b/gs/devices/gdevdsp.c
diff --git a/gs/base/gdevdsp.h b/gs/devices/gdevdsp.h
index 268c455ac..268c455ac 100644
--- a/gs/base/gdevdsp.h
+++ b/gs/devices/gdevdsp.h
diff --git a/gs/base/gdevdsp2.h b/gs/devices/gdevdsp2.h
index 762ad30c2..762ad30c2 100644
--- a/gs/base/gdevdsp2.h
+++ b/gs/devices/gdevdsp2.h
diff --git a/gs/base/gdevepsc.c b/gs/devices/gdevepsc.c
index 9be29bb26..9be29bb26 100644
--- a/gs/base/gdevepsc.c
+++ b/gs/devices/gdevepsc.c
diff --git a/gs/base/gdevepsn.c b/gs/devices/gdevepsn.c
index c780eaef6..c780eaef6 100644
--- a/gs/base/gdevepsn.c
+++ b/gs/devices/gdevepsn.c
diff --git a/gs/base/gdevescp.c b/gs/devices/gdevescp.c
index c17e3ae4b..c17e3ae4b 100644
--- a/gs/base/gdevescp.c
+++ b/gs/devices/gdevescp.c
diff --git a/gs/base/gdevevga.c b/gs/devices/gdevevga.c
index 483b684df..483b684df 100644
--- a/gs/base/gdevevga.c
+++ b/gs/devices/gdevevga.c
diff --git a/gs/base/gdevfax.c b/gs/devices/gdevfax.c
index a67d30da0..a67d30da0 100644
--- a/gs/base/gdevfax.c
+++ b/gs/devices/gdevfax.c
diff --git a/gs/base/gdevfax.h b/gs/devices/gdevfax.h
index 1aeea75f5..1aeea75f5 100644
--- a/gs/base/gdevfax.h
+++ b/gs/devices/gdevfax.h
diff --git a/gs/base/gdevherc.c b/gs/devices/gdevherc.c
index f02cefe64..f02cefe64 100644
--- a/gs/base/gdevherc.c
+++ b/gs/devices/gdevherc.c
diff --git a/gs/base/gdevhl7x.c b/gs/devices/gdevhl7x.c
index fb58a8721..fb58a8721 100644
--- a/gs/base/gdevhl7x.c
+++ b/gs/devices/gdevhl7x.c
diff --git a/gs/base/gdevicov.c b/gs/devices/gdevicov.c
index 8010d0171..8010d0171 100644
--- a/gs/base/gdevicov.c
+++ b/gs/devices/gdevicov.c
diff --git a/gs/base/gdevifno.c b/gs/devices/gdevifno.c
index 0982623c9..0982623c9 100644
--- a/gs/base/gdevifno.c
+++ b/gs/devices/gdevifno.c
diff --git a/gs/base/gdevijs.c b/gs/devices/gdevijs.c
index e3105c108..e3105c108 100644
--- a/gs/base/gdevijs.c
+++ b/gs/devices/gdevijs.c
diff --git a/gs/base/gdevimgn.c b/gs/devices/gdevimgn.c
index cecc5246a..cecc5246a 100644
--- a/gs/base/gdevimgn.c
+++ b/gs/devices/gdevimgn.c
diff --git a/gs/base/gdevjbig2.c b/gs/devices/gdevjbig2.c
index b993d7678..b993d7678 100644
--- a/gs/base/gdevjbig2.c
+++ b/gs/devices/gdevjbig2.c
diff --git a/gs/base/gdevjpeg.c b/gs/devices/gdevjpeg.c
index a02b13cec..a02b13cec 100644
--- a/gs/base/gdevjpeg.c
+++ b/gs/devices/gdevjpeg.c
diff --git a/gs/base/gdevjpx.c b/gs/devices/gdevjpx.c
index 6a0d32c6c..6a0d32c6c 100644
--- a/gs/base/gdevjpx.c
+++ b/gs/devices/gdevjpx.c
diff --git a/gs/base/gdevl256.c b/gs/devices/gdevl256.c
index 3eb591c9b..3eb591c9b 100644
--- a/gs/base/gdevl256.c
+++ b/gs/devices/gdevl256.c
diff --git a/gs/base/gdevl31s.c b/gs/devices/gdevl31s.c
index ef18be07f..ef18be07f 100644
--- a/gs/base/gdevl31s.c
+++ b/gs/devices/gdevl31s.c
diff --git a/gs/base/gdevlbp8.c b/gs/devices/gdevlbp8.c
index 3fde9eddf..3fde9eddf 100644
--- a/gs/base/gdevlbp8.c
+++ b/gs/devices/gdevlbp8.c
diff --git a/gs/base/gdevlp8k.c b/gs/devices/gdevlp8k.c
index 9c496ebc5..9c496ebc5 100644
--- a/gs/base/gdevlp8k.c
+++ b/gs/devices/gdevlp8k.c
diff --git a/gs/base/gdevlxm.c b/gs/devices/gdevlxm.c
index 0372fd709..0372fd709 100644
--- a/gs/base/gdevlxm.c
+++ b/gs/devices/gdevlxm.c
diff --git a/gs/base/gdevmac.c b/gs/devices/gdevmac.c
index 04ee6b75f..04ee6b75f 100644
--- a/gs/base/gdevmac.c
+++ b/gs/devices/gdevmac.c
diff --git a/gs/base/gdevmac.h b/gs/devices/gdevmac.h
index c39a3c3bf..c39a3c3bf 100644
--- a/gs/base/gdevmac.h
+++ b/gs/devices/gdevmac.h
diff --git a/gs/base/gdevmacpictop.h b/gs/devices/gdevmacpictop.h
index bfe61b7a2..bfe61b7a2 100644
--- a/gs/base/gdevmacpictop.h
+++ b/gs/devices/gdevmacpictop.h
diff --git a/gs/base/gdevmacttf.h b/gs/devices/gdevmacttf.h
index 703a5a615..703a5a615 100644
--- a/gs/base/gdevmacttf.h
+++ b/gs/devices/gdevmacttf.h
diff --git a/gs/base/gdevmeds.c b/gs/devices/gdevmeds.c
index c70a30df6..c70a30df6 100644
--- a/gs/base/gdevmeds.c
+++ b/gs/devices/gdevmeds.c
diff --git a/gs/base/gdevmeds.h b/gs/devices/gdevmeds.h
index bd2f8e000..bd2f8e000 100644
--- a/gs/base/gdevmeds.h
+++ b/gs/devices/gdevmeds.h
diff --git a/gs/base/gdevmgr.c b/gs/devices/gdevmgr.c
index c614a4672..c614a4672 100644
--- a/gs/base/gdevmgr.c
+++ b/gs/devices/gdevmgr.c
diff --git a/gs/base/gdevmgr.h b/gs/devices/gdevmgr.h
index d8c772f2b..d8c772f2b 100644
--- a/gs/base/gdevmgr.h
+++ b/gs/devices/gdevmgr.h
diff --git a/gs/base/gdevmiff.c b/gs/devices/gdevmiff.c
index 0bcf0ff38..0bcf0ff38 100644
--- a/gs/base/gdevmiff.c
+++ b/gs/devices/gdevmiff.c
diff --git a/gs/base/gdevmswn.c b/gs/devices/gdevmswn.c
index 902dad503..902dad503 100644
--- a/gs/base/gdevmswn.c
+++ b/gs/devices/gdevmswn.c
diff --git a/gs/base/gdevmswn.h b/gs/devices/gdevmswn.h
index 0411e3731..0411e3731 100644
--- a/gs/base/gdevmswn.h
+++ b/gs/devices/gdevmswn.h
diff --git a/gs/base/gdevmsxf.c b/gs/devices/gdevmsxf.c
index baebc302a..baebc302a 100644
--- a/gs/base/gdevmsxf.c
+++ b/gs/devices/gdevmsxf.c
diff --git a/gs/base/gdevn533.c b/gs/devices/gdevn533.c
index e59aa69e4..e59aa69e4 100644
--- a/gs/base/gdevn533.c
+++ b/gs/devices/gdevn533.c
diff --git a/gs/base/gdevo182.c b/gs/devices/gdevo182.c
index 149aa1660..149aa1660 100644
--- a/gs/base/gdevo182.c
+++ b/gs/devices/gdevo182.c
diff --git a/gs/base/gdevokii.c b/gs/devices/gdevokii.c
index e40b43979..e40b43979 100644
--- a/gs/base/gdevokii.c
+++ b/gs/devices/gdevokii.c
diff --git a/gs/base/gdevos2p.c b/gs/devices/gdevos2p.c
index 106f8857e..106f8857e 100644
--- a/gs/base/gdevos2p.c
+++ b/gs/devices/gdevos2p.c
diff --git a/gs/base/gdevp2up.c b/gs/devices/gdevp2up.c
index 58386a630..58386a630 100644
--- a/gs/base/gdevp2up.c
+++ b/gs/devices/gdevp2up.c
diff --git a/gs/base/gdevpbm.c b/gs/devices/gdevpbm.c
index 790345a23..790345a23 100644
--- a/gs/base/gdevpbm.c
+++ b/gs/devices/gdevpbm.c
diff --git a/gs/base/gdevpcfb.c b/gs/devices/gdevpcfb.c
index 6870e78b1..6870e78b1 100644
--- a/gs/base/gdevpcfb.c
+++ b/gs/devices/gdevpcfb.c
diff --git a/gs/base/gdevpcfb.h b/gs/devices/gdevpcfb.h
index 4636dba8b..4636dba8b 100644
--- a/gs/base/gdevpcfb.h
+++ b/gs/devices/gdevpcfb.h
diff --git a/gs/base/gdevpcl.c b/gs/devices/gdevpcl.c
index 754fa0b48..754fa0b48 100644
--- a/gs/base/gdevpcl.c
+++ b/gs/devices/gdevpcl.c
diff --git a/gs/base/gdevpcl.h b/gs/devices/gdevpcl.h
index 65898686e..65898686e 100644
--- a/gs/base/gdevpcl.h
+++ b/gs/devices/gdevpcl.h
diff --git a/gs/base/gdevpcx.c b/gs/devices/gdevpcx.c
index f650326f9..f650326f9 100644
--- a/gs/base/gdevpcx.c
+++ b/gs/devices/gdevpcx.c
diff --git a/gs/base/gdevpe.c b/gs/devices/gdevpe.c
index c7b4f1e1b..c7b4f1e1b 100644
--- a/gs/base/gdevpe.c
+++ b/gs/devices/gdevpe.c
diff --git a/gs/base/gdevperm.c b/gs/devices/gdevperm.c
index 7869ec223..7869ec223 100644
--- a/gs/base/gdevperm.c
+++ b/gs/devices/gdevperm.c
diff --git a/gs/base/gdevphex.c b/gs/devices/gdevphex.c
index ebdef5104..ebdef5104 100644
--- a/gs/base/gdevphex.c
+++ b/gs/devices/gdevphex.c
diff --git a/gs/base/gdevpjet.c b/gs/devices/gdevpjet.c
index adda93a7e..adda93a7e 100644
--- a/gs/base/gdevpjet.c
+++ b/gs/devices/gdevpjet.c
diff --git a/gs/base/gdevplan.c b/gs/devices/gdevplan.c
index 53404d90a..53404d90a 100644
--- a/gs/base/gdevplan.c
+++ b/gs/devices/gdevplan.c
diff --git a/gs/base/gdevplib.c b/gs/devices/gdevplib.c
index e58392242..e58392242 100644
--- a/gs/base/gdevplib.c
+++ b/gs/devices/gdevplib.c
diff --git a/gs/base/gdevplib.h b/gs/devices/gdevplib.h
index 936b3ca37..936b3ca37 100644
--- a/gs/base/gdevplib.h
+++ b/gs/devices/gdevplib.h
diff --git a/gs/base/gdevpm.h b/gs/devices/gdevpm.h
index f67dd7e58..f67dd7e58 100644
--- a/gs/base/gdevpm.h
+++ b/gs/devices/gdevpm.h
diff --git a/gs/base/gdevpng.c b/gs/devices/gdevpng.c
index ed36c7464..ed36c7464 100644
--- a/gs/base/gdevpng.c
+++ b/gs/devices/gdevpng.c
diff --git a/gs/base/gdevpsd.c b/gs/devices/gdevpsd.c
index 2436540c3..2436540c3 100644
--- a/gs/base/gdevpsd.c
+++ b/gs/devices/gdevpsd.c
diff --git a/gs/base/gdevpsim.c b/gs/devices/gdevpsim.c
index f79355c13..f79355c13 100644
--- a/gs/base/gdevpsim.c
+++ b/gs/devices/gdevpsim.c
diff --git a/gs/base/gdevrinkj.c b/gs/devices/gdevrinkj.c
index 5043f43f4..5043f43f4 100644
--- a/gs/base/gdevrinkj.c
+++ b/gs/devices/gdevrinkj.c
diff --git a/gs/base/gdevs3ga.c b/gs/devices/gdevs3ga.c
index 5d79e6a67..5d79e6a67 100644
--- a/gs/base/gdevs3ga.c
+++ b/gs/devices/gdevs3ga.c
diff --git a/gs/base/gdevsco.c b/gs/devices/gdevsco.c
index e1d427f15..e1d427f15 100644
--- a/gs/base/gdevsco.c
+++ b/gs/devices/gdevsco.c
diff --git a/gs/base/gdevsgi.c b/gs/devices/gdevsgi.c
index 3b29f89fd..3b29f89fd 100644
--- a/gs/base/gdevsgi.c
+++ b/gs/devices/gdevsgi.c
diff --git a/gs/base/gdevsgi.h b/gs/devices/gdevsgi.h
index 95bc58368..95bc58368 100644
--- a/gs/base/gdevsgi.h
+++ b/gs/devices/gdevsgi.h
diff --git a/gs/base/gdevsj48.c b/gs/devices/gdevsj48.c
index ea5f8aa76..ea5f8aa76 100644
--- a/gs/base/gdevsj48.c
+++ b/gs/devices/gdevsj48.c
diff --git a/gs/base/gdevsnfb.c b/gs/devices/gdevsnfb.c
index 24bdcb575..24bdcb575 100644
--- a/gs/base/gdevsnfb.c
+++ b/gs/devices/gdevsnfb.c
diff --git a/gs/base/gdevsppr.c b/gs/devices/gdevsppr.c
index 300600f35..300600f35 100644
--- a/gs/base/gdevsppr.c
+++ b/gs/devices/gdevsppr.c
diff --git a/gs/base/gdevstc.c b/gs/devices/gdevstc.c
index 52e09889e..52e09889e 100644
--- a/gs/base/gdevstc.c
+++ b/gs/devices/gdevstc.c
diff --git a/gs/base/gdevstc.h b/gs/devices/gdevstc.h
index a2b730300..a2b730300 100644
--- a/gs/base/gdevstc.h
+++ b/gs/devices/gdevstc.h
diff --git a/gs/base/gdevstc1.c b/gs/devices/gdevstc1.c
index a2241571e..a2241571e 100644
--- a/gs/base/gdevstc1.c
+++ b/gs/devices/gdevstc1.c
diff --git a/gs/base/gdevstc2.c b/gs/devices/gdevstc2.c
index c8cf7532b..c8cf7532b 100644
--- a/gs/base/gdevstc2.c
+++ b/gs/devices/gdevstc2.c
diff --git a/gs/base/gdevstc3.c b/gs/devices/gdevstc3.c
index 1d565d1e0..1d565d1e0 100644
--- a/gs/base/gdevstc3.c
+++ b/gs/devices/gdevstc3.c
diff --git a/gs/base/gdevstc4.c b/gs/devices/gdevstc4.c
index 032065567..032065567 100644
--- a/gs/base/gdevstc4.c
+++ b/gs/devices/gdevstc4.c
diff --git a/gs/base/gdevsun.c b/gs/devices/gdevsun.c
index b3078b189..b3078b189 100644
--- a/gs/base/gdevsun.c
+++ b/gs/devices/gdevsun.c
diff --git a/gs/base/gdevsunr.c b/gs/devices/gdevsunr.c
index 2dca82b23..2dca82b23 100644
--- a/gs/base/gdevsunr.c
+++ b/gs/devices/gdevsunr.c
diff --git a/gs/base/gdevsvga.c b/gs/devices/gdevsvga.c
index 94d9115b5..94d9115b5 100644
--- a/gs/base/gdevsvga.c
+++ b/gs/devices/gdevsvga.c
diff --git a/gs/base/gdevsvga.h b/gs/devices/gdevsvga.h
index 638df432a..638df432a 100644
--- a/gs/base/gdevsvga.h
+++ b/gs/devices/gdevsvga.h
diff --git a/gs/base/gdevtfax.c b/gs/devices/gdevtfax.c
index adf7bc51e..adf7bc51e 100644
--- a/gs/base/gdevtfax.c
+++ b/gs/devices/gdevtfax.c
diff --git a/gs/base/gdevtfax.h b/gs/devices/gdevtfax.h
index a3b26572c..a3b26572c 100644
--- a/gs/base/gdevtfax.h
+++ b/gs/devices/gdevtfax.h
diff --git a/gs/base/gdevtfnx.c b/gs/devices/gdevtfnx.c
index c5ad7abb4..c5ad7abb4 100644
--- a/gs/base/gdevtfnx.c
+++ b/gs/devices/gdevtfnx.c
diff --git a/gs/base/gdevtifs.c b/gs/devices/gdevtifs.c
index d9d0bc8ae..d9d0bc8ae 100644
--- a/gs/base/gdevtifs.c
+++ b/gs/devices/gdevtifs.c
diff --git a/gs/base/gdevtifs.h b/gs/devices/gdevtifs.h
index e095e8bac..e095e8bac 100644
--- a/gs/base/gdevtifs.h
+++ b/gs/devices/gdevtifs.h
diff --git a/gs/base/gdevtknk.c b/gs/devices/gdevtknk.c
index 8f9e150bf..8f9e150bf 100644
--- a/gs/base/gdevtknk.c
+++ b/gs/devices/gdevtknk.c
diff --git a/gs/base/gdevtrac.c b/gs/devices/gdevtrac.c
index d6dd28f04..d6dd28f04 100644
--- a/gs/base/gdevtrac.c
+++ b/gs/devices/gdevtrac.c
diff --git a/gs/base/gdevtsep.c b/gs/devices/gdevtsep.c
index 73a95b938..73a95b938 100644
--- a/gs/base/gdevtsep.c
+++ b/gs/devices/gdevtsep.c
diff --git a/gs/base/gdevupd.c b/gs/devices/gdevupd.c
index db4d85bac..db4d85bac 100644
--- a/gs/base/gdevupd.c
+++ b/gs/devices/gdevupd.c
diff --git a/gs/base/gdevvglb.c b/gs/devices/gdevvglb.c
index 931fafd51..931fafd51 100644
--- a/gs/base/gdevvglb.c
+++ b/gs/devices/gdevvglb.c
diff --git a/gs/base/gdevwddb.c b/gs/devices/gdevwddb.c
index 8ebd5d049..8ebd5d049 100644
--- a/gs/base/gdevwddb.c
+++ b/gs/devices/gdevwddb.c
diff --git a/gs/base/gdevwdib.c b/gs/devices/gdevwdib.c
index d5637288b..d5637288b 100644
--- a/gs/base/gdevwdib.c
+++ b/gs/devices/gdevwdib.c
diff --git a/gs/base/gdevwpr2.c b/gs/devices/gdevwpr2.c
index 5e8ddb1f0..5e8ddb1f0 100644
--- a/gs/base/gdevwpr2.c
+++ b/gs/devices/gdevwpr2.c
diff --git a/gs/base/gdevwprn.c b/gs/devices/gdevwprn.c
index 3c7346669..3c7346669 100644
--- a/gs/base/gdevwprn.c
+++ b/gs/devices/gdevwprn.c
diff --git a/gs/base/gdevx.c b/gs/devices/gdevx.c
index a58fee810..a58fee810 100644
--- a/gs/base/gdevx.c
+++ b/gs/devices/gdevx.c
diff --git a/gs/base/gdevx.h b/gs/devices/gdevx.h
index e1b91590d..e1b91590d 100644
--- a/gs/base/gdevx.h
+++ b/gs/devices/gdevx.h
diff --git a/gs/base/gdevxalt.c b/gs/devices/gdevxalt.c
index 9e3f5b664..9e3f5b664 100644
--- a/gs/base/gdevxalt.c
+++ b/gs/devices/gdevxalt.c
diff --git a/gs/base/gdevxcf.c b/gs/devices/gdevxcf.c
index 5d4933292..5d4933292 100644
--- a/gs/base/gdevxcf.c
+++ b/gs/devices/gdevxcf.c
diff --git a/gs/base/gdevxcmp.c b/gs/devices/gdevxcmp.c
index d91e78dd1..d91e78dd1 100644
--- a/gs/base/gdevxcmp.c
+++ b/gs/devices/gdevxcmp.c
diff --git a/gs/base/gdevxcmp.h b/gs/devices/gdevxcmp.h
index a4411adbd..a4411adbd 100644
--- a/gs/base/gdevxcmp.h
+++ b/gs/devices/gdevxcmp.h
diff --git a/gs/base/gdevxini.c b/gs/devices/gdevxini.c
index f94ccfc4c..f94ccfc4c 100644
--- a/gs/base/gdevxini.c
+++ b/gs/devices/gdevxini.c
diff --git a/gs/base/gdevxres.c b/gs/devices/gdevxres.c
index 6c4412102..6c4412102 100644
--- a/gs/base/gdevxres.c
+++ b/gs/devices/gdevxres.c
diff --git a/gs/base/gxfcopy.c b/gs/devices/gxfcopy.c
index 38159c25e..38159c25e 100644
--- a/gs/base/gxfcopy.c
+++ b/gs/devices/gxfcopy.c
diff --git a/gs/base/gxfcopy.h b/gs/devices/gxfcopy.h
index c5353b6dc..c5353b6dc 100644
--- a/gs/base/gxfcopy.h
+++ b/gs/devices/gxfcopy.h
diff --git a/gs/base/minftrsz.c b/gs/devices/minftrsz.c
index aaaf0ab53..aaaf0ab53 100644
--- a/gs/base/minftrsz.c
+++ b/gs/devices/minftrsz.c
diff --git a/gs/base/minftrsz.h b/gs/devices/minftrsz.h
index e5e020e90..e5e020e90 100644
--- a/gs/base/minftrsz.h
+++ b/gs/devices/minftrsz.h
diff --git a/gs/base/rinkj/evenbetter-rll.c b/gs/devices/rinkj/evenbetter-rll.c
index ee6d8555b..ee6d8555b 100644
--- a/gs/base/rinkj/evenbetter-rll.c
+++ b/gs/devices/rinkj/evenbetter-rll.c
diff --git a/gs/base/rinkj/evenbetter-rll.h b/gs/devices/rinkj/evenbetter-rll.h
index 2f9524863..2f9524863 100644
--- a/gs/base/rinkj/evenbetter-rll.h
+++ b/gs/devices/rinkj/evenbetter-rll.h
diff --git a/gs/base/rinkj/rinkj-byte-stream.c b/gs/devices/rinkj/rinkj-byte-stream.c
index 56286c3a0..56286c3a0 100644
--- a/gs/base/rinkj/rinkj-byte-stream.c
+++ b/gs/devices/rinkj/rinkj-byte-stream.c
diff --git a/gs/base/rinkj/rinkj-byte-stream.h b/gs/devices/rinkj/rinkj-byte-stream.h
index 23b7ede6f..23b7ede6f 100644
--- a/gs/base/rinkj/rinkj-byte-stream.h
+++ b/gs/devices/rinkj/rinkj-byte-stream.h
diff --git a/gs/base/rinkj/rinkj-config.c b/gs/devices/rinkj/rinkj-config.c
index a77bbb57e..a77bbb57e 100644
--- a/gs/base/rinkj/rinkj-config.c
+++ b/gs/devices/rinkj/rinkj-config.c
diff --git a/gs/base/rinkj/rinkj-config.h b/gs/devices/rinkj/rinkj-config.h
index 23bff8f9e..23bff8f9e 100644
--- a/gs/base/rinkj/rinkj-config.h
+++ b/gs/devices/rinkj/rinkj-config.h
diff --git a/gs/base/rinkj/rinkj-device.c b/gs/devices/rinkj/rinkj-device.c
index 0fde3aa12..0fde3aa12 100644
--- a/gs/base/rinkj/rinkj-device.c
+++ b/gs/devices/rinkj/rinkj-device.c
diff --git a/gs/base/rinkj/rinkj-device.h b/gs/devices/rinkj/rinkj-device.h
index 8f4e2f567..8f4e2f567 100644
--- a/gs/base/rinkj/rinkj-device.h
+++ b/gs/devices/rinkj/rinkj-device.h
diff --git a/gs/base/rinkj/rinkj-dither.c b/gs/devices/rinkj/rinkj-dither.c
index 37721018b..37721018b 100644
--- a/gs/base/rinkj/rinkj-dither.c
+++ b/gs/devices/rinkj/rinkj-dither.c
diff --git a/gs/base/rinkj/rinkj-dither.h b/gs/devices/rinkj/rinkj-dither.h
index db3cb1654..db3cb1654 100644
--- a/gs/base/rinkj/rinkj-dither.h
+++ b/gs/devices/rinkj/rinkj-dither.h
diff --git a/gs/base/rinkj/rinkj-epson870.c b/gs/devices/rinkj/rinkj-epson870.c
index 3130b7100..3130b7100 100644
--- a/gs/base/rinkj/rinkj-epson870.c
+++ b/gs/devices/rinkj/rinkj-epson870.c
diff --git a/gs/base/rinkj/rinkj-epson870.h b/gs/devices/rinkj/rinkj-epson870.h
index fd7b048be..fd7b048be 100644
--- a/gs/base/rinkj/rinkj-epson870.h
+++ b/gs/devices/rinkj/rinkj-epson870.h
diff --git a/gs/base/rinkj/rinkj-screen-eb.c b/gs/devices/rinkj/rinkj-screen-eb.c
index 129f85549..129f85549 100644
--- a/gs/base/rinkj/rinkj-screen-eb.c
+++ b/gs/devices/rinkj/rinkj-screen-eb.c
diff --git a/gs/base/rinkj/rinkj-screen-eb.h b/gs/devices/rinkj/rinkj-screen-eb.h
index 6d3cbfb5c..6d3cbfb5c 100644
--- a/gs/base/rinkj/rinkj-screen-eb.h
+++ b/gs/devices/rinkj/rinkj-screen-eb.h
diff --git a/gs/base/gdevagl.c b/gs/devices/vector/gdevagl.c
index 76b0836f7..76b0836f7 100644
--- a/gs/base/gdevagl.c
+++ b/gs/devices/vector/gdevagl.c
diff --git a/gs/base/gdevagl.h b/gs/devices/vector/gdevagl.h
index 02c73f39d..02c73f39d 100644
--- a/gs/base/gdevagl.h
+++ b/gs/devices/vector/gdevagl.h
diff --git a/gs/base/gdevlj56.c b/gs/devices/vector/gdevlj56.c
index 95b1c5613..95b1c5613 100644
--- a/gs/base/gdevlj56.c
+++ b/gs/devices/vector/gdevlj56.c
diff --git a/gs/base/gdevpdf.c b/gs/devices/vector/gdevpdf.c
index 81c55bd18..81c55bd18 100644
--- a/gs/base/gdevpdf.c
+++ b/gs/devices/vector/gdevpdf.c
diff --git a/gs/base/gdevpdfb.c b/gs/devices/vector/gdevpdfb.c
index 0cf50ff40..0cf50ff40 100644
--- a/gs/base/gdevpdfb.c
+++ b/gs/devices/vector/gdevpdfb.c
diff --git a/gs/base/gdevpdfb.h b/gs/devices/vector/gdevpdfb.h
index 13babb957..13babb957 100644
--- a/gs/base/gdevpdfb.h
+++ b/gs/devices/vector/gdevpdfb.h
diff --git a/gs/base/gdevpdfc.c b/gs/devices/vector/gdevpdfc.c
index a14b7cde1..a14b7cde1 100644
--- a/gs/base/gdevpdfc.c
+++ b/gs/devices/vector/gdevpdfc.c
diff --git a/gs/base/gdevpdfc.h b/gs/devices/vector/gdevpdfc.h
index a584767da..a584767da 100644
--- a/gs/base/gdevpdfc.h
+++ b/gs/devices/vector/gdevpdfc.h
diff --git a/gs/base/gdevpdfd.c b/gs/devices/vector/gdevpdfd.c
index f8303d156..f8303d156 100644
--- a/gs/base/gdevpdfd.c
+++ b/gs/devices/vector/gdevpdfd.c
diff --git a/gs/base/gdevpdfe.c b/gs/devices/vector/gdevpdfe.c
index 954656e04..954656e04 100644
--- a/gs/base/gdevpdfe.c
+++ b/gs/devices/vector/gdevpdfe.c
diff --git a/gs/base/gdevpdfg.c b/gs/devices/vector/gdevpdfg.c
index 0bc96811b..0bc96811b 100644
--- a/gs/base/gdevpdfg.c
+++ b/gs/devices/vector/gdevpdfg.c
diff --git a/gs/base/gdevpdfg.h b/gs/devices/vector/gdevpdfg.h
index d45e51e3a..d45e51e3a 100644
--- a/gs/base/gdevpdfg.h
+++ b/gs/devices/vector/gdevpdfg.h
diff --git a/gs/base/gdevpdfi.c b/gs/devices/vector/gdevpdfi.c
index 49b4dc86b..49b4dc86b 100644
--- a/gs/base/gdevpdfi.c
+++ b/gs/devices/vector/gdevpdfi.c
diff --git a/gs/base/gdevpdfj.c b/gs/devices/vector/gdevpdfj.c
index 310abc1e3..310abc1e3 100644
--- a/gs/base/gdevpdfj.c
+++ b/gs/devices/vector/gdevpdfj.c
diff --git a/gs/base/gdevpdfk.c b/gs/devices/vector/gdevpdfk.c
index b54a0d7a3..b54a0d7a3 100644
--- a/gs/base/gdevpdfk.c
+++ b/gs/devices/vector/gdevpdfk.c
diff --git a/gs/base/gdevpdfm.c b/gs/devices/vector/gdevpdfm.c
index 0f12db8c7..0f12db8c7 100644
--- a/gs/base/gdevpdfm.c
+++ b/gs/devices/vector/gdevpdfm.c
diff --git a/gs/base/gdevpdfo.c b/gs/devices/vector/gdevpdfo.c
index 439a9e474..439a9e474 100644
--- a/gs/base/gdevpdfo.c
+++ b/gs/devices/vector/gdevpdfo.c
diff --git a/gs/base/gdevpdfo.h b/gs/devices/vector/gdevpdfo.h
index 4344aa12d..4344aa12d 100644
--- a/gs/base/gdevpdfo.h
+++ b/gs/devices/vector/gdevpdfo.h
diff --git a/gs/base/gdevpdfp.c b/gs/devices/vector/gdevpdfp.c
index 07e9e6013..07e9e6013 100644
--- a/gs/base/gdevpdfp.c
+++ b/gs/devices/vector/gdevpdfp.c
diff --git a/gs/base/gdevpdfr.c b/gs/devices/vector/gdevpdfr.c
index 4e7a217f2..4e7a217f2 100644
--- a/gs/base/gdevpdfr.c
+++ b/gs/devices/vector/gdevpdfr.c
diff --git a/gs/base/gdevpdft.c b/gs/devices/vector/gdevpdft.c
index 9fca8bc70..9fca8bc70 100644
--- a/gs/base/gdevpdft.c
+++ b/gs/devices/vector/gdevpdft.c
diff --git a/gs/base/gdevpdfu.c b/gs/devices/vector/gdevpdfu.c
index f22bb87ea..f22bb87ea 100644
--- a/gs/base/gdevpdfu.c
+++ b/gs/devices/vector/gdevpdfu.c
diff --git a/gs/base/gdevpdfv.c b/gs/devices/vector/gdevpdfv.c
index a81c5d09f..a81c5d09f 100644
--- a/gs/base/gdevpdfv.c
+++ b/gs/devices/vector/gdevpdfv.c
diff --git a/gs/base/gdevpdfx.h b/gs/devices/vector/gdevpdfx.h
index 7a444433a..7a444433a 100644
--- a/gs/base/gdevpdfx.h
+++ b/gs/devices/vector/gdevpdfx.h
diff --git a/gs/base/gdevpdt.c b/gs/devices/vector/gdevpdt.c
index e3e557173..e3e557173 100644
--- a/gs/base/gdevpdt.c
+++ b/gs/devices/vector/gdevpdt.c
diff --git a/gs/base/gdevpdt.h b/gs/devices/vector/gdevpdt.h
index 6a5c0de4e..6a5c0de4e 100644
--- a/gs/base/gdevpdt.h
+++ b/gs/devices/vector/gdevpdt.h
diff --git a/gs/base/gdevpdtb.c b/gs/devices/vector/gdevpdtb.c
index 33f9dc1e8..33f9dc1e8 100644
--- a/gs/base/gdevpdtb.c
+++ b/gs/devices/vector/gdevpdtb.c
diff --git a/gs/base/gdevpdtb.h b/gs/devices/vector/gdevpdtb.h
index 200c02193..200c02193 100644
--- a/gs/base/gdevpdtb.h
+++ b/gs/devices/vector/gdevpdtb.h
diff --git a/gs/base/gdevpdtc.c b/gs/devices/vector/gdevpdtc.c
index 46a808890..46a808890 100644
--- a/gs/base/gdevpdtc.c
+++ b/gs/devices/vector/gdevpdtc.c
diff --git a/gs/base/gdevpdtd.c b/gs/devices/vector/gdevpdtd.c
index cd80e5536..cd80e5536 100644
--- a/gs/base/gdevpdtd.c
+++ b/gs/devices/vector/gdevpdtd.c
diff --git a/gs/base/gdevpdtd.h b/gs/devices/vector/gdevpdtd.h
index 0ad885f3f..0ad885f3f 100644
--- a/gs/base/gdevpdtd.h
+++ b/gs/devices/vector/gdevpdtd.h
diff --git a/gs/base/gdevpdte.c b/gs/devices/vector/gdevpdte.c
index 533d5f0aa..533d5f0aa 100644
--- a/gs/base/gdevpdte.c
+++ b/gs/devices/vector/gdevpdte.c
diff --git a/gs/base/gdevpdtf.c b/gs/devices/vector/gdevpdtf.c
index ea44a5945..ea44a5945 100644
--- a/gs/base/gdevpdtf.c
+++ b/gs/devices/vector/gdevpdtf.c
diff --git a/gs/base/gdevpdtf.h b/gs/devices/vector/gdevpdtf.h
index cb0d5576c..cb0d5576c 100644
--- a/gs/base/gdevpdtf.h
+++ b/gs/devices/vector/gdevpdtf.h
diff --git a/gs/base/gdevpdti.c b/gs/devices/vector/gdevpdti.c
index 8b1c644dc..8b1c644dc 100644
--- a/gs/base/gdevpdti.c
+++ b/gs/devices/vector/gdevpdti.c
diff --git a/gs/base/gdevpdti.h b/gs/devices/vector/gdevpdti.h
index de624a925..de624a925 100644
--- a/gs/base/gdevpdti.h
+++ b/gs/devices/vector/gdevpdti.h
diff --git a/gs/base/gdevpdts.c b/gs/devices/vector/gdevpdts.c
index f9321a3d2..f9321a3d2 100644
--- a/gs/base/gdevpdts.c
+++ b/gs/devices/vector/gdevpdts.c
diff --git a/gs/base/gdevpdts.h b/gs/devices/vector/gdevpdts.h
index 2851a088d..2851a088d 100644
--- a/gs/base/gdevpdts.h
+++ b/gs/devices/vector/gdevpdts.h
diff --git a/gs/base/gdevpdtt.c b/gs/devices/vector/gdevpdtt.c
index ef035cf3b..ef035cf3b 100644
--- a/gs/base/gdevpdtt.c
+++ b/gs/devices/vector/gdevpdtt.c
diff --git a/gs/base/gdevpdtt.h b/gs/devices/vector/gdevpdtt.h
index a02a2e440..a02a2e440 100644
--- a/gs/base/gdevpdtt.h
+++ b/gs/devices/vector/gdevpdtt.h
diff --git a/gs/base/gdevpdtv.c b/gs/devices/vector/gdevpdtv.c
index 599f7516e..599f7516e 100644
--- a/gs/base/gdevpdtv.c
+++ b/gs/devices/vector/gdevpdtv.c
diff --git a/gs/base/gdevpdtv.h b/gs/devices/vector/gdevpdtv.h
index 0c7c3ffb5..0c7c3ffb5 100644
--- a/gs/base/gdevpdtv.h
+++ b/gs/devices/vector/gdevpdtv.h
diff --git a/gs/base/gdevpdtw.c b/gs/devices/vector/gdevpdtw.c
index 62333cb45..62333cb45 100644
--- a/gs/base/gdevpdtw.c
+++ b/gs/devices/vector/gdevpdtw.c
diff --git a/gs/base/gdevpdtw.h b/gs/devices/vector/gdevpdtw.h
index abd4c2641..abd4c2641 100644
--- a/gs/base/gdevpdtw.h
+++ b/gs/devices/vector/gdevpdtw.h
diff --git a/gs/base/gdevpdtx.h b/gs/devices/vector/gdevpdtx.h
index c1ef99f51..c1ef99f51 100644
--- a/gs/base/gdevpdtx.h
+++ b/gs/devices/vector/gdevpdtx.h
diff --git a/gs/base/gdevps.c b/gs/devices/vector/gdevps.c
index b9a6d1929..b9a6d1929 100644
--- a/gs/base/gdevps.c
+++ b/gs/devices/vector/gdevps.c
diff --git a/gs/base/gdevpsdf.h b/gs/devices/vector/gdevpsdf.h
index a71ff70ea..a71ff70ea 100644
--- a/gs/base/gdevpsdf.h
+++ b/gs/devices/vector/gdevpsdf.h
diff --git a/gs/base/gdevpsdi.c b/gs/devices/vector/gdevpsdi.c
index ca33cc0b4..ca33cc0b4 100644
--- a/gs/base/gdevpsdi.c
+++ b/gs/devices/vector/gdevpsdi.c
diff --git a/gs/base/gdevpsdp.c b/gs/devices/vector/gdevpsdp.c
index 1c8946f82..1c8946f82 100644
--- a/gs/base/gdevpsdp.c
+++ b/gs/devices/vector/gdevpsdp.c
diff --git a/gs/base/gdevpsds.c b/gs/devices/vector/gdevpsds.c
index 000b4c2d0..000b4c2d0 100644
--- a/gs/base/gdevpsds.c
+++ b/gs/devices/vector/gdevpsds.c
diff --git a/gs/base/gdevpsds.h b/gs/devices/vector/gdevpsds.h
index 5917863b4..5917863b4 100644
--- a/gs/base/gdevpsds.h
+++ b/gs/devices/vector/gdevpsds.h
diff --git a/gs/base/gdevpsdu.c b/gs/devices/vector/gdevpsdu.c
index 13b70bbc6..13b70bbc6 100644
--- a/gs/base/gdevpsdu.c
+++ b/gs/devices/vector/gdevpsdu.c
diff --git a/gs/base/gdevpsf.h b/gs/devices/vector/gdevpsf.h
index edacfa8a1..edacfa8a1 100644
--- a/gs/base/gdevpsf.h
+++ b/gs/devices/vector/gdevpsf.h
diff --git a/gs/base/gdevpsf1.c b/gs/devices/vector/gdevpsf1.c
index 63642020a..63642020a 100644
--- a/gs/base/gdevpsf1.c
+++ b/gs/devices/vector/gdevpsf1.c
diff --git a/gs/base/gdevpsf2.c b/gs/devices/vector/gdevpsf2.c
index fcc24a5be..fcc24a5be 100644
--- a/gs/base/gdevpsf2.c
+++ b/gs/devices/vector/gdevpsf2.c
diff --git a/gs/base/gdevpsfm.c b/gs/devices/vector/gdevpsfm.c
index 052969a40..052969a40 100644
--- a/gs/base/gdevpsfm.c
+++ b/gs/devices/vector/gdevpsfm.c
diff --git a/gs/base/gdevpsft.c b/gs/devices/vector/gdevpsft.c
index 2b38e19c4..2b38e19c4 100644
--- a/gs/base/gdevpsft.c
+++ b/gs/devices/vector/gdevpsft.c
diff --git a/gs/base/gdevpsfu.c b/gs/devices/vector/gdevpsfu.c
index 291b6d4f4..291b6d4f4 100644
--- a/gs/base/gdevpsfu.c
+++ b/gs/devices/vector/gdevpsfu.c
diff --git a/gs/base/gdevpsfx.c b/gs/devices/vector/gdevpsfx.c
index 0ca8d2243..0ca8d2243 100644
--- a/gs/base/gdevpsfx.c
+++ b/gs/devices/vector/gdevpsfx.c
diff --git a/gs/base/gdevpsu.c b/gs/devices/vector/gdevpsu.c
index 129616686..129616686 100644
--- a/gs/base/gdevpsu.c
+++ b/gs/devices/vector/gdevpsu.c
diff --git a/gs/base/gdevpsu.h b/gs/devices/vector/gdevpsu.h
index 071349bd1..071349bd1 100644
--- a/gs/base/gdevpsu.h
+++ b/gs/devices/vector/gdevpsu.h
diff --git a/gs/base/gdevpx.c b/gs/devices/vector/gdevpx.c
index 864733217..864733217 100644
--- a/gs/base/gdevpx.c
+++ b/gs/devices/vector/gdevpx.c
diff --git a/gs/base/gdevpxut.c b/gs/devices/vector/gdevpxut.c
index b09068b37..b09068b37 100644
--- a/gs/base/gdevpxut.c
+++ b/gs/devices/vector/gdevpxut.c
diff --git a/gs/base/gdevpxut.h b/gs/devices/vector/gdevpxut.h
index 361d3ba03..361d3ba03 100644
--- a/gs/base/gdevpxut.h
+++ b/gs/devices/vector/gdevpxut.h
diff --git a/gs/base/gdevsvg.c b/gs/devices/vector/gdevsvg.c
index 2dc5be08b..2dc5be08b 100644
--- a/gs/base/gdevsvg.c
+++ b/gs/devices/vector/gdevsvg.c
diff --git a/gs/base/gdevtxtw.c b/gs/devices/vector/gdevtxtw.c
index b20b8d18e..b20b8d18e 100644
--- a/gs/base/gdevtxtw.c
+++ b/gs/devices/vector/gdevtxtw.c
diff --git a/gs/base/gdevxps.c b/gs/devices/vector/gdevxps.c
index cf5e310fa..cf5e310fa 100644
--- a/gs/base/gdevxps.c
+++ b/gs/devices/vector/gdevxps.c
diff --git a/gs/base/opdfread.h b/gs/devices/vector/opdfread.h
index 8f5638525..8f5638525 100644
--- a/gs/base/opdfread.h
+++ b/gs/devices/vector/opdfread.h
diff --git a/gs/base/whitelst.c b/gs/devices/vector/whitelst.c
index b018a050d..b018a050d 100644
--- a/gs/base/whitelst.c
+++ b/gs/devices/vector/whitelst.c
diff --git a/gs/base/whitelst.h b/gs/devices/vector/whitelst.h
index f2235a5a8..f2235a5a8 100644
--- a/gs/base/whitelst.h
+++ b/gs/devices/vector/whitelst.h
diff --git a/gs/psi/int.mak b/gs/psi/int.mak
index 92f296e32..1a601b77a 100644
--- a/gs/psi/int.mak
+++ b/gs/psi/int.mak
@@ -1781,7 +1781,7 @@ $(PSOBJ)zfapi.$(OBJ) : $(PSSRC)zfapi.c $(OP) $(math__h) $(memory__h) $(string__h
 $(stat__h)\
 $(gp_h) $(gscoord_h) $(gscrypt1_h) $(gsfont_h) $(gspaint_h) $(gspath_h)\
 $(gxchar_h) $(gxchrout_h) $(gximask_h) $(gxdevice_h) $(gxfcache_h) $(gxfcid_h)\
- $(gxfont_h) $(gxfont1_h) $(gxpath_h) $(gzstate_h) $(gdevpsf_h)\
+ $(gxfont_h) $(gxfont1_h) $(gxpath_h) $(gzstate_h) \
 $(bfont_h) $(dstack_h) $(files_h) \
 $(ichar_h) $(idict_h) $(iddict_h) $(idparam_h) $(iname_h) $(ifont_h)\
 $(icid_h) $(igstate_h) $(icharout_h) $(ifapi_h) $(iplugin_h) \
@@ -1842,15 +1842,15 @@ $(PSOBJ)icontext.$(OBJ) : $(PSSRC)icontext.c $(GH)\
 $(stream_h)
        $(PSCC) $(PSO_)icontext.$(OBJ) $(C_) $(PSSRC)icontext.c
-gdevdsp_h=$(GLSRC)gdevdsp.h
+gdevdsp_h=$(DEVSRCDIR)$(D)gdevdsp.h
-gdevdsp2_h=$(GLSRC)gdevdsp2.h
+gdevdsp2_h=$(DEVSRCDIR)$(D)gdevdsp2.h
 $(PSOBJ)idisp.$(OBJ) : $(PSSRC)idisp.c $(OP) $(stdio__h) $(gp_h)\
 $(stdpre_h) $(gscdefs_h) $(gsdevice_h) $(gsmemory_h) $(gstypes_h)\
 $(iapi_h) $(iref_h)\
 $(imain_h) $(iminst_h) $(idisp_h) $(ostack_h)\
 $(gx_h) $(gxdevice_h) $(gxdevmem_h) $(gdevdsp_h) $(gdevdsp2_h)
-        $(PSCC) $(PSO_)idisp.$(OBJ) $(C_) $(PSSRC)idisp.c
+        $(PSCC) $(I_)$(DEVSRCDIR) $(PSO_)idisp.$(OBJ) $(C_) $(PSSRC)idisp.c
 $(PSOBJ)imainarg.$(OBJ) : $(PSSRC)imainarg.c $(GH)\
 $(ctype__h) $(memory__h) $(string__h)\
diff --git a/gs/psi/msvc.mak b/gs/psi/msvc.mak
index b9a1fd0df..13d2ee3da 100644
--- a/gs/psi/msvc.mak
+++ b/gs/psi/msvc.mak
@@ -118,9 +118,19 @@ GLSRCDIR=.\base
 !ifndef GLGENDIR
 GLGENDIR=$(DEFAULT_OBJ_DIR)
 !endif
+!ifndef DEVSRCDIR
+DEVSRCDIR=.\devices
+!endif
 !ifndef GLOBJDIR
 GLOBJDIR=$(DEFAULT_OBJ_DIR)
 !endif
+!ifndef DEVGENDIR
+DEVGENDIR=$(DEFAULT_OBJ_DIR)
+!endif
+!ifndef DEVOBJDIR
+DEVOBJDIR=$(DEFAULT_OBJ_DIR)
+!endif
 !ifndef PSSRCDIR
 PSSRCDIR=.\psi
 !endif
diff --git a/gs/psi/winint.mak b/gs/psi/winint.mak
index 435580da8..c7a27598c 100644
--- a/gs/psi/winint.mak
+++ b/gs/psi/winint.mak
@@ -43,7 +43,7 @@ GLCPP=$(CPP) $(CO) $(I_)$(GLI_)$(_I)
 # Define the compilation rule for Windows interpreter code.
 # This requires PS*_ to be defined, so it has to come after int.mak.
-PSCCWIN=$(CC_WX) $(CCWINFLAGS) $(I_)$(PSI_)$(_I) $(PSF_)
+PSCCWIN=$(CC_WX) $(CCWINFLAGS) $(I_)$(PSI_)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(PSF_)
 # Define the name of this makefile.
 WININT_MAK=$(PSSRC)winint.mak
diff --git a/gs/psi/zfapi.c b/gs/psi/zfapi.c
index b12cd32db..7cb0d8530 100644
--- a/gs/psi/zfapi.c
+++ b/gs/psi/zfapi.c
@@ -53,7 +53,7 @@
 #include "iplugin.h"
 #include "store.h"
 #include "gzstate.h"
-#include "gdevpsf.h"
+/* #include "gdevpsf.h" */
 #include "stream.h"             /* for files.h */
 #include "gscrypt1.h"
 #include "gxfcid.h"
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index 6b0b806a8..866bf4257 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -29,6 +29,7 @@ PGGENDIR?=./pgobj
 # The sources are taken from these directories:
 GLSRCDIR?=../gs/base
+DEVSRCDIR?=../gs/devices
 PCLSRCDIR?=../pcl
 PLSRCDIR?=../pl
 PXLSRCDIR?=../pxl
@@ -107,6 +108,8 @@ GS?=
 # you can define this here, although normally you won't need to do this:
 GLGENDIR?=$(GENDIR)
 GLOBJDIR?=$(GENDIR)
+DEVGENDIR?=$(GENDIR)
+DEVOBJDIR?=$(GENDIR)
 PLGENDIR?=$(GENDIR)
 PLOBJDIR?=$(GENDIR)
 PXLGENDIR?=$(GENDIR)
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index c0bde175c..1362249e1 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -87,10 +87,19 @@ GENDIR=$(GENDIR)64
 AUXDIR=$(GENDIR)\aux_
 !endif
+!ifndef DEVGENDIR
+DEVGENDIR=$(GENDIR)
+!endif
 # The sources are taken from these directories:
 !ifndef GLSRCDIR
 GLSRCDIR=..\gs\base
 !endif
+!ifndef DEVSRCDIR
+DEVSRCDIR=..\gs\devices
+!endif
 !ifndef PCLSRCDIR
 PCLSRCDIR=..\pcl
 !endif
@@ -195,6 +204,14 @@ GLGENDIR=$(GENDIR)
 GLOBJDIR=$(GENDIR)
 !endif
+!ifndef DEVGENDIR
+DEVGENDIR=$(GENDIR)
+!endif
+!ifndef DEVOBJDIR
+DEVOBJDIR=$(GENDIR)
+!endif
 # Not strictly speaking necessary, but saves a stray mkdir later on.
 !ifndef BINDIR
 BINDIR=$(GENDIR)
@@ -501,7 +518,7 @@ config-clean: pl.config-clean pxl.config-clean
 # Define the compilation rule for Windows interpreter code.
-PLATCCC=$(CC_WX) $(CCWINFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I)
+PLATCCC=$(CC_WX) $(CCWINFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I)
 # Subsystems
 !include $(PLSRCDIR)\pl.mak
@@ -513,7 +530,7 @@ PLATCCC=$(CC_WX) $(CCWINFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I)
 #### Note PLCCC brings /Za, which can't compile Windows headers, so we define and use PLCCC_W instead. :
 CC_W=$(CC_WX) $(COMPILE_FULL_OPTIMIZED) $(ZM)
-PLCCC_W=$(CC_W) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
+PLCCC_W=$(CC_W) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
 $(PLOBJDIR)\dwtrace.$(OBJ): $(GLSRC)dwtrace.c $(AK)\
 $(dwimg_h) $(dwtrace_h)\
diff --git a/pl/pl.mak b/pl/pl.mak
index 3c52560b3..d64edf850 100644
--- a/pl/pl.mak
+++ b/pl/pl.mak
@@ -25,7 +25,7 @@ PLOBJ=$(PLOBJDIR)$(D)
 PLO_=$(O_)$(PLOBJ)
 GLGEN=$(GLGENDIR)$(D)
-PLCCC=$(CC_) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
+PLCCC=$(CC_) $(I_)$(PLSRCDIR)$(_I) $(I_)$(GLSRCDIR)$(_I) $(I_)$(DEVSRCDIR)$(_I) $(I_)$(GLGENDIR)$(_I) $(C_)
 # Define the name of this makefile.
 PL_MAK=$(PLSRC)pl.mak
diff --git a/svg/svg_gcc.mak b/svg/svg_gcc.mak
index 9bc7e024e..c0129f7c6 100644
--- a/svg/svg_gcc.mak
+++ b/svg/svg_gcc.mak
@@ -56,6 +56,8 @@ PLPLATFORM?=
 # you can define this here, although normally you won't need to do this:
 GLGENDIR?=$(GENDIR)
 GLOBJDIR?=$(GENDIR)
+DEVGENDIR?=$(GENDIR)
+DEVOBJDIR?=$(GENDIR)
 PSGENDIR?=$(GENDIR)
 PSOBJDIR?=$(GENDIR)
 JGENDIR?=$(GENDIR)
diff --git a/svg/svg_msvc.mak b/svg/svg_msvc.mak
index 2af00e1fc..e179c4b7c 100644
--- a/svg/svg_msvc.mak
+++ b/svg/svg_msvc.mak
@@ -130,6 +130,14 @@ GLGENDIR=$(GENDIR)
 GLOBJDIR=$(GENDIR)
 !endif
+!ifndef DEVGENDIR
+DEVGENDIR=$(GENDIR)
+!endif
+!ifndef DEVOBJDIR
+DEVOBJDIR=$(GENDIR)
+!endif
 !ifndef PSGENDIR
 PSGENDIR=$(GENDIR)
 !endif
diff --git a/xps/xps_gcc.mak b/xps/xps_gcc.mak
index c1be04b58..a83c661ab 100644
--- a/xps/xps_gcc.mak
+++ b/xps/xps_gcc.mak
@@ -60,6 +60,8 @@ PLPLATFORM?=
 # you can define this here, although normally you won't need to do this:
 GLGENDIR?=$(GENDIR)
 GLOBJDIR?=$(GENDIR)
+DEVGENDIR?=$(GENDIR)
+DEVOBJDIR?=$(GENDIR)
 PSGENDIR?=$(GENDIR)
 PSOBJDIR?=$(GENDIR)
 JGENDIR?=$(GENDIR)
diff --git a/xps/xps_msvc.mak b/xps/xps_msvc.mak
index b4378f2aa..fddfbec44 100644
--- a/xps/xps_msvc.mak
+++ b/xps/xps_msvc.mak
@@ -184,6 +184,14 @@ GLGENDIR=$(GENDIR)
 GLOBJDIR=$(GENDIR)
 !endif
+!ifndef DEVGENDIR
+DEVGENDIR=$(GENDIR)
+!endif
+!ifndef DEVOBJDIR
+DEVOBJDIR=$(GENDIR)
+!endif
 !ifndef PSGENDIR
 PSGENDIR=$(GENDIR)
 !endif