diff --git a/cde/configure.ac b/cde/configure.ac
index 171c70b1f..2b0ad349f 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -629,6 +629,12 @@ programs/util/dttypes/Makefile
 
 programs/dtopen/Makefile
 
+programs/dtdocbook/Makefile
+programs/dtdocbook/lib/Makefile
+programs/dtdocbook/lib/tptregexp/Makefile
+programs/dtdocbook/instant/Makefile
+programs/dtdocbook/xlate_locale/Makefile
+
 programs/localized/Makefile
 programs/localized/util/Makefile
 programs/localized/C/Makefile
diff --git a/cde/m4/tcl.m4 b/cde/m4/tcl.m4
index e87d49830..55538c5a5 100644
--- a/cde/m4/tcl.m4
+++ b/cde/m4/tcl.m4
@@ -333,6 +333,8 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
     eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
     eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
 
+    eval "TCL_INCLUDE_SPEC=\"${TCL_INCLUDE_SPEC}\""
+
     AC_SUBST(TCL_VERSION)
     AC_SUBST(TCL_PATCH_LEVEL)
     AC_SUBST(TCL_BIN_DIR)
@@ -341,6 +343,7 @@ AC_DEFUN([SC_LOAD_TCLCONFIG], [
     AC_SUBST(TCL_LIB_FILE)
     AC_SUBST(TCL_LIB_FLAG)
     AC_SUBST(TCL_LIB_SPEC)
+    AC_SUBST(TCL_INCLUDE_SPEC)
 
     AC_SUBST(TCL_STUB_LIB_FILE)
     AC_SUBST(TCL_STUB_LIB_FLAG)
diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am
index dedd1ebbd..74ead60c8 100644
--- a/cde/programs/Makefile.am
+++ b/cde/programs/Makefile.am
@@ -5,6 +5,6 @@ SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \
 	dtaction dtspcd dtscreen dtcm dtsearchpath dtappbuilder palettes \
 	dtappintegrate dtprintegrate dtconfig dtcreate dtprintinfo fontaliases \
 	dtdspmsg dtimsstart dtpdm dtsr dtpdmd types \
-	tttypes util dtopen localized dthelp nsgmls
+	tttypes util dtopen localized dthelp nsgmls dtdocbook
 
-# NOTYET = dtksh dtdocbook dtinfo ttsnoop
+# NOTYET = dtksh dtinfo ttsnoop
diff --git a/cde/programs/dtdocbook/Makefile.am b/cde/programs/dtdocbook/Makefile.am
index 249ac8eba..1a80dee71 100644
--- a/cde/programs/dtdocbook/Makefile.am
+++ b/cde/programs/dtdocbook/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = doc2sdl lib instant xlate_locale
+SUBDIRS = lib instant xlate_locale
diff --git a/cde/programs/dtdocbook/doc2sdl/Makefile.am b/cde/programs/dtdocbook/doc2sdl/Makefile.am
deleted file mode 100644
index 07e7b5062..000000000
--- a/cde/programs/dtdocbook/doc2sdl/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILE = Makefile.in
-
-SUBDIRS = SGML
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/Imakefile b/cde/programs/dtdocbook/doc2sdl/SGML/Imakefile
deleted file mode 100644
index 2d4000cf5..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/09/23 09:29:42 rws $
-
-LinkSourceFile(dtinfo.af,$(CDESRC)/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML)
-LinkSourceFile(docbook.dtd,$(CDESRC)/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML)
-
-#if !UseNSGMLS
-XCOMM symlinks used by dtdocbook when run from the build tree
-XCOMM really ugly but will do the trick until nsgmls is used...
-
-includes:: clean
-	$(LN) dtinfo.af "-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN"
-	$(LN) docbook.dtd "-%%HaL_and_O'Reilly%%DTD_DocBook%%EN"
-	$(LN) iso-lat1.gml "ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN"
-	$(LN) iso-lat2.gml "ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN"
-	$(LN) iso-box.gml "ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN"
-	$(LN) iso-dia.gml "ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN"
-	$(LN) iso-tech.gml "ISO_8879-1986%%ENTITIES_General_Technical%%EN"
-	$(LN) iso-grk1.gml "ISO_8879-1986%%ENTITIES_Greek_Letters%%EN"
-	$(LN) iso-grk3.gml "ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN"
-	$(LN) iso-num.gml "ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN"
-	$(LN) iso-pub.gml "ISO_8879-1986%%ENTITIES_Publishing%%EN"
-
-clean::
-	$(RM) -- "-%%Common_Desktop_Environment%%ENTITIES_DtInfo_Architectural_Forms%%EN"
-	$(RM) -- "-%%HaL_and_O'Reilly%%DTD_DocBook%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Added_Latin_1%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Added_Latin_2%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Box_and_Line_Drawing%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Diacritical_Marks%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_General_Technical%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Greek_Letters%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Greek_Symbols%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Numeric_and_Special_Graphic%%EN"
-	$(RM) "ISO_8879-1986%%ENTITIES_Publishing%%EN"
-#endif /* !UseNSGMLS */
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/Makefile.am b/cde/programs/dtdocbook/doc2sdl/SGML/Makefile.am
deleted file mode 100644
index 057f4967c..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-all::
-	$(LN_S) dtinfo.af $(srcdir)/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML
-	$(LN_S) docbook.dtd $(srcdir)/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/catalog b/cde/programs/dtdocbook/doc2sdl/SGML/catalog
deleted file mode 100644
index fe295a2fd..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/catalog
+++ /dev/null
@@ -1,15 +0,0 @@
-SGMLDECL ../docbook.sgml
-
-PUBLIC "-//HaL and O'Reilly//DTD DocBook//EN" ./docbook.dtd
-
-PUBLIC "-//Common Desktop Environment//ENTITIES DtInfo Architectural Forms//EN"
-    ./dtinfo.af
-
-PUBLIC "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN" ./iso-num.gml
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 1//EN"        ./iso-lat1.gml
-PUBLIC "ISO 8879-1986//ENTITIES Added Latin 2//EN"        ./iso-lat2.gml
-PUBLIC "ISO 8879-1986//ENTITIES Box and Line Drawing//EN" ./iso-box.gml
-PUBLIC "ISO 8879-1986//ENTITIES Diacritical Marks//EN"    ./iso-dia.gml
-PUBLIC "ISO 8879-1986//ENTITIES General Technical//EN"    ./iso-tech.gml
-PUBLIC "ISO 8879-1986//ENTITIES Greek Symbols//EN"        ./iso-grk3.gml
-PUBLIC "ISO 8879-1986//ENTITIES Publishing//EN"           ./iso-pub.gml
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-box.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-box.gml
deleted file mode 100644
index 36d9db0c9..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-box.gml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- $XConsortium: iso-box.gml /main/3 1996/06/19 17:12:11 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISObox PUBLIC
-       "ISO 8879-1986//ENTITIES Box and Line Drawing//EN">
-     %ISObox;
--->
-<!-- All names are in the form: box1234, where:
-    box = constants that identify a box drawing entity.
-    1&2 = v, V, u, U, d, D, Ud, or uD, as follows:
-      v = vertical line for full height.
-      u = upper half of vertical line.
-      d = downward (lower) half of vertical line.
-    3&4 = h, H, l, L, r, R, Lr, or lR, as follows:
-      h = horizontal line for full width.
-      l = left half of horizontal line.
-      r = right half of horizontal line.
-    In all cases, an upper-case letter means a double or heavy line.
--->
-<!ENTITY boxh   SDATA "[boxh  ]"--horizontal line -->
-<!ENTITY boxv   SDATA "[boxv  ]"--vertical line-->
-<!ENTITY boxur  SDATA "[boxur ]"--upper right quadrant-->
-<!ENTITY boxul  SDATA "[boxul ]"--upper left quadrant-->
-<!ENTITY boxdl  SDATA "[boxdl ]"--lower left quadrant-->
-<!ENTITY boxdr  SDATA "[boxdr ]"--lower right quadrant-->
-<!ENTITY boxvr  SDATA "[boxvr ]"--upper and lower right quadrants-->
-<!ENTITY boxhu  SDATA "[boxhu ]"--upper left and right quadrants-->
-<!ENTITY boxvl  SDATA "[boxvl ]"--upper and lower left quadrants-->
-<!ENTITY boxhd  SDATA "[boxhd ]"--lower left and right quadrants-->
-<!ENTITY boxvh  SDATA "[boxvh ]"--all four quadrants-->
-<!ENTITY boxvR  SDATA "[boxvR ]"--upper and lower right quadrants-->
-<!ENTITY boxhU  SDATA "[boxhU ]"--upper left and right quadrants-->
-<!ENTITY boxvL  SDATA "[boxvL ]"--upper and lower left quadrants-->
-<!ENTITY boxhD  SDATA "[boxhD ]"--lower left and right quadrants-->
-<!ENTITY boxvH  SDATA "[boxvH ]"--all four quadrants-->
-<!ENTITY boxH   SDATA "[boxH  ]"--horizontal line-->
-<!ENTITY boxV   SDATA "[boxV  ]"--vertical line-->
-<!ENTITY boxUR  SDATA "[boxUR ]"--upper right quadrant-->
-<!ENTITY boxUL  SDATA "[boxUL ]"--upper left quadrant-->
-<!ENTITY boxDL  SDATA "[boxDL ]"--lower left quadrant-->
-<!ENTITY boxDR  SDATA "[boxDR ]"--lower right quadrant-->
-<!ENTITY boxVR  SDATA "[boxVR ]"--upper and lower right quadrants-->
-<!ENTITY boxHU  SDATA "[boxHU ]"--upper left and right quadrants-->
-<!ENTITY boxVL  SDATA "[boxVL ]"--upper and lower left quadrants-->
-<!ENTITY boxHD  SDATA "[boxHD ]"--lower left and right quadrants-->
-<!ENTITY boxVH  SDATA "[boxVH ]"--all four quadrants-->
-<!ENTITY boxVr  SDATA "[boxVr ]"--upper and lower right quadrants-->
-<!ENTITY boxHu  SDATA "[boxHu ]"--upper left and right quadrants-->
-<!ENTITY boxVl  SDATA "[boxVl ]"--upper and lower left quadrants-->
-<!ENTITY boxHd  SDATA "[boxHd ]"--lower left and right quadrants-->
-<!ENTITY boxVh  SDATA "[boxVh ]"--all four quadrants-->
-<!ENTITY boxuR  SDATA "[boxuR ]"--upper right quadrant-->
-<!ENTITY boxUl  SDATA "[boxUl ]"--upper left quadrant-->
-<!ENTITY boxdL  SDATA "[boxdL ]"--lower left quadrant-->
-<!ENTITY boxDr  SDATA "[boxDr ]"--lower right quadrant-->
-<!ENTITY boxUr  SDATA "[boxUr ]"--upper right quadrant-->
-<!ENTITY boxuL  SDATA "[boxuL ]"--upper left quadrant-->
-<!ENTITY boxDl  SDATA "[boxDl ]"--lower left quadrant-->
-<!ENTITY boxdR  SDATA "[boxdR ]"--lower right quadrant-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-dia.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-dia.gml
deleted file mode 100644
index 043c12bf9..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-dia.gml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- $XConsortium: iso-dia.gml /main/3 1996/06/19 17:12:15 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOdia PUBLIC
-       "ISO 8879-1986//ENTITIES Diacritical Marks//EN">
-     %ISOdia;
--->
-<!ENTITY acute  SDATA "[acute ]"--=acute accent-->
-<!ENTITY breve  SDATA "[breve ]"--=breve-->
-<!ENTITY caron  SDATA "[caron ]"--=caron-->
-<!ENTITY cedil  SDATA "[cedil ]"--=cedilla-->
-<!ENTITY circ   SDATA "[circ  ]"--=circumflex accent-->
-<!ENTITY dblac  SDATA "[dblac ]"--=double acute accent-->
-<!ENTITY die    SDATA "[die   ]"--=dieresis-->
-<!ENTITY dot    SDATA "[dot   ]"--=dot above-->
-<!ENTITY grave  SDATA "[grave ]"--=grave accent-->
-<!ENTITY macr   SDATA "[macr  ]"--=macron-->
-<!ENTITY ogon   SDATA "[ogon  ]"--=ogonek-->
-<!ENTITY ring   SDATA "[ring  ]"--=ring-->
-<!ENTITY tilde  SDATA "[tilde ]"--=tilde-->
-<!ENTITY uml    SDATA "[uml   ]"--=umlaut mark-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk1.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk1.gml
deleted file mode 100644
index 40f42a51f..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk1.gml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- $XConsortium: iso-grk1.gml /main/3 1996/06/19 17:12:20 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOgrk1 PUBLIC
-       "ISO 8879-1986//ENTITIES Greek Letters//EN">
-     %ISOgrk1;
--->
-<!ENTITY agr    SDATA "[agr   ]"--=small alpha, Greek-->
-<!ENTITY Agr    SDATA "[Agr   ]"--=capital Alpha, Greek-->
-<!ENTITY bgr    SDATA "[bgr   ]"--=small beta, Greek-->
-<!ENTITY Bgr    SDATA "[Bgr   ]"--=capital Beta, Greek-->
-<!ENTITY ggr    SDATA "[ggr   ]"--=small gamma, Greek-->
-<!ENTITY Ggr    SDATA "[Ggr   ]"--=capital Gamma, Greek-->
-<!ENTITY dgr    SDATA "[dgr   ]"--=small delta, Greek-->
-<!ENTITY Dgr    SDATA "[Dgr   ]"--=capital Delta, Greek-->
-<!ENTITY egr    SDATA "[egr   ]"--=small epsilon, Greek-->
-<!ENTITY Egr    SDATA "[Egr   ]"--=capital Epsilon, Greek-->
-<!ENTITY zgr    SDATA "[zgr   ]"--=small zeta, Greek-->
-<!ENTITY Zgr    SDATA "[Zgr   ]"--=capital Zeta, Greek-->
-<!ENTITY eegr   SDATA "[eegr  ]"--=small eta, Greek-->
-<!ENTITY EEgr   SDATA "[EEgr  ]"--=capital Eta, Greek-->
-<!ENTITY thgr   SDATA "[thgr  ]"--=small theta, Greek-->
-<!ENTITY THgr   SDATA "[THgr  ]"--=capital Theta, Greek-->
-<!ENTITY igr    SDATA "[igr   ]"--=small iota, Greek-->
-<!ENTITY Igr    SDATA "[Igr   ]"--=capital Iota, Greek-->
-<!ENTITY kgr    SDATA "[kgr   ]"--=small kappa, Greek-->
-<!ENTITY Kgr    SDATA "[Kgr   ]"--=capital Kappa, Greek-->
-<!ENTITY lgr    SDATA "[lgr   ]"--=small lambda, Greek-->
-<!ENTITY Lgr    SDATA "[Lgr   ]"--=capital Lambda, Greek-->
-<!ENTITY mgr    SDATA "[mgr   ]"--=small mu, Greek-->
-<!ENTITY Mgr    SDATA "[Mgr   ]"--=capital Mu, Greek-->
-<!ENTITY ngr    SDATA "[ngr   ]"--=small nu, Greek-->
-<!ENTITY Ngr    SDATA "[Ngr   ]"--=capital Nu, Greek-->
-<!ENTITY xgr    SDATA "[xgr   ]"--=small xi, Greek-->
-<!ENTITY Xgr    SDATA "[Xgr   ]"--=capital Xi, Greek-->
-<!ENTITY ogr    SDATA "[ogr   ]"--=small omicron, Greek-->
-<!ENTITY Ogr    SDATA "[Ogr   ]"--=capital Omicron, Greek-->
-<!ENTITY pgr    SDATA "[pgr   ]"--=small pi, Greek-->
-<!ENTITY Pgr    SDATA "[Pgr   ]"--=capital Pi, Greek-->
-<!ENTITY rgr    SDATA "[rgr   ]"--=small rho, Greek-->
-<!ENTITY Rgr    SDATA "[Rgr   ]"--=capital Rho, Greek-->
-<!ENTITY sgr    SDATA "[sgr   ]"--=small sigma, Greek-->
-<!ENTITY Sgr    SDATA "[Sgr   ]"--=capital Sigma, Greek-->
-<!ENTITY sfgr   SDATA "[sfgr  ]"--=final small sigma, Greek-->
-<!ENTITY tgr    SDATA "[tgr   ]"--=small tau, Greek-->
-<!ENTITY Tgr    SDATA "[Tgr   ]"--=capital Tau, Greek-->
-<!ENTITY ugr    SDATA "[ugr   ]"--=small upsilon, Greek-->
-<!ENTITY Ugr    SDATA "[Ugr   ]"--=capital Upsilon, Greek-->
-<!ENTITY phgr   SDATA "[phgr  ]"--=small phi, Greek-->
-<!ENTITY PHgr   SDATA "[PHgr  ]"--=capital Phi, Greek-->
-<!ENTITY khgr   SDATA "[khgr  ]"--=small chi, Greek-->
-<!ENTITY KHgr   SDATA "[KHgr  ]"--=capital Chi, Greek-->
-<!ENTITY psgr   SDATA "[psgr  ]"--=small psi, Greek-->
-<!ENTITY PSgr   SDATA "[PSgr  ]"--=capital Psi, Greek-->
-<!ENTITY ohgr   SDATA "[ohgr  ]"--=small omega, Greek-->
-<!ENTITY OHgr   SDATA "[OHgr  ]"--=capital Omega, Greek-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk3.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk3.gml
deleted file mode 100644
index 10fbc2253..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-grk3.gml
+++ /dev/null
@@ -1,54 +0,0 @@
-<!-- $XConsortium: iso-grk3.gml /main/3 1996/06/19 17:12:24 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOgrk3 PUBLIC
-       "ISO 8879-1986//ENTITIES Greek Symbols//EN">
-     %ISOgrk3;
--->
-<!ENTITY alpha    SDATA "[alpha ]"--=small alpha, Greek-->
-<!ENTITY beta     SDATA "[beta  ]"--=small beta, Greek-->
-<!ENTITY gamma    SDATA "[gamma ]"--=small gamma, Greek-->
-<!ENTITY Gamma    SDATA "[Gamma ]"--=capital Gamma, Greek-->
-<!ENTITY gammad   SDATA "[gammad]"--/digamma-->
-<!ENTITY delta    SDATA "[delta ]"--=small delta, Greek-->
-<!ENTITY Delta    SDATA "[Delta ]"--=capital Delta, Greek-->
-<!ENTITY epsi     SDATA "[epsi  ]"--=small epsilon, Greek-->
-<!ENTITY epsiv    SDATA "[epsiv ]"--/varepsilon-->
-<!ENTITY epsis    SDATA "[epsis ]"--/straightepsilon-->
-<!ENTITY zeta     SDATA "[zeta  ]"--=small zeta, Greek-->
-<!ENTITY eta      SDATA "[eta   ]"--=small eta, Greek-->
-<!ENTITY thetas   SDATA "[thetas]"--straight theta-->
-<!ENTITY Theta    SDATA "[Theta ]"--=capital Theta, Greek-->
-<!ENTITY thetav   SDATA "[thetav]"--/vartheta - curly or open theta-->
-<!ENTITY iota     SDATA "[iota  ]"--=small iota, Greek-->
-<!ENTITY kappa    SDATA "[kappa ]"--=small kappa, Greek-->
-<!ENTITY kappav   SDATA "[kappav]"--/varkappa-->
-<!ENTITY lambda   SDATA "[lambda]"--=small lambda, Greek-->
-<!ENTITY Lambda   SDATA "[Lambda]"--=capital Lambda, Greek-->
-<!ENTITY mu       SDATA "[mu    ]"--=small mu, Greek-->
-<!ENTITY nu       SDATA "[nu    ]"--=small nu, Greek-->
-<!ENTITY xi       SDATA "[xi    ]"--=small xi, Greek-->
-<!ENTITY Xi       SDATA "[Xi    ]"--=capital Xi, Greek-->
-<!ENTITY pi       SDATA "[pi    ]"--=small pi, Greek-->
-<!ENTITY piv      SDATA "[piv   ]"--/varpi-->
-<!ENTITY Pi       SDATA "[Pi    ]"--=capital Pi, Greek-->
-<!ENTITY rho      SDATA "[rho   ]"--=small rho, Greek-->
-<!ENTITY rhov     SDATA "[rhov  ]"--/varrho-->
-<!ENTITY sigma    SDATA "[sigma ]"--=small sigma, Greek-->
-<!ENTITY Sigma    SDATA "[Sigma ]"--=capital Sigma, Greek-->
-<!ENTITY sigmav   SDATA "[sigmav]"--/varsigma-->
-<!ENTITY tau      SDATA "[tau   ]"--=small tau, Greek-->
-<!ENTITY upsi     SDATA "[upsi  ]"--=small upsilon, Greek-->
-<!ENTITY Upsi     SDATA "[Upsi  ]"--=capital Upsilon, Greek-->
-<!ENTITY phis     SDATA "[phis  ]"--/straightphi - straight phi-->
-<!ENTITY Phi      SDATA "[Phi   ]"--=capital Phi, Greek-->
-<!ENTITY phiv     SDATA "[phiv  ]"--/varphi - curly or open phi-->
-<!ENTITY chi      SDATA "[chi   ]"--=small chi, Greek-->
-<!ENTITY psi      SDATA "[psi   ]"--=small psi, Greek-->
-<!ENTITY Psi      SDATA "[Psi   ]"--=capital Psi, Greek-->
-<!ENTITY omega    SDATA "[omega ]"--=small omega, Greek-->
-<!ENTITY Omega    SDATA "[Omega ]"--=capital Omega, Greek-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat1.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat1.gml
deleted file mode 100644
index ba2df0bc6..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat1.gml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- $XConsortium: iso-lat1.gml /main/3 1996/06/19 17:12:28 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOlat1 PUBLIC
-       "ISO 8879-1986//ENTITIES Added Latin 1//EN">
-     %ISOlat1;
--->
-<!ENTITY aacute SDATA "[aacute]"--=small a, acute accent-->
-<!ENTITY Aacute SDATA "[Aacute]"--=capital A, acute accent-->
-<!ENTITY acirc  SDATA "[acirc ]"--=small a, circumflex accent-->
-<!ENTITY Acirc  SDATA "[Acirc ]"--=capital A, circumflex accent-->
-<!ENTITY agrave SDATA "[agrave]"--=small a, grave accent-->
-<!ENTITY Agrave SDATA "[Agrave]"--=capital A, grave accent-->
-<!ENTITY aring  SDATA "[aring ]"--=small a, ring-->
-<!ENTITY Aring  SDATA "[Aring ]"--=capital A, ring-->
-<!ENTITY atilde SDATA "[atilde]"--=small a, tilde-->
-<!ENTITY Atilde SDATA "[Atilde]"--=capital A, tilde-->
-<!ENTITY auml   SDATA "[auml  ]"--=small a, dieresis or umlaut mark-->
-<!ENTITY Auml   SDATA "[Auml  ]"--=capital A, dieresis or umlaut mark-->
-<!ENTITY aelig  SDATA "[aelig ]"--=small ae diphthong (ligature)-->
-<!ENTITY AElig  SDATA "[AElig ]"--=capital AE diphthong (ligature)-->
-<!ENTITY ccedil SDATA "[ccedil]"--=small c, cedilla-->
-<!ENTITY Ccedil SDATA "[Ccedil]"--=capital C, cedilla-->
-<!ENTITY eth    SDATA "[eth   ]"--=small eth, Icelandic-->
-<!ENTITY ETH    SDATA "[ETH   ]"--=capital Eth, Icelandic-->
-<!ENTITY eacute SDATA "[eacute]"--=small e, acute accent-->
-<!ENTITY Eacute SDATA "[Eacute]"--=capital E, acute accent-->
-<!ENTITY ecirc  SDATA "[ecirc ]"--=small e, circumflex accent-->
-<!ENTITY Ecirc  SDATA "[Ecirc ]"--=capital E, circumflex accent-->
-<!ENTITY egrave SDATA "[egrave]"--=small e, grave accent-->
-<!ENTITY Egrave SDATA "[Egrave]"--=capital E, grave accent-->
-<!ENTITY euml   SDATA "[euml  ]"--=small e, dieresis or umlaut mark-->
-<!ENTITY Euml   SDATA "[Euml  ]"--=capital E, dieresis or umlaut mark-->
-<!ENTITY iacute SDATA "[iacute]"--=small i, acute accent-->
-<!ENTITY Iacute SDATA "[Iacute]"--=capital I, acute accent-->
-<!ENTITY icirc  SDATA "[icirc ]"--=small i, circumflex accent-->
-<!ENTITY Icirc  SDATA "[Icirc ]"--=capital I, circumflex accent-->
-<!ENTITY igrave SDATA "[igrave]"--=small i, grave accent-->
-<!ENTITY Igrave SDATA "[Igrave]"--=capital I, grave accent-->
-<!ENTITY iuml   SDATA "[iuml  ]"--=small i, dieresis or umlaut mark-->
-<!ENTITY Iuml   SDATA "[Iuml  ]"--=capital I, dieresis or umlaut mark-->
-<!ENTITY ntilde SDATA "[ntilde]"--=small n, tilde-->
-<!ENTITY Ntilde SDATA "[Ntilde]"--=capital N, tilde-->
-<!ENTITY oacute SDATA "[oacute]"--=small o, acute accent-->
-<!ENTITY Oacute SDATA "[Oacute]"--=capital O, acute accent-->
-<!ENTITY ocirc  SDATA "[ocirc ]"--=small o, circumflex accent-->
-<!ENTITY Ocirc  SDATA "[Ocirc ]"--=capital O, circumflex accent-->
-<!ENTITY ograve SDATA "[ograve]"--=small o, grave accent-->
-<!ENTITY Ograve SDATA "[Ograve]"--=capital O, grave accent-->
-<!ENTITY oslash SDATA "[oslash]"--=small o, slash-->
-<!ENTITY Oslash SDATA "[Oslash]"--=capital O, slash-->
-<!ENTITY otilde SDATA "[otilde]"--=small o, tilde-->
-<!ENTITY Otilde SDATA "[Otilde]"--=capital O, tilde-->
-<!ENTITY ouml   SDATA "[ouml  ]"--=small o, dieresis or umlaut mark-->
-<!ENTITY Ouml   SDATA "[Ouml  ]"--=capital O, dieresis or umlaut mark-->
-<!ENTITY szlig  SDATA "[szlig ]"--=small sharp s, German (sz ligature)-->
-<!ENTITY thorn  SDATA "[thorn ]"--=small thorn, Icelandic-->
-<!ENTITY THORN  SDATA "[THORN ]"--=capital THORN, Icelandic-->
-<!ENTITY uacute SDATA "[uacute]"--=small u, acute accent-->
-<!ENTITY Uacute SDATA "[Uacute]"--=capital U, acute accent-->
-<!ENTITY ucirc  SDATA "[ucirc ]"--=small u, circumflex accent-->
-<!ENTITY Ucirc  SDATA "[Ucirc ]"--=capital U, circumflex accent-->
-<!ENTITY ugrave SDATA "[ugrave]"--=small u, grave accent-->
-<!ENTITY Ugrave SDATA "[Ugrave]"--=capital U, grave accent-->
-<!ENTITY uuml   SDATA "[uuml  ]"--=small u, dieresis or umlaut mark-->
-<!ENTITY Uuml   SDATA "[Uuml  ]"--=capital U, dieresis or umlaut mark-->
-<!ENTITY yacute SDATA "[yacute]"--=small y, acute accent-->
-<!ENTITY Yacute SDATA "[Yacute]"--=capital Y, acute accent-->
-<!ENTITY yuml   SDATA "[yuml  ]"--=small y, dieresis or umlaut mark-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat2.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat2.gml
deleted file mode 100644
index cdd199773..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-lat2.gml
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- $XConsortium: iso-lat2.gml /main/3 1996/06/19 17:12:32 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOlat2 PUBLIC
-       "ISO 8879-1986//ENTITIES Added Latin 2//EN">
-     %ISOlat2;
--->
-<!ENTITY abreve SDATA "[abreve]"--=small a, breve-->
-<!ENTITY Abreve SDATA "[Abreve]"--=capital A, breve-->
-<!ENTITY amacr  SDATA "[amacr ]"--=small a, macron-->
-<!ENTITY Amacr  SDATA "[Amacr ]"--=capital A, macron-->
-<!ENTITY aogon  SDATA "[aogon ]"--=small a, ogonek-->
-<!ENTITY Aogon  SDATA "[Aogon ]"--=capital A, ogonek-->
-<!ENTITY cacute SDATA "[cacute]"--=small c, acute accent-->
-<!ENTITY Cacute SDATA "[Cacute]"--=capital C, acute accent-->
-<!ENTITY ccaron SDATA "[ccaron]"--=small c, caron-->
-<!ENTITY Ccaron SDATA "[Ccaron]"--=capital C, caron-->
-<!ENTITY ccirc  SDATA "[ccirc ]"--=small c, circumflex accent-->
-<!ENTITY Ccirc  SDATA "[Ccirc ]"--=capital C, circumflex accent-->
-<!ENTITY cdot   SDATA "[cdot  ]"--=small c, dot above-->
-<!ENTITY Cdot   SDATA "[Cdot  ]"--=capital C, dot above-->
-<!ENTITY dcaron SDATA "[dcaron]"--=small d, caron-->
-<!ENTITY Dcaron SDATA "[Dcaron]"--=capital D, caron-->
-<!ENTITY dstrok SDATA "[dstrok]"--=small d, stroke-->
-<!ENTITY Dstrok SDATA "[Dstrok]"--=capital D, stroke-->
-<!ENTITY ecaron SDATA "[ecaron]"--=small e, caron-->
-<!ENTITY Ecaron SDATA "[Ecaron]"--=capital E, caron-->
-<!ENTITY edot   SDATA "[edot  ]"--=small e, dot above-->
-<!ENTITY Edot   SDATA "[Edot  ]"--=capital E, dot above-->
-<!ENTITY emacr  SDATA "[emacr ]"--=small e, macron-->
-<!ENTITY Emacr  SDATA "[Emacr ]"--=capital E, macron-->
-<!ENTITY eogon  SDATA "[eogon ]"--=small e, ogonek-->
-<!ENTITY Eogon  SDATA "[Eogon ]"--=capital E, ogonek-->
-<!ENTITY gacute SDATA "[gacute]"--=small g, acute accent-->
-<!ENTITY gbreve SDATA "[gbreve]"--=small g, breve-->
-<!ENTITY Gbreve SDATA "[Gbreve]"--=capital G, breve-->
-<!ENTITY Gcedil SDATA "[Gcedil]"--=capital G, cedilla-->
-<!ENTITY gcirc  SDATA "[gcirc ]"--=small g, circumflex accent-->
-<!ENTITY Gcirc  SDATA "[Gcirc ]"--=capital G, circumflex accent-->
-<!ENTITY gdot   SDATA "[gdot  ]"--=small g, dot above-->
-<!ENTITY Gdot   SDATA "[Gdot  ]"--=capital G, dot above-->
-<!ENTITY hcirc  SDATA "[hcirc ]"--=small h, circumflex accent-->
-<!ENTITY Hcirc  SDATA "[Hcirc ]"--=capital H, circumflex accent-->
-<!ENTITY hstrok SDATA "[hstrok]"--=small h, stroke-->
-<!ENTITY Hstrok SDATA "[Hstrok]"--=capital H, stroke-->
-<!ENTITY Idot   SDATA "[Idot  ]"--=capital I, dot above-->
-<!ENTITY Imacr  SDATA "[Imacr ]"--=capital I, macron-->
-<!ENTITY imacr  SDATA "[imacr ]"--=small i, macron-->
-<!ENTITY ijlig  SDATA "[ijlig ]"--=small ij ligature-->
-<!ENTITY IJlig  SDATA "[IJlig ]"--=capital IJ ligature-->
-<!ENTITY inodot SDATA "[inodot]"--=small i without dot-->
-<!ENTITY iogon  SDATA "[iogon ]"--=small i, ogonek-->
-<!ENTITY Iogon  SDATA "[Iogon ]"--=capital I, ogonek-->
-<!ENTITY itilde SDATA "[itilde]"--=small i, tilde-->
-<!ENTITY Itilde SDATA "[Itilde]"--=capital I, tilde-->
-<!ENTITY jcirc  SDATA "[jcirc ]"--=small j, circumflex accent-->
-<!ENTITY Jcirc  SDATA "[Jcirc ]"--=capital J, circumflex accent-->
-<!ENTITY kcedil SDATA "[kcedil]"--=small k, cedilla-->
-<!ENTITY Kcedil SDATA "[Kcedil]"--=capital K, cedilla-->
-<!ENTITY kgreen SDATA "[kgreen]"--=small k, Greenlandic-->
-<!ENTITY lacute SDATA "[lacute]"--=small l, acute accent-->
-<!ENTITY Lacute SDATA "[Lacute]"--=capital L, acute accent-->
-<!ENTITY lcaron SDATA "[lcaron]"--=small l, caron-->
-<!ENTITY Lcaron SDATA "[Lcaron]"--=capital L, caron-->
-<!ENTITY lcedil SDATA "[lcedil]"--=small l, cedilla-->
-<!ENTITY Lcedil SDATA "[Lcedil]"--=capital L, cedilla-->
-<!ENTITY lmidot SDATA "[lmidot]"--=small l, middle dot-->
-<!ENTITY Lmidot SDATA "[Lmidot]"--=capital L, middle dot-->
-<!ENTITY lstrok SDATA "[lstrok]"--=small l, stroke-->
-<!ENTITY Lstrok SDATA "[Lstrok]"--=capital L, stroke-->
-<!ENTITY nacute SDATA "[nacute]"--=small n, acute accent-->
-<!ENTITY Nacute SDATA "[Nacute]"--=capital N, acute accent-->
-<!ENTITY eng    SDATA "[eng   ]"--=small eng, Lapp-->
-<!ENTITY ENG    SDATA "[ENG   ]"--=capital ENG, Lapp-->
-<!ENTITY napos  SDATA "[napos ]"--=small n, apostrophe-->
-<!ENTITY ncaron SDATA "[ncaron]"--=small n, caron-->
-<!ENTITY Ncaron SDATA "[Ncaron]"--=capital N, caron-->
-<!ENTITY ncedil SDATA "[ncedil]"--=small n, cedilla-->
-<!ENTITY Ncedil SDATA "[Ncedil]"--=capital N, cedilla-->
-<!ENTITY odblac SDATA "[odblac]"--=small o, double acute accent-->
-<!ENTITY Odblac SDATA "[Odblac]"--=capital O, double acute accent-->
-<!ENTITY Omacr  SDATA "[Omacr ]"--=capital O, macron-->
-<!ENTITY omacr  SDATA "[omacr ]"--=small o, macron-->
-<!ENTITY oelig  SDATA "[oelig ]"--=small oe ligature-->
-<!ENTITY OElig  SDATA "[OElig ]"--=capital OE ligature-->
-<!ENTITY racute SDATA "[racute]"--=small r, acute accent-->
-<!ENTITY Racute SDATA "[Racute]"--=capital R, acute accent-->
-<!ENTITY rcaron SDATA "[rcaron]"--=small r, caron-->
-<!ENTITY Rcaron SDATA "[Rcaron]"--=capital R, caron-->
-<!ENTITY rcedil SDATA "[rcedil]"--=small r, cedilla-->
-<!ENTITY Rcedil SDATA "[Rcedil]"--=capital R, cedilla-->
-<!ENTITY sacute SDATA "[sacute]"--=small s, acute accent-->
-<!ENTITY Sacute SDATA "[Sacute]"--=capital S, acute accent-->
-<!ENTITY scaron SDATA "[scaron]"--=small s, caron-->
-<!ENTITY Scaron SDATA "[Scaron]"--=capital S, caron-->
-<!ENTITY scedil SDATA "[scedil]"--=small s, cedilla-->
-<!ENTITY Scedil SDATA "[Scedil]"--=capital S, cedilla-->
-<!ENTITY scirc  SDATA "[scirc ]"--=small s, circumflex accent-->
-<!ENTITY Scirc  SDATA "[Scirc ]"--=capital S, circumflex accent-->
-<!ENTITY tcaron SDATA "[tcaron]"--=small t, caron-->
-<!ENTITY Tcaron SDATA "[Tcaron]"--=capital T, caron-->
-<!ENTITY tcedil SDATA "[tcedil]"--=small t, cedilla-->
-<!ENTITY Tcedil SDATA "[Tcedil]"--=capital T, cedilla-->
-<!ENTITY tstrok SDATA "[tstrok]"--=small t, stroke-->
-<!ENTITY Tstrok SDATA "[Tstrok]"--=capital T, stroke-->
-<!ENTITY ubreve SDATA "[ubreve]"--=small u, breve-->
-<!ENTITY Ubreve SDATA "[Ubreve]"--=capital U, breve-->
-<!ENTITY udblac SDATA "[udblac]"--=small u, double acute accent-->
-<!ENTITY Udblac SDATA "[Udblac]"--=capital U, double acute accent-->
-<!ENTITY umacr  SDATA "[umacr ]"--=small u, macron-->
-<!ENTITY Umacr  SDATA "[Umacr ]"--=capital U, macron-->
-<!ENTITY uogon  SDATA "[uogon ]"--=small u, ogonek-->
-<!ENTITY Uogon  SDATA "[Uogon ]"--=capital U, ogonek-->
-<!ENTITY uring  SDATA "[uring ]"--=small u, ring-->
-<!ENTITY Uring  SDATA "[Uring ]"--=capital U, ring-->
-<!ENTITY utilde SDATA "[utilde]"--=small u, tilde-->
-<!ENTITY Utilde SDATA "[Utilde]"--=capital U, tilde-->
-<!ENTITY wcirc  SDATA "[wcirc ]"--=small w, circumflex accent-->
-<!ENTITY Wcirc  SDATA "[Wcirc ]"--=capital W, circumflex accent-->
-<!ENTITY ycirc  SDATA "[ycirc ]"--=small y, circumflex accent-->
-<!ENTITY Ycirc  SDATA "[Ycirc ]"--=capital Y, circumflex accent-->
-<!ENTITY Yuml   SDATA "[Yuml  ]"--=capital Y, dieresis or umlaut mark-->
-<!ENTITY zacute SDATA "[zacute]"--=small z, acute accent-->
-<!ENTITY Zacute SDATA "[Zacute]"--=capital Z, acute accent-->
-<!ENTITY zcaron SDATA "[zcaron]"--=small z, caron-->
-<!ENTITY Zcaron SDATA "[Zcaron]"--=capital Z, caron-->
-<!ENTITY zdot   SDATA "[zdot  ]"--=small z, dot above-->
-<!ENTITY Zdot   SDATA "[Zdot  ]"--=capital Z, dot above-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-num.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-num.gml
deleted file mode 100644
index a6b89ba03..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-num.gml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- $XConsortium: iso-num.gml /main/3 1996/06/19 17:12:37 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOnum PUBLIC
-       "ISO 8879-1986//ENTITIES Numeric and Special Graphic//EN">
-     %ISOnum;
--->
-<!ENTITY half   SDATA "[half  ]"--=fraction one-half-->
-<!ENTITY frac12 SDATA "[frac12]"--=fraction one-half-->
-<!ENTITY frac14 SDATA "[frac14]"--=fraction one-quarter-->
-<!ENTITY frac34 SDATA "[frac34]"--=fraction three-quarters-->
-<!ENTITY frac18 SDATA "[frac18]"--=fraction one-eighth-->
-<!ENTITY frac38 SDATA "[frac38]"--=fraction three-eighths-->
-<!ENTITY frac58 SDATA "[frac58]"--=fraction five-eighths-->
-<!ENTITY frac78 SDATA "[frac78]"--=fraction seven-eighths-->
-
-<!ENTITY sup1   SDATA "[sup1  ]"--=superscript one-->
-<!ENTITY sup2   SDATA "[sup2  ]"--=superscript two-->
-<!ENTITY sup3   SDATA "[sup3  ]"--=superscript three-->
-
-<!ENTITY plus   SDATA "[plus  ]"--=plus sign B:-- >
-<!ENTITY plusmn SDATA "[plusmn]"--/pm B: =plus-or-minus sign-->
-<!ENTITY lt     SDATA "[lt    ]"--=less-than sign R:-->
-<!ENTITY equals SDATA "[equals]"--=equals sign R:-->
-<!ENTITY gt     SDATA "[gt    ]"--=greater-than sign R:-->
-<!ENTITY divide SDATA "[divide]"--/div B: =divide sign-->
-<!ENTITY times  SDATA "[times ]"--/times B: =multiply sign-->
-
-<!ENTITY curren SDATA "[curren]"--=general currency sign-->
-<!ENTITY pound  SDATA "[pound ]"--=pound sign-->
-<!ENTITY dollar SDATA "[dollar]"--=dollar sign-->
-<!ENTITY cent   SDATA "[cent  ]"--=cent sign-->
-<!ENTITY yen    SDATA "[yen   ]"--/yen =yen sign-->
-
-<!ENTITY num    SDATA "[num   ]"--=number sign-->
-<!ENTITY percnt SDATA "[percnt]"--=percent sign-->
-<!ENTITY amp    SDATA "[amp   ]"--=ampersand-->
-<!ENTITY ast    SDATA "[ast   ]"--/ast B: =asterisk-->
-<!ENTITY commat SDATA "[commat]"--=commercial at-->
-<!ENTITY lsqb   SDATA "[lsqb  ]"--/lbrack O: =left square bracket-->
-<!ENTITY bsol   SDATA "[bsol  ]"--/backslash =reverse solidus-->
-<!ENTITY rsqb   SDATA "[rsqb  ]"--/rbrack C: =right square bracket-->
-<!ENTITY lcub   SDATA "[lcub  ]"--/lbrace O: =left curly bracket-->
-<!ENTITY horbar SDATA "[horbar]"--=horizontal bar-->
-<!ENTITY verbar SDATA "[verbar]"--/vert =vertical bar-->
-<!ENTITY rcub   SDATA "[rcub  ]"--/rbrace C: =right curly bracket-->
-<!ENTITY micro  SDATA "[micro ]"--=micro sign-->
-<!ENTITY ohm    SDATA "[ohm   ]"--=ohm sign-->
-<!ENTITY deg    SDATA "[deg   ]"--=degree sign-->
-<!ENTITY ordm   SDATA "[ordm  ]"--=ordinal indicator, masculine-->
-<!ENTITY ordf   SDATA "[ordf  ]"--=ordinal indicator, feminine-->
-<!ENTITY sect   SDATA "[sect  ]"--=section sign-->
-<!ENTITY para   SDATA "[para  ]"--=pilcrow (paragraph sign)-->
-<!ENTITY middot SDATA "[middot]"--/centerdot B: =middle dot-->
-<!ENTITY larr   SDATA "[larr  ]"--/leftarrow /gets A: =leftward arrow-->
-<!ENTITY rarr   SDATA "[rarr  ]"--/rightarrow /to A: =rightward arrow-->
-<!ENTITY uarr   SDATA "[uarr  ]"--/uparrow A: =upward arrow-->
-<!ENTITY darr   SDATA "[darr  ]"--/downarrow A: =downward arrow-->
-<!ENTITY copy   SDATA "[copy  ]"--=copyright sign-->
-<!ENTITY reg    SDATA "[reg   ]"--/circledR =registered sign-->
-<!ENTITY trade  SDATA "[trade ]"--=trade mark sign-->
-<!ENTITY brvbar SDATA "[brvbar]"--=broken (vertical) bar-->
-<!ENTITY not    SDATA "[not   ]"--/neg /lnot =not sign-->
-<!ENTITY sung   SDATA "[sung  ]"--=music note (sung text sign)-->
-
-<!ENTITY excl   SDATA "[excl  ]"--=exclamation mark-->
-<!ENTITY iexcl  SDATA "[iexcl ]"--=inverted exclamation mark-->
-<!ENTITY quot   SDATA "[quot  ]"--=quotation mark-->
-<!ENTITY apos   SDATA "[apos  ]"--=apostrophe-->
-<!ENTITY lpar   SDATA "[lpar  ]"--O: =left parenthesis-->
-<!ENTITY rpar   SDATA "[rpar  ]"--C: =right parenthesis-->
-<!ENTITY comma  SDATA "[comma ]"--P: =comma-->
-<!ENTITY lowbar SDATA "[lowbar]"--=low line-->
-<!ENTITY hyphen SDATA "[hyphen]"--=hyphen-->
-<!ENTITY period SDATA "[period]"--=full stop, period-->
-<!ENTITY sol    SDATA "[sol   ]"--=solidus-->
-<!ENTITY colon  SDATA "[colon ]"--/colon P:-->
-<!ENTITY semi   SDATA "[semi  ]"--=semicolon P:-->
-<!ENTITY quest  SDATA "[quest ]"--=question mark-->
-<!ENTITY iquest SDATA "[iquest]"--=inverted question mark-->
-<!ENTITY laquo  SDATA "[laquo ]"--=angle quotation mark, left-->
-<!ENTITY raquo  SDATA "[raquo ]"--=angle quotation mark, right-->
-<!ENTITY lsquo  SDATA "[lsquo ]"--=single quotation mark, left-->
-<!ENTITY rsquo  SDATA "[rsquo ]"--=single quotation mark, right-->
-<!ENTITY ldquo  SDATA "[ldquo ]"--=double quotation mark, left-->
-<!ENTITY rdquo  SDATA "[rdquo ]"--=double quotation mark, right-->
-<!ENTITY nbsp   SDATA "[nbsp  ]"--=no break (required) space-->
-<!ENTITY shy    SDATA "[shy   ]"--=soft hyphen-->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-pub.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-pub.gml
deleted file mode 100644
index fe46cd62d..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-pub.gml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!-- $XConsortium: iso-pub.gml /main/3 1996/06/19 17:12:41 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOpub PUBLIC
-       "ISO 8879-1986//ENTITIES Publishing//EN">
-     %ISOpub;
--->
-<!ENTITY emsp   SDATA "[emsp  ]"--=em space-->
-<!ENTITY ensp   SDATA "[ensp  ]"--=en space (1/2-em)-->
-<!ENTITY emsp13 SDATA "[emsp3 ]"--=1/3-em space-->
-<!ENTITY emsp14 SDATA "[emsp4 ]"--=1/4-em space-->
-<!ENTITY numsp  SDATA "[numsp ]"--=digit space (width of a number)-->
-<!ENTITY puncsp SDATA "[puncsp]"--=punctuation space (width of comma)-->
-<!ENTITY thinsp SDATA "[thinsp]"--=thin space (1/6-em)-->
-<!ENTITY hairsp SDATA "[hairsp]"--=hair space-->
-<!ENTITY mdash  SDATA "[mdash ]"--=em dash-->
-<!ENTITY ndash  SDATA "[ndash ]"--=en dash-->
-<!ENTITY dash   SDATA "[dash  ]"--=hyphen (true graphic)-->
-<!ENTITY blank  SDATA "[blank ]"--=significant blank symbol-->
-<!ENTITY hellip SDATA "[hellip]"--=ellipsis (horizontal)-->
-<!ENTITY nldr   SDATA "[nldr  ]"--=double baseline dot (en leader)-->
-<!ENTITY frac13 SDATA "[frac13]"--=fraction one-third-->
-<!ENTITY frac23 SDATA "[frac23]"--=fraction two-thirds-->
-<!ENTITY frac15 SDATA "[frac15]"--=fraction one-fifth-->
-<!ENTITY frac25 SDATA "[frac25]"--=fraction two-fifths-->
-<!ENTITY frac35 SDATA "[frac35]"--=fraction three-fifths-->
-<!ENTITY frac45 SDATA "[frac45]"--=fraction four-fifths-->
-<!ENTITY frac16 SDATA "[frac16]"--=fraction one-sixth-->
-<!ENTITY frac56 SDATA "[frac56]"--=fraction five-sixths-->
-<!ENTITY incare SDATA "[incare]"--=in-care-of symbol-->
-<!ENTITY block  SDATA "[block ]"--=full block-->
-<!ENTITY uhblk  SDATA "[uhblk ]"--=upper half block-->
-<!ENTITY lhblk  SDATA "[lhblk ]"--=lower half block-->
-<!ENTITY blk14  SDATA "[blk14 ]"--=25% shaded block-->
-<!ENTITY blk12  SDATA "[blk12 ]"--=50% shaded block-->
-<!ENTITY blk34  SDATA "[blk34 ]"--=75% shaded block-->
-<!ENTITY marker SDATA "[marker]"--=histogram marker-->
-<!ENTITY cir    SDATA "[cir   ]"--/circ B: =circle, open-->
-<!ENTITY squ    SDATA "[squ   ]"--=square, open-->
-<!ENTITY rect   SDATA "[rect  ]"--=rectangle, open-->
-<!ENTITY utri   SDATA "[utri  ]"--/triangle =up triangle, open-->
-<!ENTITY dtri   SDATA "[dtri  ]"--/triangledown =down triangle, open-->
-<!ENTITY star   SDATA "[star  ]"--=star, open-->
-<!ENTITY bull   SDATA "[bull  ]"--/bullet B: =round bullet, filled-->
-<!ENTITY squf   SDATA "[squf  ]"--/blacksquare =sq bullet, filled-->
-<!ENTITY utrif  SDATA "[utrif ]"--/blacktriangle =up tri, filled-->
-<!ENTITY dtrif  SDATA "[dtrif ]"--/blacktriangledown =dn tri, filled-->
-<!ENTITY ltrif  SDATA "[ltrif ]"--/blacktriangleleft R: =l tri, filled-->
-<!ENTITY rtrif  SDATA "[rtrif ]"--/blacktriangleright R: =r tri, filled-->
-<!ENTITY clubs  SDATA "[clubs ]"--/clubsuit =club suit symbol-->
-<!ENTITY diams  SDATA "[diams ]"--/diamondsuit =diamond suit symbol-->
-<!ENTITY hearts SDATA "[hearts]"--/heartsuit =heart suit symbol-->
-<!ENTITY spades SDATA "[spades]"--/spadesuit =spades suit symbol-->
-<!ENTITY malt   SDATA "[malt  ]"--/maltese =maltese cross-->
-<!ENTITY dagger SDATA "[dagger]"--/dagger B: =dagger-->
-<!ENTITY Dagger SDATA "[Dagger]"--/ddagger B: =double dagger-->
-<!ENTITY check  SDATA "[check ]"--/checkmark =tick, check mark-->
-<!ENTITY cross  SDATA "[ballot]"--=ballot cross-->
-<!ENTITY sharp  SDATA "[sharp ]"--/sharp =musical sharp-->
-<!ENTITY flat   SDATA "[flat  ]"--/flat =musical flat-->
-<!ENTITY male   SDATA "[male  ]"--=male symbol-->
-<!ENTITY female SDATA "[female]"--=female symbol-->
-<!ENTITY phone  SDATA "[phone ]"--=telephone symbol-->
-<!ENTITY telrec SDATA "[telrec]"--=telephone recorder symbol-->
-<!ENTITY copysr SDATA "[copysr]"--=sound recording copyright sign-->
-<!ENTITY caret  SDATA "[caret ]"--=caret (insertion mark)-->
-<!ENTITY lsquor SDATA "[lsquor]"--=rising single quote, left (low)-->
-<!ENTITY ldquor SDATA "[ldquor]"--=rising dbl quote, left (low)-->
-
-<!ENTITY fflig  SDATA "[fflig ]"--small ff ligature-->
-<!ENTITY filig  SDATA "[filig ]"--small fi ligature-->
-<!ENTITY fjlig  SDATA "[fjlig ]"--small fj ligature-->
-<!ENTITY ffilig SDATA "[ffilig]"--small ffi ligature-->
-<!ENTITY ffllig SDATA "[ffllig]"--small ffl ligature-->
-<!ENTITY fllig  SDATA "[fllig ]"--small fl ligature-->
-
-<!ENTITY mldr   SDATA "[mldr  ]"--em leader-->
-<!ENTITY rdquor SDATA "[rdquor]"--rising dbl quote, right (high)-->
-<!ENTITY rsquor SDATA "[rsquor]"--rising single quote, right (high)-->
-<!ENTITY vellip SDATA "[vellip]"--vertical ellipsis-->
-
-<!ENTITY hybull SDATA "[hybull]"--rectangle, filled (hyphen bullet)-->
-<!ENTITY loz    SDATA "[loz   ]"--/lozenge - lozenge or total mark-->
-<!ENTITY lozf   SDATA "[lozf  ]"--/blacklozenge - lozenge, filled-->
-<!ENTITY ltri   SDATA "[ltri  ]"--/triangleleft B: l triangle, open-->
-<!ENTITY rtri   SDATA "[rtri  ]"--/triangleright B: r triangle, open-->
-<!ENTITY starf  SDATA "[starf ]"--/bigstar - star, filled-->
-
-<!ENTITY natur  SDATA "[natur ]"--/natural - music natural-->
-<!ENTITY rx     SDATA "[rx    ]"--pharmaceutical prescription (Rx)-->
-<!ENTITY sext   SDATA "[sext  ]"--sextile (6-pointed star)-->
-
-<!ENTITY target SDATA "[target]"--register mark or target-->
-<!ENTITY dlcrop SDATA "[dlcrop]"--downward left crop mark -->
-<!ENTITY drcrop SDATA "[drcrop]"--downward right crop mark -->
-<!ENTITY ulcrop SDATA "[ulcrop]"--upward left crop mark -->
-<!ENTITY urcrop SDATA "[urcrop]"--upward right crop mark -->
diff --git a/cde/programs/dtdocbook/doc2sdl/SGML/iso-tech.gml b/cde/programs/dtdocbook/doc2sdl/SGML/iso-tech.gml
deleted file mode 100644
index 159f2ffdc..000000000
--- a/cde/programs/dtdocbook/doc2sdl/SGML/iso-tech.gml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- $XConsortium: iso-tech.gml /main/3 1996/06/19 17:12:45 drk $ -->
-<!-- (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % ISOtech PUBLIC
-       "ISO 8879-1986//ENTITIES General Technical//EN">
-     %ISOtech;
--->
-<!ENTITY aleph  SDATA "[aleph ]"--/aleph =aleph, Hebrew-->
-<!ENTITY and    SDATA "[and   ]"--/wedge /land B: =logical and-->
-<!ENTITY ang90  SDATA "[ang90 ]"--=right (90 degree) angle-->
-<!ENTITY angsph SDATA "[angsph]"--/sphericalangle =angle-spherical-->
-<!ENTITY ap     SDATA "[ap    ]"--/approx R: =approximate-->
-<!ENTITY becaus SDATA "[becaus]"--/because R: =because-->
-<!ENTITY bottom SDATA "[bottom]"--/bot B: =perpendicular-->
-<!ENTITY cap    SDATA "[cap   ]"--/cap B: =intersection-->
-<!ENTITY cong   SDATA "[cong  ]"--/cong R: =congruent with-->
-<!ENTITY conint SDATA "[conint]"--/oint L: =contour integral operator-->
-<!ENTITY cup    SDATA "[cup   ]"--/cup B: =union or logical sum-->
-<!ENTITY equiv  SDATA "[equiv ]"--/equiv R: =identical with-->
-<!ENTITY exist  SDATA "[exist ]"--/exists =at least one exists-->
-<!ENTITY forall SDATA "[forall]"--/forall =for all-->
-<!ENTITY fnof   SDATA "[fnof  ]"--=function of (italic small f)-->
-<!ENTITY ge     SDATA "[ge    ]"--/geq /ge R: =greater-than-or-equal-->
-<!ENTITY iff    SDATA "[iff   ]"--/iff =if and only if-->
-<!ENTITY infin  SDATA "[infin ]"--/infty =infinity-->
-<!ENTITY int    SDATA "[int   ]"--/int L: =integral operator-->
-<!ENTITY isin   SDATA "[isin  ]"--/in R: =set membership-->
-<!ENTITY lang   SDATA "[lang  ]"--/langle O: =left angle bracket-->
-<!ENTITY lArr   SDATA "[lArr  ]"--/Leftarrow A: =is implied by-->
-<!ENTITY le     SDATA "[le    ]"--/leq /le R: =less-than-or-equal-->
-<!ENTITY minus  SDATA "[minus ]"--B: =minus sign-->
-<!ENTITY mnplus SDATA "[mnplus]"--/mp B: =minus-or-plus sign-->
-<!ENTITY nabla  SDATA "[nabla ]"--/nabla =del, Hamilton operator-->
-<!ENTITY ne     SDATA "[ne    ]"--/ne /neq R: =not equal-->
-<!ENTITY ni     SDATA "[ni    ]"--/ni /owns R: =contains-->
-<!ENTITY or     SDATA "[or    ]"--/vee /lor B: =logical or-->
-<!ENTITY par    SDATA "[par   ]"--/parallel R: =parallel-->
-<!ENTITY part   SDATA "[part  ]"--/partial =partial differential-->
-<!ENTITY permil SDATA "[permil]"--=per thousand-->
-<!ENTITY perp   SDATA "[perp  ]"--/perp R: =perpendicular-->
-<!ENTITY prime  SDATA "[prime ]"--/prime =prime or minute-->
-<!ENTITY Prime  SDATA "[Prime ]"--=double prime or second-->
-<!ENTITY prop   SDATA "[prop  ]"--/propto R: =is proportional to-->
-<!ENTITY radic  SDATA "[radic ]"--/surd =radical-->
-<!ENTITY rang   SDATA "[rang  ]"--/rangle C: =right angle bracket-->
-<!ENTITY rArr   SDATA "[rArr  ]"--/Rightarrow A: =implies-->
-<!ENTITY sim    SDATA "[sim   ]"--/sim R: =similar-->
-<!ENTITY sime   SDATA "[sime  ]"--/simeq R: =similar, equals-->
-<!ENTITY square SDATA "[square]"--/square B: =square-->
-<!ENTITY sub    SDATA "[sub   ]"--/subset R: =subset or is implied by-->
-<!ENTITY sube   SDATA "[sube  ]"--/subseteq R: =subset, equals-->
-<!ENTITY sup    SDATA "[sup   ]"--/supset R: =superset or implies-->
-<!ENTITY supe   SDATA "[supe  ]"--/supseteq R: =superset, equals-->
-<!ENTITY there4 SDATA "[there4]"--/therefore R: =therefore-->
-<!ENTITY Verbar SDATA "[Verbar]"--/Vert =dbl vertical bar-->
-
-<!ENTITY angst  SDATA "[angst ]"--Angstrom =capital A, ring-->
-<!ENTITY bernou SDATA "[bernou]"--Bernoulli function (script capital B)-->
-<!ENTITY compfn SDATA "[compfn]"--B: composite function (small circle)-->
-<!ENTITY Dot    SDATA "[Dot   ]"--=dieresis or umlaut mark-->
-<!ENTITY DotDot SDATA "[DotDot]"--four dots above-->
-<!ENTITY hamilt SDATA "[hamilt]"--Hamiltonian (script capital H)-->
-<!ENTITY lagran SDATA "[lagran]"--Lagrangian (script capital L)-->
-<!ENTITY lowast SDATA "[lowast]"--low asterisk-->
-<!ENTITY notin  SDATA "[notin ]"--N: negated set membership-->
-<!ENTITY order  SDATA "[order ]"--order of (script small o)-->
-<!ENTITY phmmat SDATA "[phmmat]"--physics M-matrix (script capital M)-->
-<!ENTITY tdot   SDATA "[tdot  ]"--three dots above-->
-<!ENTITY tprime SDATA "[tprime]"--triple prime-->
-<!ENTITY wedgeq SDATA "[wedgeq]"--R: corresponds to (wedge, equals)-->
diff --git a/cde/programs/dtdocbook/instant/Makefile.am b/cde/programs/dtdocbook/instant/Makefile.am
index 40417d41c..5dfe33cee 100644
--- a/cde/programs/dtdocbook/instant/Makefile.am
+++ b/cde/programs/dtdocbook/instant/Makefile.am
@@ -2,33 +2,13 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_PROGRAMS = instant
 
-instant_CFLAGS = -I../lib/tptregexp -I$(SVCSRC)/DtUtil2
+instant_CFLAGS = -I../lib/tptregexp $(DT_INCDIR)
 
-instant_LDADD = $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIB} -L../lib/tptregexp \
-		-ltptregexp -lm
-if LINUX
-instant_CFLAGS += -I/usr/include/tcl
-instant_LDADD += -ltcl
-endif
+instant_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -L../lib/tptregexp \
+		-ltptregexp
 
-if FREEBSD
-instant_CFLAGS += -I/usr/local/include/tcl8.6
-instant_LDADD += -ltcl86
-endif
-
-if OPENBSD
-instant_CFLAGS += -I/usr/local/include/tcl8.6
-instant_LDADD += -ltcl86
-endif
-
-if NETBSD
-instant_CFLAGS += -I/usr/pkg/include/tcl
-instant_LDADD += -ltcl86
-endif
-
-if SOLARIS
-instant_LDADD += -lsocket -lnsl -lgen
-endif
+instant_CFLAGS += @TCL_INCLUDE_SPEC@
+instant_LDADD += @TCL_LIB_SPEC@
 
 instant_SOURCES = main.c util.c info.c translate.c traninit.c tranvar.c \
 		  tables.c browse.c
diff --git a/cde/programs/dtdocbook/lib/tptregexp/Makefile.am b/cde/programs/dtdocbook/lib/tptregexp/Makefile.am
index 2656593a9..130bf8b5c 100644
--- a/cde/programs/dtdocbook/lib/tptregexp/Makefile.am
+++ b/cde/programs/dtdocbook/lib/tptregexp/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-noinst_LIBRARIES = tptregexp.a
+noinst_LIBRARIES = libtptregexp.a
 
-tptregexp_a_SOURCES = regexp.c regsub.c regerror.c
+libtptregexp_a_SOURCES = regexp.c regsub.c regerror.c
diff --git a/cde/programs/dtdocbook/xlate_locale/Makefile.am b/cde/programs/dtdocbook/xlate_locale/Makefile.am
index 6af4a6398..5deaa9d9d 100644
--- a/cde/programs/dtdocbook/xlate_locale/Makefile.am
+++ b/cde/programs/dtdocbook/xlate_locale/Makefile.am
@@ -2,8 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_PROGRAMS = xlate_locale
 
-xlate_locale_CFLAGS = -I$(SVCSRC)/DtUtil2
+xlate_locale_CFLAGS =  $(DT_INCDIR)
 
-xlate_locale_LDADD = $(LIBTT) $(LIBSVC) $(XTOOLLIB) ${X_LIBS}
+xlate_locale_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 xlate_locale_SOURCES = xlate_locale.c