diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h b/cde/lib/DtMmdb/HardCopy/FPExceptions.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h
rename to cde/lib/DtMmdb/HardCopy/FPExceptions.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/FPset.C b/cde/lib/DtMmdb/HardCopy/FPset.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/FPset.C
rename to cde/lib/DtMmdb/HardCopy/FPset.C
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/FPset.h b/cde/lib/DtMmdb/HardCopy/FPset.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/FPset.h
rename to cde/lib/DtMmdb/HardCopy/FPset.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C b/cde/lib/DtMmdb/HardCopy/HardCopyFP.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.C
rename to cde/lib/DtMmdb/HardCopy/HardCopyFP.C
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.h b/cde/lib/DtMmdb/HardCopy/HardCopyFP.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/HardCopyFP.h
rename to cde/lib/DtMmdb/HardCopy/HardCopyFP.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am b/cde/lib/DtMmdb/HardCopy/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am
rename to cde/lib/DtMmdb/HardCopy/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C b/cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/TemplatesAutoNumber.C
rename to cde/lib/DtMmdb/HardCopy/TemplatesAutoNumber.C
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C b/cde/lib/DtMmdb/HardCopy/autoNumber.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.C
rename to cde/lib/DtMmdb/HardCopy/autoNumber.C
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.h b/cde/lib/DtMmdb/HardCopy/autoNumber.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/autoNumber.h
rename to cde/lib/DtMmdb/HardCopy/autoNumber.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumberFP.C b/cde/lib/DtMmdb/HardCopy/autoNumberFP.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/autoNumberFP.C
rename to cde/lib/DtMmdb/HardCopy/autoNumberFP.C
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/autoNumberFP.h b/cde/lib/DtMmdb/HardCopy/autoNumberFP.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/autoNumberFP.h
rename to cde/lib/DtMmdb/HardCopy/autoNumberFP.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/lout_limits.h b/cde/lib/DtMmdb/HardCopy/lout_limits.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/HardCopy/lout_limits.h
rename to cde/lib/DtMmdb/HardCopy/lout_limits.h
diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/lib/DtMmdb/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/Makefile.am
rename to cde/lib/DtMmdb/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Attribute.C b/cde/lib/DtMmdb/StyleSheet/Attribute.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Attribute.C
rename to cde/lib/DtMmdb/StyleSheet/Attribute.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Attribute.h b/cde/lib/DtMmdb/StyleSheet/Attribute.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Attribute.h
rename to cde/lib/DtMmdb/StyleSheet/Attribute.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/AttributeList.C b/cde/lib/DtMmdb/StyleSheet/AttributeList.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/AttributeList.C
rename to cde/lib/DtMmdb/StyleSheet/AttributeList.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/AttributeList.h b/cde/lib/DtMmdb/StyleSheet/AttributeList.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/AttributeList.h
rename to cde/lib/DtMmdb/StyleSheet/AttributeList.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/BitVector.C b/cde/lib/DtMmdb/StyleSheet/BitVector.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/BitVector.C
rename to cde/lib/DtMmdb/StyleSheet/BitVector.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/BitVector.h b/cde/lib/DtMmdb/StyleSheet/BitVector.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/BitVector.h
rename to cde/lib/DtMmdb/StyleSheet/BitVector.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Const.h b/cde/lib/DtMmdb/StyleSheet/Const.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Const.h
rename to cde/lib/DtMmdb/StyleSheet/Const.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Debug.h b/cde/lib/DtMmdb/StyleSheet/Debug.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Debug.h
rename to cde/lib/DtMmdb/StyleSheet/Debug.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C b/cde/lib/DtMmdb/StyleSheet/DocParser.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.C
rename to cde/lib/DtMmdb/StyleSheet/DocParser.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h b/cde/lib/DtMmdb/StyleSheet/DocParser.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h
rename to cde/lib/DtMmdb/StyleSheet/DocParser.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Element.C b/cde/lib/DtMmdb/StyleSheet/Element.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Element.C
rename to cde/lib/DtMmdb/StyleSheet/Element.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Element.h b/cde/lib/DtMmdb/StyleSheet/Element.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Element.h
rename to cde/lib/DtMmdb/StyleSheet/Element.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C b/cde/lib/DtMmdb/StyleSheet/Expression.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.C
rename to cde/lib/DtMmdb/StyleSheet/Expression.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.h b/cde/lib/DtMmdb/StyleSheet/Expression.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Expression.h
rename to cde/lib/DtMmdb/StyleSheet/Expression.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Feature.C b/cde/lib/DtMmdb/StyleSheet/Feature.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Feature.C
rename to cde/lib/DtMmdb/StyleSheet/Feature.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Feature.h b/cde/lib/DtMmdb/StyleSheet/Feature.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Feature.h
rename to cde/lib/DtMmdb/StyleSheet/Feature.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureDefDictionary.C b/cde/lib/DtMmdb/StyleSheet/FeatureDefDictionary.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureDefDictionary.C
rename to cde/lib/DtMmdb/StyleSheet/FeatureDefDictionary.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureDefDictionary.h b/cde/lib/DtMmdb/StyleSheet/FeatureDefDictionary.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureDefDictionary.h
rename to cde/lib/DtMmdb/StyleSheet/FeatureDefDictionary.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C b/cde/lib/DtMmdb/StyleSheet/FeatureSet.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureSet.C
rename to cde/lib/DtMmdb/StyleSheet/FeatureSet.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C b/cde/lib/DtMmdb/StyleSheet/FeatureValue.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.C
rename to cde/lib/DtMmdb/StyleSheet/FeatureValue.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.h b/cde/lib/DtMmdb/StyleSheet/FeatureValue.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/FeatureValue.h
rename to cde/lib/DtMmdb/StyleSheet/FeatureValue.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am b/cde/lib/DtMmdb/StyleSheet/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
rename to cde/lib/DtMmdb/StyleSheet/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/PQTest.C b/cde/lib/DtMmdb/StyleSheet/PQTest.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/PQTest.C
rename to cde/lib/DtMmdb/StyleSheet/PQTest.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/ParserConst.h b/cde/lib/DtMmdb/StyleSheet/ParserConst.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/ParserConst.h
rename to cde/lib/DtMmdb/StyleSheet/ParserConst.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/PathQualifier.C b/cde/lib/DtMmdb/StyleSheet/PathQualifier.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/PathQualifier.C
rename to cde/lib/DtMmdb/StyleSheet/PathQualifier.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/PathQualifier.h b/cde/lib/DtMmdb/StyleSheet/PathQualifier.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/PathQualifier.h
rename to cde/lib/DtMmdb/StyleSheet/PathQualifier.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/PathTable.C b/cde/lib/DtMmdb/StyleSheet/PathTable.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/PathTable.C
rename to cde/lib/DtMmdb/StyleSheet/PathTable.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/PathTable.h b/cde/lib/DtMmdb/StyleSheet/PathTable.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/PathTable.h
rename to cde/lib/DtMmdb/StyleSheet/PathTable.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h b/cde/lib/DtMmdb/StyleSheet/Renderer.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h
rename to cde/lib/DtMmdb/StyleSheet/Renderer.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/RendererHCV.C b/cde/lib/DtMmdb/StyleSheet/RendererHCV.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/RendererHCV.C
rename to cde/lib/DtMmdb/StyleSheet/RendererHCV.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/RendererHCV.h b/cde/lib/DtMmdb/StyleSheet/RendererHCV.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/RendererHCV.h
rename to cde/lib/DtMmdb/StyleSheet/RendererHCV.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.C b/cde/lib/DtMmdb/StyleSheet/Resolver.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.C
rename to cde/lib/DtMmdb/StyleSheet/Resolver.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h b/cde/lib/DtMmdb/StyleSheet/Resolver.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h
rename to cde/lib/DtMmdb/StyleSheet/Resolver.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/ResolverStack.C b/cde/lib/DtMmdb/StyleSheet/ResolverStack.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/ResolverStack.C
rename to cde/lib/DtMmdb/StyleSheet/ResolverStack.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/ResolverStack.h b/cde/lib/DtMmdb/StyleSheet/ResolverStack.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/ResolverStack.h
rename to cde/lib/DtMmdb/StyleSheet/ResolverStack.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSPath.C b/cde/lib/DtMmdb/StyleSheet/SSPath.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/SSPath.C
rename to cde/lib/DtMmdb/StyleSheet/SSPath.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSPath.h b/cde/lib/DtMmdb/StyleSheet/SSPath.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/SSPath.h
rename to cde/lib/DtMmdb/StyleSheet/SSPath.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C b/cde/lib/DtMmdb/StyleSheet/SSTemplates.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/SSTemplates.C
rename to cde/lib/DtMmdb/StyleSheet/SSTemplates.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheet.C b/cde/lib/DtMmdb/StyleSheet/StyleSheet.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheet.C
rename to cde/lib/DtMmdb/StyleSheet/StyleSheet.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheet.h b/cde/lib/DtMmdb/StyleSheet/StyleSheet.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheet.h
rename to cde/lib/DtMmdb/StyleSheet/StyleSheet.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.C b/cde/lib/DtMmdb/StyleSheet/StyleSheetExceptions.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.C
rename to cde/lib/DtMmdb/StyleSheet/StyleSheetExceptions.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h b/cde/lib/DtMmdb/StyleSheet/StyleSheetExceptions.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h
rename to cde/lib/DtMmdb/StyleSheet/StyleSheetExceptions.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SymTab.C b/cde/lib/DtMmdb/StyleSheet/SymTab.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/SymTab.C
rename to cde/lib/DtMmdb/StyleSheet/SymTab.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/SymTab.h b/cde/lib/DtMmdb/StyleSheet/SymTab.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/SymTab.h
rename to cde/lib/DtMmdb/StyleSheet/SymTab.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Types.h b/cde/lib/DtMmdb/StyleSheet/Types.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/Types.h
rename to cde/lib/DtMmdb/StyleSheet/Types.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/VariableTable.C b/cde/lib/DtMmdb/StyleSheet/VariableTable.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/VariableTable.C
rename to cde/lib/DtMmdb/StyleSheet/VariableTable.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/VariableTable.h b/cde/lib/DtMmdb/StyleSheet/VariableTable.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/VariableTable.h
rename to cde/lib/DtMmdb/StyleSheet/VariableTable.h
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.yy b/cde/lib/DtMmdb/StyleSheet/defParser.yy
similarity index 98%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.yy
rename to cde/lib/DtMmdb/StyleSheet/defParser.yy
index 59b81dcdb..170fd87ae 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/defParser.yy
+++ b/cde/lib/DtMmdb/StyleSheet/defParser.yy
@@ -8,8 +8,6 @@
 #include "Debug.h"
 #include "FeatureDefDictionary.h"
 
-#define alloca(x)       (malloc(x))
-
 def_list_t* g_def_list = 0;
 
 extern void yyerror(char*);
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.ll b/cde/lib/DtMmdb/StyleSheet/defToken.ll
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/defToken.ll
rename to cde/lib/DtMmdb/StyleSheet/defToken.ll
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/docparser.C b/cde/lib/DtMmdb/StyleSheet/docparser.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/docparser.C
rename to cde/lib/DtMmdb/StyleSheet/docparser.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/evaluate.C b/cde/lib/DtMmdb/StyleSheet/evaluate.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/evaluate.C
rename to cde/lib/DtMmdb/StyleSheet/evaluate.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/evaluate.test.out b/cde/lib/DtMmdb/StyleSheet/evaluate.test.out
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/evaluate.test.out
rename to cde/lib/DtMmdb/StyleSheet/evaluate.test.out
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/feature.C b/cde/lib/DtMmdb/StyleSheet/feature.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/feature.C
rename to cde/lib/DtMmdb/StyleSheet/feature.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.yy b/cde/lib/DtMmdb/StyleSheet/style.yy
similarity index 99%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/style.yy
rename to cde/lib/DtMmdb/StyleSheet/style.yy
index e84d9d2b1..edebd94c1 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/style.yy
+++ b/cde/lib/DtMmdb/StyleSheet/style.yy
@@ -22,9 +22,6 @@
 #include "HardCopy/autoNumberFP.h"
 extern autoNumberFP gAutoNumberFP;
 
-
-#define alloca(x)       (malloc(x))
-
 extern void yyerror(char*);
 extern int yylex();
 
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/testparser.C b/cde/lib/DtMmdb/StyleSheet/testparser.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/testparser.C
rename to cde/lib/DtMmdb/StyleSheet/testparser.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/testsym.C b/cde/lib/DtMmdb/StyleSheet/testsym.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/testsym.C
rename to cde/lib/DtMmdb/StyleSheet/testsym.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.ll b/cde/lib/DtMmdb/StyleSheet/tokenStyle.ll
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/StyleSheet/tokenStyle.ll
rename to cde/lib/DtMmdb/StyleSheet/tokenStyle.ll
diff --git a/cde/programs/dtinfo/DtMmdb/api/Makefile.am b/cde/lib/DtMmdb/api/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/Makefile.am
rename to cde/lib/DtMmdb/api/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/api/base.C b/cde/lib/DtMmdb/api/base.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/base.C
rename to cde/lib/DtMmdb/api/base.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/base.h b/cde/lib/DtMmdb/api/base.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/base.h
rename to cde/lib/DtMmdb/api/base.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/db_oid.h b/cde/lib/DtMmdb/api/db_oid.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/db_oid.h
rename to cde/lib/DtMmdb/api/db_oid.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/info_base.C b/cde/lib/DtMmdb/api/info_base.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/info_base.C
rename to cde/lib/DtMmdb/api/info_base.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/info_base.h b/cde/lib/DtMmdb/api/info_base.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/info_base.h
rename to cde/lib/DtMmdb/api/info_base.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/info_lib.C b/cde/lib/DtMmdb/api/info_lib.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/info_lib.C
rename to cde/lib/DtMmdb/api/info_lib.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/info_lib.h b/cde/lib/DtMmdb/api/info_lib.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/info_lib.h
rename to cde/lib/DtMmdb/api/info_lib.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/server.C b/cde/lib/DtMmdb/api/server.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/server.C
rename to cde/lib/DtMmdb/api/server.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/server.h b/cde/lib/DtMmdb/api/server.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/server.h
rename to cde/lib/DtMmdb/api/server.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/smart_ptr.C b/cde/lib/DtMmdb/api/smart_ptr.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/smart_ptr.C
rename to cde/lib/DtMmdb/api/smart_ptr.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/smart_ptr.h b/cde/lib/DtMmdb/api/smart_ptr.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/smart_ptr.h
rename to cde/lib/DtMmdb/api/smart_ptr.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/transaction.C b/cde/lib/DtMmdb/api/transaction.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/transaction.C
rename to cde/lib/DtMmdb/api/transaction.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/transaction.h b/cde/lib/DtMmdb/api/transaction.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/transaction.h
rename to cde/lib/DtMmdb/api/transaction.h
diff --git a/cde/programs/dtinfo/DtMmdb/api/utility.C b/cde/lib/DtMmdb/api/utility.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/utility.C
rename to cde/lib/DtMmdb/api/utility.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/utility.h b/cde/lib/DtMmdb/api/utility.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/api/utility.h
rename to cde/lib/DtMmdb/api/utility.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree/Makefile.am b/cde/lib/DtMmdb/btree/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree/Makefile.am
rename to cde/lib/DtMmdb/btree/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.C b/cde/lib/DtMmdb/btree/mmdb_btree.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.C
rename to cde/lib/DtMmdb/btree/mmdb_btree.C
diff --git a/cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.h b/cde/lib/DtMmdb/btree/mmdb_btree.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree/mmdb_btree.h
rename to cde/lib/DtMmdb/btree/mmdb_btree.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/Makefile.am b/cde/lib/DtMmdb/btree_berkeley/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/Makefile.am
rename to cde/lib/DtMmdb/btree_berkeley/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_close.c b/cde/lib/DtMmdb/btree_berkeley/bt_close.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_close.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_close.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_conv.c b/cde/lib/DtMmdb/btree_berkeley/bt_conv.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_conv.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_conv.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_debug.c b/cde/lib/DtMmdb/btree_berkeley/bt_debug.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_debug.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_debug.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c b/cde/lib/DtMmdb/btree_berkeley/bt_delete.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_delete.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_delete.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c b/cde/lib/DtMmdb/btree_berkeley/bt_get.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_get.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_get.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_open.c b/cde/lib/DtMmdb/btree_berkeley/bt_open.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_open.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_open.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_overflow.c b/cde/lib/DtMmdb/btree_berkeley/bt_overflow.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_overflow.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_overflow.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_page.c b/cde/lib/DtMmdb/btree_berkeley/bt_page.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_page.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_page.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_put.c b/cde/lib/DtMmdb/btree_berkeley/bt_put.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_put.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_put.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c b/cde/lib/DtMmdb/btree_berkeley/bt_search.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_search.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_search.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_seq.c b/cde/lib/DtMmdb/btree_berkeley/bt_seq.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_seq.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_seq.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_split.c b/cde/lib/DtMmdb/btree_berkeley/bt_split.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_split.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_split.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_stack.c b/cde/lib/DtMmdb/btree_berkeley/bt_stack.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_stack.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_stack.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c b/cde/lib/DtMmdb/btree_berkeley/bt_utils.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/bt_utils.c
rename to cde/lib/DtMmdb/btree_berkeley/bt_utils.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/btree.h b/cde/lib/DtMmdb/btree_berkeley/btree.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/btree.h
rename to cde/lib/DtMmdb/btree_berkeley/btree.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/cdefs.h b/cde/lib/DtMmdb/btree_berkeley/cdefs.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/cdefs.h
rename to cde/lib/DtMmdb/btree_berkeley/cdefs.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/compat.h b/cde/lib/DtMmdb/btree_berkeley/compat.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/compat.h
rename to cde/lib/DtMmdb/btree_berkeley/compat.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/db.c b/cde/lib/DtMmdb/btree_berkeley/db.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/db.c
rename to cde/lib/DtMmdb/btree_berkeley/db.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/db.h b/cde/lib/DtMmdb/btree_berkeley/db.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/db.h
rename to cde/lib/DtMmdb/btree_berkeley/db.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/extern.h b/cde/lib/DtMmdb/btree_berkeley/extern.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/extern.h
rename to cde/lib/DtMmdb/btree_berkeley/extern.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c b/cde/lib/DtMmdb/btree_berkeley/memmove.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/memmove.c
rename to cde/lib/DtMmdb/btree_berkeley/memmove.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c b/cde/lib/DtMmdb/btree_berkeley/mktemp.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/mktemp.c
rename to cde/lib/DtMmdb/btree_berkeley/mktemp.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c b/cde/lib/DtMmdb/btree_berkeley/mpool.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.c
rename to cde/lib/DtMmdb/btree_berkeley/mpool.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.h b/cde/lib/DtMmdb/btree_berkeley/mpool.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/mpool.h
rename to cde/lib/DtMmdb/btree_berkeley/mpool.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/ndbm.h b/cde/lib/DtMmdb/btree_berkeley/ndbm.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/ndbm.h
rename to cde/lib/DtMmdb/btree_berkeley/ndbm.h
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/realloc.c b/cde/lib/DtMmdb/btree_berkeley/realloc.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/realloc.c
rename to cde/lib/DtMmdb/btree_berkeley/realloc.c
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/snprintf.c b/cde/lib/DtMmdb/btree_berkeley/snprintf.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/btree_berkeley/snprintf.c
rename to cde/lib/DtMmdb/btree_berkeley/snprintf.c
diff --git a/cde/programs/dtinfo/DtMmdb/compression/Makefile.am b/cde/lib/DtMmdb/compression/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/Makefile.am
rename to cde/lib/DtMmdb/compression/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/compression/abs_agent.C b/cde/lib/DtMmdb/compression/abs_agent.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/abs_agent.C
rename to cde/lib/DtMmdb/compression/abs_agent.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/abs_agent.h b/cde/lib/DtMmdb/compression/abs_agent.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/abs_agent.h
rename to cde/lib/DtMmdb/compression/abs_agent.h
diff --git a/cde/programs/dtinfo/DtMmdb/compression/code.C b/cde/lib/DtMmdb/compression/code.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/code.C
rename to cde/lib/DtMmdb/compression/code.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/code.h b/cde/lib/DtMmdb/compression/code.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/code.h
rename to cde/lib/DtMmdb/compression/code.h
diff --git a/cde/programs/dtinfo/DtMmdb/compression/huffman.C b/cde/lib/DtMmdb/compression/huffman.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/huffman.C
rename to cde/lib/DtMmdb/compression/huffman.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/huffman.h b/cde/lib/DtMmdb/compression/huffman.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/huffman.h
rename to cde/lib/DtMmdb/compression/huffman.h
diff --git a/cde/programs/dtinfo/DtMmdb/compression/lzss.C b/cde/lib/DtMmdb/compression/lzss.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/lzss.C
rename to cde/lib/DtMmdb/compression/lzss.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/lzss.h b/cde/lib/DtMmdb/compression/lzss.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/lzss.h
rename to cde/lib/DtMmdb/compression/lzss.h
diff --git a/cde/programs/dtinfo/DtMmdb/compression/ps.ll b/cde/lib/DtMmdb/compression/ps.ll
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/ps.ll
rename to cde/lib/DtMmdb/compression/ps.ll
diff --git a/cde/programs/dtinfo/DtMmdb/compression/sgml.ll b/cde/lib/DtMmdb/compression/sgml.ll
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/sgml.ll
rename to cde/lib/DtMmdb/compression/sgml.ll
diff --git a/cde/programs/dtinfo/DtMmdb/compression/trie.C b/cde/lib/DtMmdb/compression/trie.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/trie.C
rename to cde/lib/DtMmdb/compression/trie.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/trie.h b/cde/lib/DtMmdb/compression/trie.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/trie.h
rename to cde/lib/DtMmdb/compression/trie.h
diff --git a/cde/programs/dtinfo/DtMmdb/compression/zip.C b/cde/lib/DtMmdb/compression/zip.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/zip.C
rename to cde/lib/DtMmdb/compression/zip.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/zip.h b/cde/lib/DtMmdb/compression/zip.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/compression/zip.h
rename to cde/lib/DtMmdb/compression/zip.h
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am b/cde/lib/DtMmdb/diskhash/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am
rename to cde/lib/DtMmdb/diskhash/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/bucket_array.C b/cde/lib/DtMmdb/diskhash/bucket_array.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/bucket_array.C
rename to cde/lib/DtMmdb/diskhash/bucket_array.C
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/bucket_array.h b/cde/lib/DtMmdb/diskhash/bucket_array.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/bucket_array.h
rename to cde/lib/DtMmdb/diskhash/bucket_array.h
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/disk_bucket.C b/cde/lib/DtMmdb/diskhash/disk_bucket.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/disk_bucket.C
rename to cde/lib/DtMmdb/diskhash/disk_bucket.C
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/disk_bucket.h b/cde/lib/DtMmdb/diskhash/disk_bucket.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/disk_bucket.h
rename to cde/lib/DtMmdb/diskhash/disk_bucket.h
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.C b/cde/lib/DtMmdb/diskhash/disk_hash.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.C
rename to cde/lib/DtMmdb/diskhash/disk_hash.C
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.h b/cde/lib/DtMmdb/diskhash/disk_hash.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/diskhash/disk_hash.h
rename to cde/lib/DtMmdb/diskhash/disk_hash.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/Makefile.am b/cde/lib/DtMmdb/dstr/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/Makefile.am
rename to cde/lib/DtMmdb/dstr/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/bset.C b/cde/lib/DtMmdb/dstr/bset.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/bset.C
rename to cde/lib/DtMmdb/dstr/bset.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/bset.h b/cde/lib/DtMmdb/dstr/bset.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/bset.h
rename to cde/lib/DtMmdb/dstr/bset.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dlist.C b/cde/lib/DtMmdb/dstr/dlist.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dlist.C
rename to cde/lib/DtMmdb/dstr/dlist.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dlist.h b/cde/lib/DtMmdb/dstr/dlist.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dlist.h
rename to cde/lib/DtMmdb/dstr/dlist.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dlist_cell.C b/cde/lib/DtMmdb/dstr/dlist_cell.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dlist_cell.C
rename to cde/lib/DtMmdb/dstr/dlist_cell.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dlist_cell.h b/cde/lib/DtMmdb/dstr/dlist_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dlist_cell.h
rename to cde/lib/DtMmdb/dstr/dlist_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dlist_void_ptr_cell.h b/cde/lib/DtMmdb/dstr/dlist_void_ptr_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dlist_void_ptr_cell.h
rename to cde/lib/DtMmdb/dstr/dlist_void_ptr_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dstr_test.C b/cde/lib/DtMmdb/dstr/dstr_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dstr_test.C
rename to cde/lib/DtMmdb/dstr/dstr_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/dstr_test.h b/cde/lib/DtMmdb/dstr/dstr_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/dstr_test.h
rename to cde/lib/DtMmdb/dstr/dstr_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/heap.C b/cde/lib/DtMmdb/dstr/heap.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/heap.C
rename to cde/lib/DtMmdb/dstr/heap.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/heap.h b/cde/lib/DtMmdb/dstr/heap.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/heap.h
rename to cde/lib/DtMmdb/dstr/heap.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/index_agent.C b/cde/lib/DtMmdb/dstr/index_agent.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/index_agent.C
rename to cde/lib/DtMmdb/dstr/index_agent.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/index_agent.h b/cde/lib/DtMmdb/dstr/index_agent.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/index_agent.h
rename to cde/lib/DtMmdb/dstr/index_agent.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/memory_pool.C b/cde/lib/DtMmdb/dstr/memory_pool.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/memory_pool.C
rename to cde/lib/DtMmdb/dstr/memory_pool.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/memory_pool.h b/cde/lib/DtMmdb/dstr/memory_pool.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/memory_pool.h
rename to cde/lib/DtMmdb/dstr/memory_pool.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/set.C b/cde/lib/DtMmdb/dstr/set.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/set.C
rename to cde/lib/DtMmdb/dstr/set.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/set.h b/cde/lib/DtMmdb/dstr/set.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/set.h
rename to cde/lib/DtMmdb/dstr/set.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist.C b/cde/lib/DtMmdb/dstr/slist.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist.C
rename to cde/lib/DtMmdb/dstr/slist.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist.h b/cde/lib/DtMmdb/dstr/slist.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist.h
rename to cde/lib/DtMmdb/dstr/slist.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist_cell.h b/cde/lib/DtMmdb/dstr/slist_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist_cell.h
rename to cde/lib/DtMmdb/dstr/slist_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist_char_ptr_cell.C b/cde/lib/DtMmdb/dstr/slist_char_ptr_cell.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist_char_ptr_cell.C
rename to cde/lib/DtMmdb/dstr/slist_char_ptr_cell.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist_char_ptr_cell.h b/cde/lib/DtMmdb/dstr/slist_char_ptr_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist_char_ptr_cell.h
rename to cde/lib/DtMmdb/dstr/slist_char_ptr_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/slist_void_ptr_cell.h b/cde/lib/DtMmdb/dstr/slist_void_ptr_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/slist_void_ptr_cell.h
rename to cde/lib/DtMmdb/dstr/slist_void_ptr_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/token_stack.C b/cde/lib/DtMmdb/dstr/token_stack.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/token_stack.C
rename to cde/lib/DtMmdb/dstr/token_stack.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/token_stack.h b/cde/lib/DtMmdb/dstr/token_stack.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/token_stack.h
rename to cde/lib/DtMmdb/dstr/token_stack.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/void_ptr_array.C b/cde/lib/DtMmdb/dstr/void_ptr_array.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/void_ptr_array.C
rename to cde/lib/DtMmdb/dstr/void_ptr_array.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/void_ptr_array.h b/cde/lib/DtMmdb/dstr/void_ptr_array.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/void_ptr_array.h
rename to cde/lib/DtMmdb/dstr/void_ptr_array.h
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/void_ptr_stack.C b/cde/lib/DtMmdb/dstr/void_ptr_stack.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/void_ptr_stack.C
rename to cde/lib/DtMmdb/dstr/void_ptr_stack.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/void_ptr_stack.h b/cde/lib/DtMmdb/dstr/void_ptr_stack.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dstr/void_ptr_stack.h
rename to cde/lib/DtMmdb/dstr/void_ptr_stack.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C b/cde/lib/DtMmdb/dti_cc/CC_Dlist.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C
rename to cde/lib/DtMmdb/dti_cc/CC_Dlist.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.h b/cde/lib/DtMmdb/dti_cc/CC_Dlist.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.h
rename to cde/lib/DtMmdb/dti_cc/CC_Dlist.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C b/cde/lib/DtMmdb/dti_cc/CC_Listbase.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C
rename to cde/lib/DtMmdb/dti_cc/CC_Listbase.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.h b/cde/lib/DtMmdb/dti_cc/CC_Listbase.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.h
rename to cde/lib/DtMmdb/dti_cc/CC_Listbase.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Slist.C b/cde/lib/DtMmdb/dti_cc/CC_Slist.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Slist.C
rename to cde/lib/DtMmdb/dti_cc/CC_Slist.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Slist.h b/cde/lib/DtMmdb/dti_cc/CC_Slist.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Slist.h
rename to cde/lib/DtMmdb/dti_cc/CC_Slist.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.C b/cde/lib/DtMmdb/dti_cc/CC_Stack.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.C
rename to cde/lib/DtMmdb/dti_cc/CC_Stack.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h b/cde/lib/DtMmdb/dti_cc/CC_Stack.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h
rename to cde/lib/DtMmdb/dti_cc/CC_Stack.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_String.C b/cde/lib/DtMmdb/dti_cc/CC_String.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_String.C
rename to cde/lib/DtMmdb/dti_cc/CC_String.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_String.h b/cde/lib/DtMmdb/dti_cc/CC_String.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_String.h
rename to cde/lib/DtMmdb/dti_cc/CC_String.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Tokenizer.C b/cde/lib/DtMmdb/dti_cc/CC_Tokenizer.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Tokenizer.C
rename to cde/lib/DtMmdb/dti_cc/CC_Tokenizer.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Tokenizer.h b/cde/lib/DtMmdb/dti_cc/CC_Tokenizer.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/CC_Tokenizer.h
rename to cde/lib/DtMmdb/dti_cc/CC_Tokenizer.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am b/cde/lib/DtMmdb/dti_cc/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am
rename to cde/lib/DtMmdb/dti_cc/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.C b/cde/lib/DtMmdb/dti_cc/cc_exceptions.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.C
rename to cde/lib/DtMmdb/dti_cc/cc_exceptions.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h b/cde/lib/DtMmdb/dti_cc/cc_exceptions.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h
rename to cde/lib/DtMmdb/dti_cc/cc_exceptions.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C b/cde/lib/DtMmdb/dti_cc/cc_hdict.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C
rename to cde/lib/DtMmdb/dti_cc/cc_hdict.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.h b/cde/lib/DtMmdb/dti_cc/cc_hdict.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.h
rename to cde/lib/DtMmdb/dti_cc/cc_hdict.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C b/cde/lib/DtMmdb/dti_cc/cc_povec.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C
rename to cde/lib/DtMmdb/dti_cc/cc_povec.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.h b/cde/lib/DtMmdb/dti_cc/cc_povec.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.h
rename to cde/lib/DtMmdb/dti_cc/cc_povec.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C b/cde/lib/DtMmdb/dti_cc/cc_pvect.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C
rename to cde/lib/DtMmdb/dti_cc/cc_pvect.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.h b/cde/lib/DtMmdb/dti_cc/cc_pvect.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.h
rename to cde/lib/DtMmdb/dti_cc/cc_pvect.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C b/cde/lib/DtMmdb/dti_cc/cc_vvect.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C
rename to cde/lib/DtMmdb/dti_cc/cc_vvect.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.h b/cde/lib/DtMmdb/dti_cc/cc_vvect.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.h
rename to cde/lib/DtMmdb/dti_cc/cc_vvect.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/hdictinit.C b/cde/lib/DtMmdb/dti_cc/hdictinit.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/hdictinit.C
rename to cde/lib/DtMmdb/dti_cc/hdictinit.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/types.h b/cde/lib/DtMmdb/dti_cc/types.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/types.h
rename to cde/lib/DtMmdb/dti_cc/types.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/vectinit.C b/cde/lib/DtMmdb/dti_cc/vectinit.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_cc/vectinit.C
rename to cde/lib/DtMmdb/dti_cc/vectinit.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Destructable.C b/cde/lib/DtMmdb/dti_excs/Destructable.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Destructable.C
rename to cde/lib/DtMmdb/dti_excs/Destructable.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Destructable.hh b/cde/lib/DtMmdb/dti_excs/Destructable.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Destructable.hh
rename to cde/lib/DtMmdb/dti_excs/Destructable.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh b/cde/lib/DtMmdb/dti_excs/Destructable_il.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Destructable_il.hh
rename to cde/lib/DtMmdb/dti_excs/Destructable_il.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C b/cde/lib/DtMmdb/dti_excs/Exception.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Exception.C
rename to cde/lib/DtMmdb/dti_excs/Exception.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh b/cde/lib/DtMmdb/dti_excs/Exception.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Exception.hh
rename to cde/lib/DtMmdb/dti_excs/Exception.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.C b/cde/lib/DtMmdb/dti_excs/Exceptions.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.C
rename to cde/lib/DtMmdb/dti_excs/Exceptions.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh b/cde/lib/DtMmdb/dti_excs/Exceptions.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
rename to cde/lib/DtMmdb/dti_excs/Exceptions.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Jump_Environment.C b/cde/lib/DtMmdb/dti_excs/Jump_Environment.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Jump_Environment.C
rename to cde/lib/DtMmdb/dti_excs/Jump_Environment.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Jump_Environment.hh b/cde/lib/DtMmdb/dti_excs/Jump_Environment.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Jump_Environment.hh
rename to cde/lib/DtMmdb/dti_excs/Jump_Environment.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am b/cde/lib/DtMmdb/dti_excs/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am
rename to cde/lib/DtMmdb/dti_excs/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Unwind_Stack.hh b/cde/lib/DtMmdb/dti_excs/Unwind_Stack.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/Unwind_Stack.hh
rename to cde/lib/DtMmdb/dti_excs/Unwind_Stack.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/exception_init.h b/cde/lib/DtMmdb/dti_excs/exception_init.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/exception_init.h
rename to cde/lib/DtMmdb/dti_excs/exception_init.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/init.C b/cde/lib/DtMmdb/dti_excs/init.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/init.C
rename to cde/lib/DtMmdb/dti_excs/init.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/new_delete_simple.h b/cde/lib/DtMmdb/dti_excs/new_delete_simple.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/new_delete_simple.h
rename to cde/lib/DtMmdb/dti_excs/new_delete_simple.h
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/terminate.C b/cde/lib/DtMmdb/dti_excs/terminate.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/terminate.C
rename to cde/lib/DtMmdb/dti_excs/terminate.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/terminate.hh b/cde/lib/DtMmdb/dti_excs/terminate.hh
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dti_excs/terminate.hh
rename to cde/lib/DtMmdb/dti_excs/terminate.hh
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am b/cde/lib/DtMmdb/dynhash/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am
rename to cde/lib/DtMmdb/dynhash/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/bsearch.C b/cde/lib/DtMmdb/dynhash/bsearch.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/bsearch.C
rename to cde/lib/DtMmdb/dynhash/bsearch.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/bucket.C b/cde/lib/DtMmdb/dynhash/bucket.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/bucket.C
rename to cde/lib/DtMmdb/dynhash/bucket.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/bucket.h b/cde/lib/DtMmdb/dynhash/bucket.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/bucket.h
rename to cde/lib/DtMmdb/dynhash/bucket.h
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/data_t.C b/cde/lib/DtMmdb/dynhash/data_t.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/data_t.C
rename to cde/lib/DtMmdb/dynhash/data_t.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/data_t.h b/cde/lib/DtMmdb/dynhash/data_t.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/data_t.h
rename to cde/lib/DtMmdb/dynhash/data_t.h
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/imp_bucket.C b/cde/lib/DtMmdb/dynhash/imp_bucket.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/imp_bucket.C
rename to cde/lib/DtMmdb/dynhash/imp_bucket.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/imp_bucket.h b/cde/lib/DtMmdb/dynhash/imp_bucket.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/imp_bucket.h
rename to cde/lib/DtMmdb/dynhash/imp_bucket.h
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/imp_die.C b/cde/lib/DtMmdb/dynhash/imp_die.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/imp_die.C
rename to cde/lib/DtMmdb/dynhash/imp_die.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/imp_die.h b/cde/lib/DtMmdb/dynhash/imp_die.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/imp_die.h
rename to cde/lib/DtMmdb/dynhash/imp_die.h
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/linked_record.C b/cde/lib/DtMmdb/dynhash/linked_record.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/linked_record.C
rename to cde/lib/DtMmdb/dynhash/linked_record.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/linked_record.h b/cde/lib/DtMmdb/dynhash/linked_record.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/dynhash/linked_record.h
rename to cde/lib/DtMmdb/dynhash/linked_record.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am b/cde/lib/DtMmdb/hmphf/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am
rename to cde/lib/DtMmdb/hmphf/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/buckets.C b/cde/lib/DtMmdb/hmphf/buckets.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/buckets.C
rename to cde/lib/DtMmdb/hmphf/buckets.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/buckets.h b/cde/lib/DtMmdb/hmphf/buckets.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/buckets.h
rename to cde/lib/DtMmdb/hmphf/buckets.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/main.C b/cde/lib/DtMmdb/hmphf/main.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/main.C
rename to cde/lib/DtMmdb/hmphf/main.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/mphf_funcs.C b/cde/lib/DtMmdb/hmphf/mphf_funcs.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/mphf_funcs.C
rename to cde/lib/DtMmdb/hmphf/mphf_funcs.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/mphf_funcs.h b/cde/lib/DtMmdb/hmphf/mphf_funcs.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/mphf_funcs.h
rename to cde/lib/DtMmdb/hmphf/mphf_funcs.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/mphf_hash_table.C b/cde/lib/DtMmdb/hmphf/mphf_hash_table.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/mphf_hash_table.C
rename to cde/lib/DtMmdb/hmphf/mphf_hash_table.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/mphf_hash_table.h b/cde/lib/DtMmdb/hmphf/mphf_hash_table.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/mphf_hash_table.h
rename to cde/lib/DtMmdb/hmphf/mphf_hash_table.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/params.C b/cde/lib/DtMmdb/hmphf/params.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/params.C
rename to cde/lib/DtMmdb/hmphf/params.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/params.h b/cde/lib/DtMmdb/hmphf/params.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/params.h
rename to cde/lib/DtMmdb/hmphf/params.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/pattern.C b/cde/lib/DtMmdb/hmphf/pattern.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/pattern.C
rename to cde/lib/DtMmdb/hmphf/pattern.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/pattern.h b/cde/lib/DtMmdb/hmphf/pattern.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/pattern.h
rename to cde/lib/DtMmdb/hmphf/pattern.h
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/sorter.C b/cde/lib/DtMmdb/hmphf/sorter.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/sorter.C
rename to cde/lib/DtMmdb/hmphf/sorter.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/sorter.h b/cde/lib/DtMmdb/hmphf/sorter.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/hmphf/sorter.h
rename to cde/lib/DtMmdb/hmphf/sorter.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/Makefile.am b/cde/lib/DtMmdb/index/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/Makefile.am
rename to cde/lib/DtMmdb/index/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/index/btree_index.C b/cde/lib/DtMmdb/index/btree_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/btree_index.C
rename to cde/lib/DtMmdb/index/btree_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/btree_index.h b/cde/lib/DtMmdb/index/btree_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/btree_index.h
rename to cde/lib/DtMmdb/index/btree_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_disk_index.C b/cde/lib/DtMmdb/index/dyn_disk_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_disk_index.C
rename to cde/lib/DtMmdb/index/dyn_disk_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_disk_index.h b/cde/lib/DtMmdb/index/dyn_disk_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_disk_index.h
rename to cde/lib/DtMmdb/index/dyn_disk_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_index.C b/cde/lib/DtMmdb/index/dyn_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_index.C
rename to cde/lib/DtMmdb/index/dyn_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_index.h b/cde/lib/DtMmdb/index/dyn_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_index.h
rename to cde/lib/DtMmdb/index/dyn_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_memory_index.C b/cde/lib/DtMmdb/index/dyn_memory_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_memory_index.C
rename to cde/lib/DtMmdb/index/dyn_memory_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/dyn_memory_index.h b/cde/lib/DtMmdb/index/dyn_memory_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/dyn_memory_index.h
rename to cde/lib/DtMmdb/index/dyn_memory_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/fast_mphf.C b/cde/lib/DtMmdb/index/fast_mphf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/fast_mphf.C
rename to cde/lib/DtMmdb/index/fast_mphf.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/fast_mphf.h b/cde/lib/DtMmdb/index/fast_mphf.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/fast_mphf.h
rename to cde/lib/DtMmdb/index/fast_mphf.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/hash.C b/cde/lib/DtMmdb/index/hash.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/hash.C
rename to cde/lib/DtMmdb/index/hash.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/hash.h b/cde/lib/DtMmdb/index/hash.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/hash.h
rename to cde/lib/DtMmdb/index/hash.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/index.C b/cde/lib/DtMmdb/index/index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/index.C
rename to cde/lib/DtMmdb/index/index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/index.h b/cde/lib/DtMmdb/index/index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/index.h
rename to cde/lib/DtMmdb/index/index.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/inv_lists.C b/cde/lib/DtMmdb/index/inv_lists.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/inv_lists.C
rename to cde/lib/DtMmdb/index/inv_lists.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/inv_lists.h b/cde/lib/DtMmdb/index/inv_lists.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/inv_lists.h
rename to cde/lib/DtMmdb/index/inv_lists.h
diff --git a/cde/programs/dtinfo/DtMmdb/index/mphf_index.C b/cde/lib/DtMmdb/index/mphf_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/mphf_index.C
rename to cde/lib/DtMmdb/index/mphf_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/mphf_index.h b/cde/lib/DtMmdb/index/mphf_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/index/mphf_index.h
rename to cde/lib/DtMmdb/index/mphf_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am b/cde/lib/DtMmdb/mgrs/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am
rename to cde/lib/DtMmdb/mgrs/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/managers.C b/cde/lib/DtMmdb/mgrs/managers.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/managers.C
rename to cde/lib/DtMmdb/mgrs/managers.C
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/managers.h b/cde/lib/DtMmdb/mgrs/managers.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/managers.h
rename to cde/lib/DtMmdb/mgrs/managers.h
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/misc.C b/cde/lib/DtMmdb/mgrs/misc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/misc.C
rename to cde/lib/DtMmdb/mgrs/misc.C
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/misc.h b/cde/lib/DtMmdb/mgrs/misc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/misc.h
rename to cde/lib/DtMmdb/mgrs/misc.h
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/name_oid_t.h b/cde/lib/DtMmdb/mgrs/name_oid_t.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/name_oid_t.h
rename to cde/lib/DtMmdb/mgrs/name_oid_t.h
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/query_mgr.C b/cde/lib/DtMmdb/mgrs/query_mgr.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/query_mgr.C
rename to cde/lib/DtMmdb/mgrs/query_mgr.C
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/query_mgr.h b/cde/lib/DtMmdb/mgrs/query_mgr.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/query_mgr.h
rename to cde/lib/DtMmdb/mgrs/query_mgr.h
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C b/cde/lib/DtMmdb/mgrs/template_mgr.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.C
rename to cde/lib/DtMmdb/mgrs/template_mgr.C
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.h b/cde/lib/DtMmdb/mgrs/template_mgr.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/mgrs/template_mgr.h
rename to cde/lib/DtMmdb/mgrs/template_mgr.h
diff --git a/cde/programs/dtinfo/DtMmdb/misc/Makefile.am b/cde/lib/DtMmdb/misc/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/misc/Makefile.am
rename to cde/lib/DtMmdb/misc/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/misc/unique_id.c b/cde/lib/DtMmdb/misc/unique_id.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/misc/unique_id.c
rename to cde/lib/DtMmdb/misc/unique_id.c
diff --git a/cde/programs/dtinfo/DtMmdb/misc/unique_id.h b/cde/lib/DtMmdb/misc/unique_id.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/misc/unique_id.h
rename to cde/lib/DtMmdb/misc/unique_id.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/Makefile.am b/cde/lib/DtMmdb/object/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/Makefile.am
rename to cde/lib/DtMmdb/object/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/object/c_codes.h b/cde/lib/DtMmdb/object/c_codes.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/c_codes.h
rename to cde/lib/DtMmdb/object/c_codes.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/composite.C b/cde/lib/DtMmdb/object/composite.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/composite.C
rename to cde/lib/DtMmdb/object/composite.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/composite.h b/cde/lib/DtMmdb/object/composite.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/composite.h
rename to cde/lib/DtMmdb/object/composite.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/compressed_pstring.C b/cde/lib/DtMmdb/object/compressed_pstring.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/compressed_pstring.C
rename to cde/lib/DtMmdb/object/compressed_pstring.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/compressed_pstring.h b/cde/lib/DtMmdb/object/compressed_pstring.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/compressed_pstring.h
rename to cde/lib/DtMmdb/object/compressed_pstring.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/convert.C b/cde/lib/DtMmdb/object/convert.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/convert.C
rename to cde/lib/DtMmdb/object/convert.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/cset.C b/cde/lib/DtMmdb/object/cset.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/cset.C
rename to cde/lib/DtMmdb/object/cset.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/cset.h b/cde/lib/DtMmdb/object/cset.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/cset.h
rename to cde/lib/DtMmdb/object/cset.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/db_new.h b/cde/lib/DtMmdb/object/db_new.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/db_new.h
rename to cde/lib/DtMmdb/object/db_new.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/dl_list.C b/cde/lib/DtMmdb/object/dl_list.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/dl_list.C
rename to cde/lib/DtMmdb/object/dl_list.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/dl_list.h b/cde/lib/DtMmdb/object/dl_list.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/dl_list.h
rename to cde/lib/DtMmdb/object/dl_list.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/dl_list_cell.C b/cde/lib/DtMmdb/object/dl_list_cell.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/dl_list_cell.C
rename to cde/lib/DtMmdb/object/dl_list_cell.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/dl_list_cell.h b/cde/lib/DtMmdb/object/dl_list_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/dl_list_cell.h
rename to cde/lib/DtMmdb/object/dl_list_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/handler.C b/cde/lib/DtMmdb/object/handler.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/handler.C
rename to cde/lib/DtMmdb/object/handler.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/handler.h b/cde/lib/DtMmdb/object/handler.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/handler.h
rename to cde/lib/DtMmdb/object/handler.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/integer.C b/cde/lib/DtMmdb/object/integer.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/integer.C
rename to cde/lib/DtMmdb/object/integer.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/integer.h b/cde/lib/DtMmdb/object/integer.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/integer.h
rename to cde/lib/DtMmdb/object/integer.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/long_pstring.C b/cde/lib/DtMmdb/object/long_pstring.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/long_pstring.C
rename to cde/lib/DtMmdb/object/long_pstring.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/long_pstring.h b/cde/lib/DtMmdb/object/long_pstring.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/long_pstring.h
rename to cde/lib/DtMmdb/object/long_pstring.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/new_delete.h b/cde/lib/DtMmdb/object/new_delete.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/new_delete.h
rename to cde/lib/DtMmdb/object/new_delete.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid.C b/cde/lib/DtMmdb/object/oid.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid.C
rename to cde/lib/DtMmdb/object/oid.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid.h b/cde/lib/DtMmdb/object/oid.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid.h
rename to cde/lib/DtMmdb/object/oid.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid_list.C b/cde/lib/DtMmdb/object/oid_list.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid_list.C
rename to cde/lib/DtMmdb/object/oid_list.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid_list.h b/cde/lib/DtMmdb/object/oid_list.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid_list.h
rename to cde/lib/DtMmdb/object/oid_list.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid_t.C b/cde/lib/DtMmdb/object/oid_t.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid_t.C
rename to cde/lib/DtMmdb/object/oid_t.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/oid_t.h b/cde/lib/DtMmdb/object/oid_t.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/oid_t.h
rename to cde/lib/DtMmdb/object/oid_t.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/primitive.C b/cde/lib/DtMmdb/object/primitive.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/primitive.C
rename to cde/lib/DtMmdb/object/primitive.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/primitive.h b/cde/lib/DtMmdb/object/primitive.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/primitive.h
rename to cde/lib/DtMmdb/object/primitive.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/pstring.C b/cde/lib/DtMmdb/object/pstring.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/pstring.C
rename to cde/lib/DtMmdb/object/pstring.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/pstring.h b/cde/lib/DtMmdb/object/pstring.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/pstring.h
rename to cde/lib/DtMmdb/object/pstring.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/random_gen.C b/cde/lib/DtMmdb/object/random_gen.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/random_gen.C
rename to cde/lib/DtMmdb/object/random_gen.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/random_gen.h b/cde/lib/DtMmdb/object/random_gen.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/random_gen.h
rename to cde/lib/DtMmdb/object/random_gen.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/root.C b/cde/lib/DtMmdb/object/root.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/root.C
rename to cde/lib/DtMmdb/object/root.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/root.h b/cde/lib/DtMmdb/object/root.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/root.h
rename to cde/lib/DtMmdb/object/root.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/short_list.C b/cde/lib/DtMmdb/object/short_list.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/short_list.C
rename to cde/lib/DtMmdb/object/short_list.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/short_list.h b/cde/lib/DtMmdb/object/short_list.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/short_list.h
rename to cde/lib/DtMmdb/object/short_list.h
diff --git a/cde/programs/dtinfo/DtMmdb/object/tuple.C b/cde/lib/DtMmdb/object/tuple.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/tuple.C
rename to cde/lib/DtMmdb/object/tuple.C
diff --git a/cde/programs/dtinfo/DtMmdb/object/tuple.h b/cde/lib/DtMmdb/object/tuple.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/object/tuple.h
rename to cde/lib/DtMmdb/object/tuple.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/DtMmdb.h b/cde/lib/DtMmdb/oliasdb/DtMmdb.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/DtMmdb.h
rename to cde/lib/DtMmdb/oliasdb/DtMmdb.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/lib/DtMmdb/oliasdb/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
rename to cde/lib/DtMmdb/oliasdb/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/asciiIn_filters.C b/cde/lib/DtMmdb/oliasdb/asciiIn_filters.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/asciiIn_filters.C
rename to cde/lib/DtMmdb/oliasdb/asciiIn_filters.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/asciiIn_filters.h b/cde/lib/DtMmdb/oliasdb/asciiIn_filters.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/asciiIn_filters.h
rename to cde/lib/DtMmdb/oliasdb/asciiIn_filters.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api.C b/cde/lib/DtMmdb/oliasdb/c_api.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api.C
rename to cde/lib/DtMmdb/oliasdb/c_api.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_book.C b/cde/lib/DtMmdb/oliasdb/c_api_book.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_book.C
rename to cde/lib/DtMmdb/oliasdb/c_api_book.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_book_test.C b/cde/lib/DtMmdb/oliasdb/c_api_book_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_book_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_book_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_bookcase.C b/cde/lib/DtMmdb/oliasdb/c_api_bookcase.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_bookcase.C
rename to cde/lib/DtMmdb/oliasdb/c_api_bookcase.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_bookcase_test.C b/cde/lib/DtMmdb/oliasdb/c_api_bookcase_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_bookcase_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_bookcase_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.C b/cde/lib/DtMmdb/oliasdb/c_api_common.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.C
rename to cde/lib/DtMmdb/oliasdb/c_api_common.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.h b/cde/lib/DtMmdb/oliasdb/c_api_common.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_common.h
rename to cde/lib/DtMmdb/oliasdb/c_api_common.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_dlp.C b/cde/lib/DtMmdb/oliasdb/c_api_dlp.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_dlp.C
rename to cde/lib/DtMmdb/oliasdb/c_api_dlp.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_dlp_test.C b/cde/lib/DtMmdb/oliasdb/c_api_dlp_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_dlp_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_dlp_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_graphic.C b/cde/lib/DtMmdb/oliasdb/c_api_graphic.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_graphic.C
rename to cde/lib/DtMmdb/oliasdb/c_api_graphic.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_graphic_test.C b/cde/lib/DtMmdb/oliasdb/c_api_graphic_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_graphic_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_graphic_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_infolib.C b/cde/lib/DtMmdb/oliasdb/c_api_infolib.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_infolib.C
rename to cde/lib/DtMmdb/oliasdb/c_api_infolib.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_infolib_test.C b/cde/lib/DtMmdb/oliasdb/c_api_infolib_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_infolib_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_infolib_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_locator.C b/cde/lib/DtMmdb/oliasdb/c_api_locator.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_locator.C
rename to cde/lib/DtMmdb/oliasdb/c_api_locator.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_locator_test.C b/cde/lib/DtMmdb/oliasdb/c_api_locator_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_locator_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_locator_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_pure_virtual.C b/cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_pure_virtual.C
rename to cde/lib/DtMmdb/oliasdb/c_api_pure_virtual.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_section.C b/cde/lib/DtMmdb/oliasdb/c_api_section.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_section.C
rename to cde/lib/DtMmdb/oliasdb/c_api_section.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_section_test.C b/cde/lib/DtMmdb/oliasdb/c_api_section_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_section_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_section_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_stylesheet.C b/cde/lib/DtMmdb/oliasdb/c_api_stylesheet.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_stylesheet.C
rename to cde/lib/DtMmdb/oliasdb/c_api_stylesheet.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_stylesheet_test.C b/cde/lib/DtMmdb/oliasdb/c_api_stylesheet_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_stylesheet_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_stylesheet_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_test.C b/cde/lib/DtMmdb/oliasdb/c_api_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_toc.C b/cde/lib/DtMmdb/oliasdb/c_api_toc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_toc.C
rename to cde/lib/DtMmdb/oliasdb/c_api_toc.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/c_api_toc_test.C b/cde/lib/DtMmdb/oliasdb/c_api_toc_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/c_api_toc_test.C
rename to cde/lib/DtMmdb/oliasdb/c_api_toc_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/collectionIterator.C b/cde/lib/DtMmdb/oliasdb/collectionIterator.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/collectionIterator.C
rename to cde/lib/DtMmdb/oliasdb/collectionIterator.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/collectionIterator.h b/cde/lib/DtMmdb/oliasdb/collectionIterator.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/collectionIterator.h
rename to cde/lib/DtMmdb/oliasdb/collectionIterator.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/dlp_hd.C b/cde/lib/DtMmdb/oliasdb/dlp_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/dlp_hd.C
rename to cde/lib/DtMmdb/oliasdb/dlp_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/dlp_hd.h b/cde/lib/DtMmdb/oliasdb/dlp_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/dlp_hd.h
rename to cde/lib/DtMmdb/oliasdb/dlp_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/dlp_test.C b/cde/lib/DtMmdb/oliasdb/dlp_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/dlp_test.C
rename to cde/lib/DtMmdb/oliasdb/dlp_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/dlp_test.h b/cde/lib/DtMmdb/oliasdb/dlp_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/dlp_test.h
rename to cde/lib/DtMmdb/oliasdb/dlp_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.C b/cde/lib/DtMmdb/oliasdb/doc_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.C
rename to cde/lib/DtMmdb/oliasdb/doc_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h b/cde/lib/DtMmdb/oliasdb/doc_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/doc_hd.h
rename to cde/lib/DtMmdb/oliasdb/doc_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_test.C b/cde/lib/DtMmdb/oliasdb/doc_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/doc_test.C
rename to cde/lib/DtMmdb/oliasdb/doc_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/doc_test.h b/cde/lib/DtMmdb/oliasdb/doc_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/doc_test.h
rename to cde/lib/DtMmdb/oliasdb/doc_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.C b/cde/lib/DtMmdb/oliasdb/graphic_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.C
rename to cde/lib/DtMmdb/oliasdb/graphic_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h b/cde/lib/DtMmdb/oliasdb/graphic_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/graphic_hd.h
rename to cde/lib/DtMmdb/oliasdb/graphic_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_test.C b/cde/lib/DtMmdb/oliasdb/graphic_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/graphic_test.C
rename to cde/lib/DtMmdb/oliasdb/graphic_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/graphic_test.h b/cde/lib/DtMmdb/oliasdb/graphic_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/graphic_test.h
rename to cde/lib/DtMmdb/oliasdb/graphic_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/loc_test.C b/cde/lib/DtMmdb/oliasdb/loc_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/loc_test.C
rename to cde/lib/DtMmdb/oliasdb/loc_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/loc_test.h b/cde/lib/DtMmdb/oliasdb/loc_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/loc_test.h
rename to cde/lib/DtMmdb/oliasdb/loc_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C b/cde/lib/DtMmdb/oliasdb/locator_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.C
rename to cde/lib/DtMmdb/oliasdb/locator_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h b/cde/lib/DtMmdb/oliasdb/locator_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/locator_hd.h
rename to cde/lib/DtMmdb/oliasdb/locator_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.C b/cde/lib/DtMmdb/oliasdb/mark.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark.C
rename to cde/lib/DtMmdb/oliasdb/mark.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark.h b/cde/lib/DtMmdb/oliasdb/mark.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark.h
rename to cde/lib/DtMmdb/oliasdb/mark.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark_base.C b/cde/lib/DtMmdb/oliasdb/mark_base.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark_base.C
rename to cde/lib/DtMmdb/oliasdb/mark_base.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark_base.h b/cde/lib/DtMmdb/oliasdb/mark_base.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark_base.h
rename to cde/lib/DtMmdb/oliasdb/mark_base.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark_test.C b/cde/lib/DtMmdb/oliasdb/mark_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark_test.C
rename to cde/lib/DtMmdb/oliasdb/mark_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mark_test.h b/cde/lib/DtMmdb/oliasdb/mark_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mark_test.h
rename to cde/lib/DtMmdb/oliasdb/mark_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.C b/cde/lib/DtMmdb/oliasdb/mmdb.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.C
rename to cde/lib/DtMmdb/oliasdb/mmdb.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.h b/cde/lib/DtMmdb/oliasdb/mmdb.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/mmdb.h
rename to cde/lib/DtMmdb/oliasdb/mmdb.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.C b/cde/lib/DtMmdb/oliasdb/node_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.C
rename to cde/lib/DtMmdb/oliasdb/node_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h b/cde/lib/DtMmdb/oliasdb/node_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/node_hd.h
rename to cde/lib/DtMmdb/oliasdb/node_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/node_test.C b/cde/lib/DtMmdb/oliasdb/node_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/node_test.C
rename to cde/lib/DtMmdb/oliasdb/node_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/node_test.h b/cde/lib/DtMmdb/oliasdb/node_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/node_test.h
rename to cde/lib/DtMmdb/oliasdb/node_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_consts.h b/cde/lib/DtMmdb/oliasdb/olias_consts.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_consts.h
rename to cde/lib/DtMmdb/oliasdb/olias_consts.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_funcs.C b/cde/lib/DtMmdb/oliasdb/olias_funcs.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_funcs.C
rename to cde/lib/DtMmdb/oliasdb/olias_funcs.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_funcs.h b/cde/lib/DtMmdb/oliasdb/olias_funcs.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_funcs.h
rename to cde/lib/DtMmdb/oliasdb/olias_funcs.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_server.C b/cde/lib/DtMmdb/oliasdb/olias_server.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_server.C
rename to cde/lib/DtMmdb/oliasdb/olias_server.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_server.h b/cde/lib/DtMmdb/oliasdb/olias_server.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_server.h
rename to cde/lib/DtMmdb/oliasdb/olias_server.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_test.C b/cde/lib/DtMmdb/oliasdb/olias_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_test.C
rename to cde/lib/DtMmdb/oliasdb/olias_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/olias_test.h b/cde/lib/DtMmdb/oliasdb/olias_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/olias_test.h
rename to cde/lib/DtMmdb/oliasdb/olias_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/pref.C b/cde/lib/DtMmdb/oliasdb/pref.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/pref.C
rename to cde/lib/DtMmdb/oliasdb/pref.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/pref.h b/cde/lib/DtMmdb/oliasdb/pref.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/pref.h
rename to cde/lib/DtMmdb/oliasdb/pref.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/pref_base.C b/cde/lib/DtMmdb/oliasdb/pref_base.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/pref_base.C
rename to cde/lib/DtMmdb/oliasdb/pref_base.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/pref_base.h b/cde/lib/DtMmdb/oliasdb/pref_base.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/pref_base.h
rename to cde/lib/DtMmdb/oliasdb/pref_base.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.C b/cde/lib/DtMmdb/oliasdb/stylesheet_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.C
rename to cde/lib/DtMmdb/oliasdb/stylesheet_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h b/cde/lib/DtMmdb/oliasdb/stylesheet_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_hd.h
rename to cde/lib/DtMmdb/oliasdb/stylesheet_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_test.C b/cde/lib/DtMmdb/oliasdb/stylesheet_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_test.C
rename to cde/lib/DtMmdb/oliasdb/stylesheet_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_test.h b/cde/lib/DtMmdb/oliasdb/stylesheet_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/stylesheet_test.h
rename to cde/lib/DtMmdb/oliasdb/stylesheet_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.C b/cde/lib/DtMmdb/oliasdb/toc_hd.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.C
rename to cde/lib/DtMmdb/oliasdb/toc_hd.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h b/cde/lib/DtMmdb/oliasdb/toc_hd.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/toc_hd.h
rename to cde/lib/DtMmdb/oliasdb/toc_hd.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_test.C b/cde/lib/DtMmdb/oliasdb/toc_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/toc_test.C
rename to cde/lib/DtMmdb/oliasdb/toc_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/toc_test.h b/cde/lib/DtMmdb/oliasdb/toc_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/toc_test.h
rename to cde/lib/DtMmdb/oliasdb/toc_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/user_base.C b/cde/lib/DtMmdb/oliasdb/user_base.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/user_base.C
rename to cde/lib/DtMmdb/oliasdb/user_base.C
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/user_base.h b/cde/lib/DtMmdb/oliasdb/user_base.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/user_base.h
rename to cde/lib/DtMmdb/oliasdb/user_base.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/user_config.h b/cde/lib/DtMmdb/oliasdb/user_config.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/user_config.h
rename to cde/lib/DtMmdb/oliasdb/user_config.h
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/user_mark.h b/cde/lib/DtMmdb/oliasdb/user_mark.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/oliasdb/user_mark.h
rename to cde/lib/DtMmdb/oliasdb/user_mark.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/Makefile.am b/cde/lib/DtMmdb/schema/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/Makefile.am
rename to cde/lib/DtMmdb/schema/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/schema/agent_desc.C b/cde/lib/DtMmdb/schema/agent_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/agent_desc.C
rename to cde/lib/DtMmdb/schema/agent_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/agent_desc.h b/cde/lib/DtMmdb/schema/agent_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/agent_desc.h
rename to cde/lib/DtMmdb/schema/agent_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/container_desc.C b/cde/lib/DtMmdb/schema/container_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/container_desc.C
rename to cde/lib/DtMmdb/schema/container_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/container_desc.h b/cde/lib/DtMmdb/schema/container_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/container_desc.h
rename to cde/lib/DtMmdb/schema/container_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/desc.C b/cde/lib/DtMmdb/schema/desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/desc.C
rename to cde/lib/DtMmdb/schema/desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/desc.h b/cde/lib/DtMmdb/schema/desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/desc.h
rename to cde/lib/DtMmdb/schema/desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/hash_desc.C b/cde/lib/DtMmdb/schema/hash_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/hash_desc.C
rename to cde/lib/DtMmdb/schema/hash_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/hash_desc.h b/cde/lib/DtMmdb/schema/hash_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/hash_desc.h
rename to cde/lib/DtMmdb/schema/hash_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/index_desc.C b/cde/lib/DtMmdb/schema/index_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/index_desc.C
rename to cde/lib/DtMmdb/schema/index_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/index_desc.h b/cde/lib/DtMmdb/schema/index_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/index_desc.h
rename to cde/lib/DtMmdb/schema/index_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/inv_desc.C b/cde/lib/DtMmdb/schema/inv_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/inv_desc.C
rename to cde/lib/DtMmdb/schema/inv_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/inv_desc.h b/cde/lib/DtMmdb/schema/inv_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/inv_desc.h
rename to cde/lib/DtMmdb/schema/inv_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/main.C b/cde/lib/DtMmdb/schema/main.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/main.C
rename to cde/lib/DtMmdb/schema/main.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/object_dict.C b/cde/lib/DtMmdb/schema/object_dict.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/object_dict.C
rename to cde/lib/DtMmdb/schema/object_dict.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/object_dict.h b/cde/lib/DtMmdb/schema/object_dict.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/object_dict.h
rename to cde/lib/DtMmdb/schema/object_dict.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/sheet.yy b/cde/lib/DtMmdb/schema/sheet.yy
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/sheet.yy
rename to cde/lib/DtMmdb/schema/sheet.yy
diff --git a/cde/programs/dtinfo/DtMmdb/schema/store_desc.C b/cde/lib/DtMmdb/schema/store_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/store_desc.C
rename to cde/lib/DtMmdb/schema/store_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/store_desc.h b/cde/lib/DtMmdb/schema/store_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/store_desc.h
rename to cde/lib/DtMmdb/schema/store_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/stored_object_desc.C b/cde/lib/DtMmdb/schema/stored_object_desc.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/stored_object_desc.C
rename to cde/lib/DtMmdb/schema/stored_object_desc.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/stored_object_desc.h b/cde/lib/DtMmdb/schema/stored_object_desc.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/stored_object_desc.h
rename to cde/lib/DtMmdb/schema/stored_object_desc.h
diff --git a/cde/programs/dtinfo/DtMmdb/schema/token.ll b/cde/lib/DtMmdb/schema/token.ll
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/schema/token.ll
rename to cde/lib/DtMmdb/schema/token.ll
diff --git a/cde/programs/dtinfo/DtMmdb/storage/Makefile.am b/cde/lib/DtMmdb/storage/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/Makefile.am
rename to cde/lib/DtMmdb/storage/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/storage/abs_storage.C b/cde/lib/DtMmdb/storage/abs_storage.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/abs_storage.C
rename to cde/lib/DtMmdb/storage/abs_storage.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/abs_storage.h b/cde/lib/DtMmdb/storage/abs_storage.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/abs_storage.h
rename to cde/lib/DtMmdb/storage/abs_storage.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/chunks_index.C b/cde/lib/DtMmdb/storage/chunks_index.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/chunks_index.C
rename to cde/lib/DtMmdb/storage/chunks_index.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/chunks_index.h b/cde/lib/DtMmdb/storage/chunks_index.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/chunks_index.h
rename to cde/lib/DtMmdb/storage/chunks_index.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.C b/cde/lib/DtMmdb/storage/heap_comp_funcs.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.C
rename to cde/lib/DtMmdb/storage/heap_comp_funcs.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.h b/cde/lib/DtMmdb/storage/heap_comp_funcs.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/heap_comp_funcs.h
rename to cde/lib/DtMmdb/storage/heap_comp_funcs.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/lru.C b/cde/lib/DtMmdb/storage/lru.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/lru.C
rename to cde/lib/DtMmdb/storage/lru.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/lru.h b/cde/lib/DtMmdb/storage/lru.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/lru.h
rename to cde/lib/DtMmdb/storage/lru.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page.C b/cde/lib/DtMmdb/storage/page.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page.C
rename to cde/lib/DtMmdb/storage/page.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page.h b/cde/lib/DtMmdb/storage/page.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page.h
rename to cde/lib/DtMmdb/storage/page.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_cache.C b/cde/lib/DtMmdb/storage/page_cache.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_cache.C
rename to cde/lib/DtMmdb/storage/page_cache.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_cache.h b/cde/lib/DtMmdb/storage/page_cache.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_cache.h
rename to cde/lib/DtMmdb/storage/page_cache.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_rep.C b/cde/lib/DtMmdb/storage/page_rep.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_rep.C
rename to cde/lib/DtMmdb/storage/page_rep.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_rep.h b/cde/lib/DtMmdb/storage/page_rep.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_rep.h
rename to cde/lib/DtMmdb/storage/page_rep.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_storage.C b/cde/lib/DtMmdb/storage/page_storage.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_storage.C
rename to cde/lib/DtMmdb/storage/page_storage.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/page_storage.h b/cde/lib/DtMmdb/storage/page_storage.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/page_storage.h
rename to cde/lib/DtMmdb/storage/page_storage.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/pool.C b/cde/lib/DtMmdb/storage/pool.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/pool.C
rename to cde/lib/DtMmdb/storage/pool.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/rep_cell.C b/cde/lib/DtMmdb/storage/rep_cell.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/rep_cell.C
rename to cde/lib/DtMmdb/storage/rep_cell.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/rep_cell.h b/cde/lib/DtMmdb/storage/rep_cell.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/rep_cell.h
rename to cde/lib/DtMmdb/storage/rep_cell.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/rep_policy.C b/cde/lib/DtMmdb/storage/rep_policy.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/rep_policy.C
rename to cde/lib/DtMmdb/storage/rep_policy.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/rep_policy.h b/cde/lib/DtMmdb/storage/rep_policy.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/rep_policy.h
rename to cde/lib/DtMmdb/storage/rep_policy.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/spointer.h b/cde/lib/DtMmdb/storage/spointer.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/spointer.h
rename to cde/lib/DtMmdb/storage/spointer.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/storage.h b/cde/lib/DtMmdb/storage/storage.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/storage.h
rename to cde/lib/DtMmdb/storage/storage.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/store_test.C b/cde/lib/DtMmdb/storage/store_test.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/store_test.C
rename to cde/lib/DtMmdb/storage/store_test.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/store_test.h b/cde/lib/DtMmdb/storage/store_test.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/store_test.h
rename to cde/lib/DtMmdb/storage/store_test.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/unixf_storage.C b/cde/lib/DtMmdb/storage/unixf_storage.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/unixf_storage.C
rename to cde/lib/DtMmdb/storage/unixf_storage.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/unixf_storage.h b/cde/lib/DtMmdb/storage/unixf_storage.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/unixf_storage.h
rename to cde/lib/DtMmdb/storage/unixf_storage.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/version.C b/cde/lib/DtMmdb/storage/version.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/version.C
rename to cde/lib/DtMmdb/storage/version.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/version.h b/cde/lib/DtMmdb/storage/version.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/version.h
rename to cde/lib/DtMmdb/storage/version.h
diff --git a/cde/programs/dtinfo/DtMmdb/storage/vm_storage.C b/cde/lib/DtMmdb/storage/vm_storage.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/vm_storage.C
rename to cde/lib/DtMmdb/storage/vm_storage.C
diff --git a/cde/programs/dtinfo/DtMmdb/storage/vm_storage.h b/cde/lib/DtMmdb/storage/vm_storage.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/storage/vm_storage.h
rename to cde/lib/DtMmdb/storage/vm_storage.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/Makefile.am b/cde/lib/DtMmdb/utility/Makefile.am
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/Makefile.am
rename to cde/lib/DtMmdb/utility/Makefile.am
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_fast.C b/cde/lib/DtMmdb/utility/atoi_fast.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_fast.C
rename to cde/lib/DtMmdb/utility/atoi_fast.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_fast.h b/cde/lib/DtMmdb/utility/atoi_fast.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_fast.h
rename to cde/lib/DtMmdb/utility/atoi_fast.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_larson.C b/cde/lib/DtMmdb/utility/atoi_larson.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_larson.C
rename to cde/lib/DtMmdb/utility/atoi_larson.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_larson.h b/cde/lib/DtMmdb/utility/atoi_larson.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_larson.h
rename to cde/lib/DtMmdb/utility/atoi_larson.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_pearson.C b/cde/lib/DtMmdb/utility/atoi_pearson.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_pearson.C
rename to cde/lib/DtMmdb/utility/atoi_pearson.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atoi_pearson.h b/cde/lib/DtMmdb/utility/atoi_pearson.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atoi_pearson.h
rename to cde/lib/DtMmdb/utility/atoi_pearson.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atomic_lock.C b/cde/lib/DtMmdb/utility/atomic_lock.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atomic_lock.C
rename to cde/lib/DtMmdb/utility/atomic_lock.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/atomic_lock.h b/cde/lib/DtMmdb/utility/atomic_lock.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/atomic_lock.h
rename to cde/lib/DtMmdb/utility/atomic_lock.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/buffer.C b/cde/lib/DtMmdb/utility/buffer.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/buffer.C
rename to cde/lib/DtMmdb/utility/buffer.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/buffer.h b/cde/lib/DtMmdb/utility/buffer.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/buffer.h
rename to cde/lib/DtMmdb/utility/buffer.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_charbuf.h b/cde/lib/DtMmdb/utility/c_charbuf.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_charbuf.h
rename to cde/lib/DtMmdb/utility/c_charbuf.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_filebuf.h b/cde/lib/DtMmdb/utility/c_filebuf.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_filebuf.h
rename to cde/lib/DtMmdb/utility/c_filebuf.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_fstream.h b/cde/lib/DtMmdb/utility/c_fstream.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_fstream.h
rename to cde/lib/DtMmdb/utility/c_fstream.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_ios.h b/cde/lib/DtMmdb/utility/c_ios.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_ios.h
rename to cde/lib/DtMmdb/utility/c_ios.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_iostream.h b/cde/lib/DtMmdb/utility/c_iostream.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_iostream.h
rename to cde/lib/DtMmdb/utility/c_iostream.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_stream.h b/cde/lib/DtMmdb/utility/c_stream.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_stream.h
rename to cde/lib/DtMmdb/utility/c_stream.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_streambuf.h b/cde/lib/DtMmdb/utility/c_streambuf.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_streambuf.h
rename to cde/lib/DtMmdb/utility/c_streambuf.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_string.h b/cde/lib/DtMmdb/utility/c_string.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_string.h
rename to cde/lib/DtMmdb/utility/c_string.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/c_stringstream.h b/cde/lib/DtMmdb/utility/c_stringstream.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/c_stringstream.h
rename to cde/lib/DtMmdb/utility/c_stringstream.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/charbuf.C b/cde/lib/DtMmdb/utility/charbuf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/charbuf.C
rename to cde/lib/DtMmdb/utility/charbuf.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/config.h b/cde/lib/DtMmdb/utility/config.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/config.h
rename to cde/lib/DtMmdb/utility/config.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/const.h b/cde/lib/DtMmdb/utility/const.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/const.h
rename to cde/lib/DtMmdb/utility/const.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/core_fstream.C b/cde/lib/DtMmdb/utility/core_fstream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/core_fstream.C
rename to cde/lib/DtMmdb/utility/core_fstream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/db_version.h b/cde/lib/DtMmdb/utility/db_version.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/db_version.h
rename to cde/lib/DtMmdb/utility/db_version.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/debug.h b/cde/lib/DtMmdb/utility/debug.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/debug.h
rename to cde/lib/DtMmdb/utility/debug.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/filebuf.C b/cde/lib/DtMmdb/utility/filebuf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/filebuf.C
rename to cde/lib/DtMmdb/utility/filebuf.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/filter.C b/cde/lib/DtMmdb/utility/filter.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/filter.C
rename to cde/lib/DtMmdb/utility/filter.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/filter.h b/cde/lib/DtMmdb/utility/filter.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/filter.h
rename to cde/lib/DtMmdb/utility/filter.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/fstream.C b/cde/lib/DtMmdb/utility/fstream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/fstream.C
rename to cde/lib/DtMmdb/utility/fstream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.C b/cde/lib/DtMmdb/utility/funcs.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/funcs.C
rename to cde/lib/DtMmdb/utility/funcs.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.h b/cde/lib/DtMmdb/utility/funcs.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/funcs.h
rename to cde/lib/DtMmdb/utility/funcs.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/ios.C b/cde/lib/DtMmdb/utility/ios.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/ios.C
rename to cde/lib/DtMmdb/utility/ios.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/iostream.C b/cde/lib/DtMmdb/utility/iostream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/iostream.C
rename to cde/lib/DtMmdb/utility/iostream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/key.h b/cde/lib/DtMmdb/utility/key.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/key.h
rename to cde/lib/DtMmdb/utility/key.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/macro.h b/cde/lib/DtMmdb/utility/macro.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/macro.h
rename to cde/lib/DtMmdb/utility/macro.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.C b/cde/lib/DtMmdb/utility/mmdb_exception.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.C
rename to cde/lib/DtMmdb/utility/mmdb_exception.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h b/cde/lib/DtMmdb/utility/mmdb_exception.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h
rename to cde/lib/DtMmdb/utility/mmdb_exception.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/ostring.C b/cde/lib/DtMmdb/utility/ostring.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/ostring.C
rename to cde/lib/DtMmdb/utility/ostring.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/ostring.h b/cde/lib/DtMmdb/utility/ostring.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/ostring.h
rename to cde/lib/DtMmdb/utility/ostring.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/pm_random.C b/cde/lib/DtMmdb/utility/pm_random.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/pm_random.C
rename to cde/lib/DtMmdb/utility/pm_random.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/pm_random.h b/cde/lib/DtMmdb/utility/pm_random.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/pm_random.h
rename to cde/lib/DtMmdb/utility/pm_random.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/prolatex.C b/cde/lib/DtMmdb/utility/prolatex.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/prolatex.C
rename to cde/lib/DtMmdb/utility/prolatex.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/prolatex.c b/cde/lib/DtMmdb/utility/prolatex.c
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/prolatex.c
rename to cde/lib/DtMmdb/utility/prolatex.c
diff --git a/cde/programs/dtinfo/DtMmdb/utility/randomize.C b/cde/lib/DtMmdb/utility/randomize.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/randomize.C
rename to cde/lib/DtMmdb/utility/randomize.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/randomize.h b/cde/lib/DtMmdb/utility/randomize.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/randomize.h
rename to cde/lib/DtMmdb/utility/randomize.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/rw_lock.C b/cde/lib/DtMmdb/utility/rw_lock.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/rw_lock.C
rename to cde/lib/DtMmdb/utility/rw_lock.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/rw_lock.h b/cde/lib/DtMmdb/utility/rw_lock.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/rw_lock.h
rename to cde/lib/DtMmdb/utility/rw_lock.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream.C b/cde/lib/DtMmdb/utility/stream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream.C
rename to cde/lib/DtMmdb/utility/stream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.extraction b/cde/lib/DtMmdb/utility/stream_test.extraction
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.extraction
rename to cde/lib/DtMmdb/utility/stream_test.extraction
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.getline b/cde/lib/DtMmdb/utility/stream_test.getline
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.getline
rename to cde/lib/DtMmdb/utility/stream_test.getline
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.mixed_ins_extr b/cde/lib/DtMmdb/utility/stream_test.mixed_ins_extr
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.mixed_ins_extr
rename to cde/lib/DtMmdb/utility/stream_test.mixed_ins_extr
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.mixed_ins_extr.2 b/cde/lib/DtMmdb/utility/stream_test.mixed_ins_extr.2
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.mixed_ins_extr.2
rename to cde/lib/DtMmdb/utility/stream_test.mixed_ins_extr.2
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.mobydick b/cde/lib/DtMmdb/utility/stream_test.mobydick
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.mobydick
rename to cde/lib/DtMmdb/utility/stream_test.mobydick
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.read b/cde/lib/DtMmdb/utility/stream_test.read
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.read
rename to cde/lib/DtMmdb/utility/stream_test.read
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.seek_and_read b/cde/lib/DtMmdb/utility/stream_test.seek_and_read
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.seek_and_read
rename to cde/lib/DtMmdb/utility/stream_test.seek_and_read
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stream_test.write b/cde/lib/DtMmdb/utility/stream_test.write
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stream_test.write
rename to cde/lib/DtMmdb/utility/stream_test.write
diff --git a/cde/programs/dtinfo/DtMmdb/utility/streambuf.C b/cde/lib/DtMmdb/utility/streambuf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/streambuf.C
rename to cde/lib/DtMmdb/utility/streambuf.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/string.C b/cde/lib/DtMmdb/utility/string.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/string.C
rename to cde/lib/DtMmdb/utility/string.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/stringstream.C b/cde/lib/DtMmdb/utility/stringstream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/stringstream.C
rename to cde/lib/DtMmdb/utility/stringstream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/tst_filebuf.C b/cde/lib/DtMmdb/utility/tst_filebuf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/tst_filebuf.C
rename to cde/lib/DtMmdb/utility/tst_filebuf.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/tst_form.C b/cde/lib/DtMmdb/utility/tst_form.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/tst_form.C
rename to cde/lib/DtMmdb/utility/tst_form.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/tst_fstream.C b/cde/lib/DtMmdb/utility/tst_fstream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/tst_fstream.C
rename to cde/lib/DtMmdb/utility/tst_fstream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/tst_streambuf.C b/cde/lib/DtMmdb/utility/tst_streambuf.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/tst_streambuf.C
rename to cde/lib/DtMmdb/utility/tst_streambuf.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/tst_strstream.C b/cde/lib/DtMmdb/utility/tst_strstream.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/tst_strstream.C
rename to cde/lib/DtMmdb/utility/tst_strstream.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/types.h b/cde/lib/DtMmdb/utility/types.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/types.h
rename to cde/lib/DtMmdb/utility/types.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/xclock.C b/cde/lib/DtMmdb/utility/xclock.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/xclock.C
rename to cde/lib/DtMmdb/utility/xclock.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/xclock.h b/cde/lib/DtMmdb/utility/xclock.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/xclock.h
rename to cde/lib/DtMmdb/utility/xclock.h
diff --git a/cde/programs/dtinfo/DtMmdb/utility/xtime.C b/cde/lib/DtMmdb/utility/xtime.C
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/xtime.C
rename to cde/lib/DtMmdb/utility/xtime.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/xtime.h b/cde/lib/DtMmdb/utility/xtime.h
similarity index 100%
rename from cde/programs/dtinfo/DtMmdb/utility/xtime.h
rename to cde/lib/DtMmdb/utility/xtime.h
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls b/cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls
deleted file mode 100644
index 8fbdeef4d..000000000
--- a/cde/programs/dtinfo/DtMmdb/HardCopy/all_tmpls
+++ /dev/null
@@ -1,2 +0,0 @@
-// all_tmplts - force instantiation of all templates under HPUX
-@all
diff --git a/cde/programs/dtinfo/DtMmdb/Imakefile b/cde/programs/dtinfo/DtMmdb/Imakefile
deleted file mode 100644
index 4aaf6ebe5..000000000
--- a/cde/programs/dtinfo/DtMmdb/Imakefile
+++ /dev/null
@@ -1,235 +0,0 @@
-XCOMM $TOG: Imakefile /main/18 1998/08/10 15:51:59 mgreess $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define IHaveSubdirs
-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
-
-XCOMM This directory has the source for both C and C++ versions of this
-XCOMM library.  Only the C version is built as libDtMmdb.  Check in
-XCOMM .../programs/dtinfo/mmdb also to find out if files are really 
-XCOMM obsolete.
-MMDB_SUBDIRS = HardCopy StyleSheet dti_cc
-
-#ifdef SharedDtMmdbReqs
-#ifdef SunArchitecture
-REQUIREDLIBS = SharedDtMmdbReqs
-#ifndef HasGcc2
-SHLIBLDFLAGS = -G
-#endif
-#else
-REQUIREDLIBS = SharedDtMmdbReqs
-#endif
-#endif
-
-SUBDIRS = \
-	api			btree \
-	btree_berkeley		compression \
-	diskhash		dstr \
-	dti_excs		dynhash \
-	hmphf			index \
-	mgrs			misc \
-	object			oliasdb \
-	schema			storage \
-	utility
-
-DONES = \
-	api/DONE		btree/DONE \
-	btree_berkeley/DONE	compression/DONE \
-	diskhash/DONE		dstr/DONE \
-	dti_excs/DONE		dynhash/DONE \
-	hmphf/DONE		index/DONE \
-	mgrs/DONE		misc/DONE \
-	object/DONE		oliasdb/DONE \
-	schema/DONE		storage/DONE \
-	utility/DONE
-
-EXTRALIBRARYDEPS = $(DONES)
-
-XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
-#undef  TopLevelProject
-#define TopLevelProject		DtInfo
-IMAKE_DEF_DTINFO =  -DTopLevelProject=TopLevelProject \
-		    -DProjectTmplFile='<DtInfo.tmpl>' \
-		    -DProjectRulesFile='<DtInfo.rules>'
-
-MakeSubdirs($(SUBDIRS))
-ForceSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-NamedTargetSubdirs(install_buildtools,$(SUBDIRS),\
-                   install_buildtools,,install_buildtools)
-
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-
-/*
- * N.B.:  All .o's should be built in the subdirectories.
- */
-
-API_OBJS = \
-	api/base.o		api/info_base.o 	api/info_lib.o	\
-	api/smart_ptr.o 	api/transaction.o	api/utility.o
-
-BTREE_OBJS = btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	btree_berkeley/bt_close.o	btree_berkeley/bt_conv.o \
-	btree_berkeley/bt_debug.o	btree_berkeley/bt_delete.o \
-	btree_berkeley/bt_get.o		btree_berkeley/bt_open.o \
-	btree_berkeley/bt_overflow.o	btree_berkeley/bt_page.o \
-	btree_berkeley/bt_put.o		btree_berkeley/bt_search.o \
-	btree_berkeley/bt_seq.o		btree_berkeley/bt_split.o \
-	btree_berkeley/bt_stack.o	btree_berkeley/bt_utils.o \
-	btree_berkeley/mktemp.o		btree_berkeley/realloc.o \
-	btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	btree_berkeley/mpool.o		btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	compression/abs_agent.o		compression/zip.o \
-	compression/huffman.o		compression/trie.o \
-	compression/code.o		compression/lzss.o \
-	compression/sgml.o		compression/ps.o
-
-DISKHASH_OBJS = \
-	diskhash/disk_bucket.o		diskhash/bucket_array.o \
-	diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	dstr/set.o			dstr/bset.o \
-	dstr/slist.o			dstr/dlist_cell.o \
-	dstr/dlist.o			dstr/heap.o \
-	dstr/void_ptr_array.o		dstr/void_ptr_stack.o \
-	dstr/memory_pool.o		dstr/dstr_test.o \
-	dstr/index_agent.o		dstr/token_stack.o \
-	dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	dti_excs/Jump_Environment.o	dti_excs/Exceptions.o \
-	dti_excs/Exception.o		dti_excs/Destructable.o \
-	dti_excs/terminate.o		dti_excs/init.o
-
-DYNHASH_OBJS = dynhash/data_t.o dynhash/imp_bucket.o dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	hmphf/buckets.o hmphf/mphf_funcs.o	hmphf/mphf_hash_table.o \
-	hmphf/params.o	hmphf/pattern.o		hmphf/sorter.o
-
-INDEX_OBJS = \
-	index/btree_index.o		index/dyn_disk_index.o \
-	index/dyn_index.o		index/dyn_memory_index.o \
-	index/fast_mphf.o		index/hash.o \
-	index/index.o			index/inv_lists.o \
-	index/mphf_index.o
-
-MGRS_OBJS = mgrs/managers.o mgrs/misc.o mgrs/query_mgr.o mgrs/template_mgr.o
-
-MISC_OBJS = misc/unique_id.o
-
-OBJECT_OBJS = \
-	object/composite.o	object/compressed_pstring.o \
-	object/cset.o		object/dl_list.o \
-	object/dl_list_cell.o	object/handler.o \
-	object/integer.o	object/long_pstring.o \
-	object/oid.o		object/oid_list.o \
-	object/oid_t.o		object/primitive.o \
-	object/pstring.o	object/random_gen.o \
-	object/root.o		object/short_list.o \
-	object/tuple.o
-
-OLIASDB_OBJS = \
-	oliasdb/asciiIn_filters.o 	oliasdb/collectionIterator.o \
-	oliasdb/dlp_hd.o 		oliasdb/dlp_test.o \
-	oliasdb/doc_hd.o 		oliasdb/doc_test.o \
-	oliasdb/graphic_hd.o 		oliasdb/graphic_test.o \
-	oliasdb/loc_test.o 		oliasdb/locator_hd.o \
-	oliasdb/mark.o 			oliasdb/mark_base.o  \
-	oliasdb/mark_test.o 		oliasdb/mmdb.o \
-	oliasdb/node_hd.o 		oliasdb/node_test.o \
-	oliasdb/olias_funcs.o 		oliasdb/olias_test.o \
-	oliasdb/stylesheet_hd.o 	oliasdb/stylesheet_test.o \
-	oliasdb/toc_hd.o 		oliasdb/toc_test.o \
-	oliasdb/user_base.o \
-	oliasdb/c_api_book.o		oliasdb/c_api_book_test.o \
-	oliasdb/c_api_bookcase.o	oliasdb/c_api_bookcase_test.o \
-	oliasdb/c_api_common.o \
-	oliasdb/c_api_dlp.o		oliasdb/c_api_dlp_test.o \
-	oliasdb/c_api_graphic.o		oliasdb/c_api_graphic_test.o \
-	oliasdb/c_api_infolib.o		oliasdb/c_api_infolib_test.o \
-	oliasdb/c_api_locator.o		oliasdb/c_api_locator_test.o \
-	oliasdb/c_api_pure_virtual.o \
-	oliasdb/c_api_section.o		oliasdb/c_api_section_test.o \
-	oliasdb/c_api_stylesheet.o	oliasdb/c_api_stylesheet_test.o \
-	oliasdb/c_api_toc.o		oliasdb/c_api_toc_test.o
-
-SCHEMA_OBJS = \
-	schema/desc.o			schema/store_desc.o \
-	schema/object_dict.o		schema/stored_object_desc.o \
-	schema/index_desc.o		schema/inv_desc.o \
-	schema/agent_desc.o		schema/container_desc.o \
-	schema/sheet.o			schema/token.o
-
-STORAGE_OBJS = \
-	storage/abs_storage.o		storage/chunks_index.o	\
-	storage/heap_comp_funcs.o	storage/lru.o \
-	storage/page.o			storage/page_cache.o \
-	storage/page_rep.o		storage/page_storage.o \
-	storage/rep_cell.o		storage/rep_policy.o \
-	storage/store_test.o		storage/unixf_storage.o \
-	storage/version.o		storage/vm_storage.o
-
-UTILITY_OBJS = \
-	utility/funcs.o			utility/ostring.o \
-	utility/pm_random.o		utility/atoi_pearson.o \
-	utility/xtime.o			utility/buffer.o \
-	utility/atoi_larson.o		utility/atomic_lock.o \
-	utility/rw_lock.o		utility/atoi_fast.o \
-	utility/filter.o		utility/mmdb_exception.o \
-	utility/randomize.o	\
-	utility/streambuf.o	utility/charbuf.o	utility/filebuf.o \
-	utility/stringstream.o	utility/iostream.o	utility/fstream.o \
-	utility/stream.o	utility/string.o	utility/ios.o
-
-
-OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)
-
-XCOMM All dependent libraries are shared, no need to tell the linker twice.
-STATIC =
-DYNAMIC =
-
-#include <Library.tmpl>
-
-XCOMM Variables to switch on debug mode temporarily
-XCOMM CDEBUGFLAGS = -g -DDEBUG
-XCOMM CXXDEBUGFLAGS = -g -DDEBUG
diff --git a/cde/programs/dtinfo/DtMmdb/api/Imakefile b/cde/programs/dtinfo/DtMmdb/api/Imakefile
deleted file mode 100644
index d9926736d..000000000
--- a/cde/programs/dtinfo/DtMmdb/api/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/14 1996/08/21 15:51:16 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
-
-SRCS = base.C info_base.C info_lib.C smart_ptr.C transaction.C utility.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/btree/Imakefile b/cde/programs/dtinfo/DtMmdb/btree/Imakefile
deleted file mode 100644
index 7ce234e2b..000000000
--- a/cde/programs/dtinfo/DtMmdb/btree/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:51:27 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS = mmdb_btree.C 
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/btree_berkeley/Imakefile b/cde/programs/dtinfo/DtMmdb/btree_berkeley/Imakefile
deleted file mode 100644
index d60cf14c9..000000000
--- a/cde/programs/dtinfo/DtMmdb/btree_berkeley/Imakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:51:32 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-DEFINES  = -DMEMMOVE
-INCLUDES = -I../ -I.
-
-XCOMM Integretion Berkeley ndbm packege (sun.4.1.3 version) to mmdb:  
-XCOMM 9/15/93.  qfc
-XCOMM
-XCOMM cp -r berkeley.db/PORT/sun.4.1.3/{clib,include,sys}/?* .
-XCOMM
-XCOMM change a few "include" lines in db.h, snprintf.h and mmmove.h. 
-XCOMM
-XCOMM Merge Notes:                            9/15/93.  qfc
-XCOMM SRCS1: btree code. from berkeley.db/btree
-XCOMM SRCS2: clib code. from berkeley.db/PORT/sun.4.1.3/clib
-XCOMM SRCS3: mpool code. from berkeley.db/mpool
-XCOMM SRCS4: db code. from berkeley.db/db
-
-SRCS1 =	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c \
-	bt_open.c bt_overflow.c bt_page.c bt_put.c bt_search.c \
-	bt_seq.c bt_split.c bt_stack.c bt_utils.c 
-
-#ifdef AIXArchitecture
-SRCS2 =           mktemp.c realloc.c snprintf.c 
-#else
-SRCS2 = memmove.c mktemp.c realloc.c snprintf.c 
-#endif
-
-SRCS3 = mpool.c
-
-SRCS4 = db.c
-
-SRCS = $(SRCS1)       $(SRCS2)       $(SRCS3)       $(SRCS4)
-OBJS = $(SRCS1:.c=.o) $(SRCS2:.c=.o) $(SRCS3:.c=.o) $(SRCS4:.c=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/compression/Imakefile b/cde/programs/dtinfo/DtMmdb/compression/Imakefile
deleted file mode 100644
index d11d0c452..000000000
--- a/cde/programs/dtinfo/DtMmdb/compression/Imakefile
+++ /dev/null
@@ -1,56 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/12 1996/08/21 15:51:36 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-NORMAL_SRCS = abs_agent.C zip.C huffman.C trie.C code.C lzss.C
-PARSER_SRCS = sgml.C ps.C
-
-#ifdef RegenParserFiles
-XCOMM Hide the lex sources so the normal case is simple.
-
-YACCSTACK = -DYYSTACKSIZE=20000
-YFLAGS    = -l -d 
-LFLAGS    = -8 -s 
-
-LinkFile(sgml.l,sgml.lex)
-LexTarget(sgml,sgml)
-
-LinkFile(ps.l,ps.lex)
-LexTarget(ps,ps)
-#endif
-
-SRCS = $(NORMAL_SRCS)       $(PARSER_SRCS)
-OBJS = $(NORMAL_SRCS:.C=.o) $(PARSER_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/Imakefile b/cde/programs/dtinfo/DtMmdb/diskhash/Imakefile
deleted file mode 100644
index 1113c753c..000000000
--- a/cde/programs/dtinfo/DtMmdb/diskhash/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:51:40 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS = disk_bucket.C bucket_array.C disk_hash.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/Imakefile b/cde/programs/dtinfo/DtMmdb/dstr/Imakefile
deleted file mode 100644
index defe059d0..000000000
--- a/cde/programs/dtinfo/DtMmdb/dstr/Imakefile
+++ /dev/null
@@ -1,42 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:51:44 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS =	set.C bset.C slist.C dlist_cell.C dlist.C heap.C \
-	void_ptr_array.C void_ptr_stack.C \
-	memory_pool.C dstr_test.C \
-	index_agent.C token_stack.C slist_char_ptr_cell.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Imakefile b/cde/programs/dtinfo/DtMmdb/dti_excs/Imakefile
deleted file mode 100644
index 1d36afed2..000000000
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Imakefile
+++ /dev/null
@@ -1,47 +0,0 @@
-XCOMM $TOG: Imakefile /main/12 1997/09/05 11:29:53 samborn $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
-EXCEPTION_DEFINES  = -DHAS_TERMINATE
-#endif
-
-DEFINES  = -DC_API -DCC_VERSION=30 -DCHECK_INITIALIZED $(EXCEPTION_DEFINES)
-
-BASE_SRCS = \
-	Jump_Environment.C	Exceptions.C	Exception.C \
-	Destructable.C		terminate.C
-
-C_API_SRCS = init.C
-
-SRCS = $(BASE_SRCS)       $(C_API_SRCS)
-OBJS = $(BASE_SRCS:.C=.o) $(C_API_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/Imakefile b/cde/programs/dtinfo/DtMmdb/dynhash/Imakefile
deleted file mode 100644
index 2017e8ff1..000000000
--- a/cde/programs/dtinfo/DtMmdb/dynhash/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:51:56 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS = data_t.C imp_bucket.C imp_die.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/Imakefile b/cde/programs/dtinfo/DtMmdb/hmphf/Imakefile
deleted file mode 100644
index 1b50d4362..000000000
--- a/cde/programs/dtinfo/DtMmdb/hmphf/Imakefile
+++ /dev/null
@@ -1,40 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/8 1996/08/21 15:52:05 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS =	buckets.C	mphf_funcs.C	mphf_hash_table.C \
-	params.C	pattern.C	sorter.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/index/Imakefile b/cde/programs/dtinfo/DtMmdb/index/Imakefile
deleted file mode 100644
index 0b38aaf8e..000000000
--- a/cde/programs/dtinfo/DtMmdb/index/Imakefile
+++ /dev/null
@@ -1,41 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:52:16 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS = 	btree_index.C		dyn_disk_index.C	dyn_index.C  \
-	dyn_memory_index.C	fast_mphf.C		hash.C \
-	index.C			inv_lists.C		mphf_index.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/Imakefile b/cde/programs/dtinfo/DtMmdb/mgrs/Imakefile
deleted file mode 100644
index 969b90aff..000000000
--- a/cde/programs/dtinfo/DtMmdb/mgrs/Imakefile
+++ /dev/null
@@ -1,39 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/9 1996/08/21 15:52:24 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DCOMPACTED_DISK_REP -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS = managers.C misc.C query_mgr.C template_mgr.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/misc/Imakefile b/cde/programs/dtinfo/DtMmdb/misc/Imakefile
deleted file mode 100644
index 3e99e672b..000000000
--- a/cde/programs/dtinfo/DtMmdb/misc/Imakefile
+++ /dev/null
@@ -1,34 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/6 1996/08/21 15:56:22 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-DEFINES = -DPORTABLE_DB
-
-SRCS = unique_id.c
-OBJS = $(SRCS:.c=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/object/Imakefile b/cde/programs/dtinfo/DtMmdb/object/Imakefile
deleted file mode 100644
index 7e8866dbb..000000000
--- a/cde/programs/dtinfo/DtMmdb/object/Imakefile
+++ /dev/null
@@ -1,44 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/08/21 15:52:28 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS =	composite.C	compressed_pstring.C	cset.C \
-	dl_list.C	dl_list_cell.C		handler.C \
-	integer.C	long_pstring.C		oid.C \
-	oid_list.C	oid_t.C			primitive.C \
-	pstring.C	random_gen.C		root.C \
-	short_list.C	tuple.C
-OBJS = $(SRCS:.C=.o) 
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Imakefile b/cde/programs/dtinfo/DtMmdb/oliasdb/Imakefile
deleted file mode 100644
index e14e67834..000000000
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/Imakefile
+++ /dev/null
@@ -1,71 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/14 1996/08/21 15:52:35 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#ifdef DtinfoClient
-DEFINES= -DC_API -DNO_DB_LOCK -DCDE_NEXT
-#else
-DEFINES= -DC_API -DNO_DB_LOCK $(BYTE_ORDER_DEFINES)
-#endif
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I../misc
-
-BASE_SRCS =  \
-	asciiIn_filters.C 	collectionIterator.C \
-	dlp_hd.C 		dlp_test.C \
-	doc_hd.C 		doc_test.C \
-	graphic_hd.C 		graphic_test.C \
-	loc_test.C 		locator_hd.C \
-	mark.C	 		mark_base.C \
-	mark_test.C 		mmdb.C \
-	node_hd.C 		node_test.C \
-	olias_funcs.C 		olias_test.C \
-	stylesheet_hd.C 	stylesheet_test.C \
-	toc_hd.C 		toc_test.C \
-	user_base.C
-
-C_API_SRCS = \
-	c_api_book.C		c_api_book_test.C \
-	c_api_bookcase.C	c_api_bookcase_test.C \
-	c_api_common.C		\
-	c_api_dlp.C		c_api_dlp_test.C \
-	c_api_graphic.C		c_api_graphic_test.C \
-	c_api_infolib.C		c_api_infolib_test.C \
-	c_api_locator.C		c_api_locator_test.C \
-	c_api_pure_virtual.C	\
-	c_api_section.C		c_api_section_test.C \
-	c_api_stylesheet.C	c_api_stylesheet_test.C \
-	c_api_toc.C		c_api_toc_test.C
-
-SRCS = $(BASE_SRCS)       $(C_API_SRCS)
-OBJS = $(BASE_SRCS:.C=.o) $(C_API_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
-
-InstallMultipleDest(install_buildtools,mmdb.infolib.spec,$(INSTALL_ETC_DIR))
diff --git a/cde/programs/dtinfo/DtMmdb/schema/Imakefile b/cde/programs/dtinfo/DtMmdb/schema/Imakefile
deleted file mode 100644
index 1b1f9d3ed..000000000
--- a/cde/programs/dtinfo/DtMmdb/schema/Imakefile
+++ /dev/null
@@ -1,58 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/15 1996/08/21 15:53:37 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
-
-NORMAL_SRCS = desc.C store_desc.C object_dict.C \
-	stored_object_desc.C index_desc.C inv_desc.C \
-	agent_desc.C container_desc.C
-PARSER_SRCS = sheet.C token.C
-
-#if defined(RegenParserFiles)
-XCOMM Hide the flex and byacc sources so the normal case is simple.
-
-YACCSTACK = -DYYSTACKSIZE=20000
-YFLAGS    = -l -d 
-LFLAGS    = -8 -s 
-
-LinkFile(token.l,token.lex)
-LexTarget(token,schema)
-
-LinkFile(sheet.y,sheet.yacc)
-YaccTarget(sheet,schema)
-#endif
-
-SRCS = $(NORMAL_SRCS)       $(PARSER_SRCS)
-OBJS = $(NORMAL_SRCS:.C=.o) $(PARSER_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/storage/Imakefile b/cde/programs/dtinfo/DtMmdb/storage/Imakefile
deleted file mode 100644
index abee391d6..000000000
--- a/cde/programs/dtinfo/DtMmdb/storage/Imakefile
+++ /dev/null
@@ -1,43 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/10 1996/08/21 15:53:41 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES)
-
-SRCS =	abs_storage.C	chunks_index.C	heap_comp_funcs.C \
-	lru.C		page.C		page_cache.C \
-	page_rep.C	page_storage.C	rep_cell.C \
-	rep_policy.C	store_test.C	unixf_storage.C \
-	version.C	vm_storage.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/DtMmdb/utility/Imakefile b/cde/programs/dtinfo/DtMmdb/utility/Imakefile
deleted file mode 100644
index e80036a7d..000000000
--- a/cde/programs/dtinfo/DtMmdb/utility/Imakefile
+++ /dev/null
@@ -1,50 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/14 1996/08/21 15:54:08 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	NormalLibDtMmdb
-#define DoSharedLib	SharedLibDtMmdb
-#define DoDebugLib	DebugLibDtMmdb
-#define DoProfileLib	ProfileLibDtMmdb
-#define LibName		DtMmdb
-#define SoRev		SODTMMDBREV
-#define LibHeaders	NO
-#define LibCreate	NO
-#define LargePICTable	YES
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-XCOMM In DtMmdb we compile as C_API sources.
-DEFINES  = -DC_API -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I.. $(EXCEPTIONS_INCLUDES) -I../misc
-
-BASE_SRCS = \
-	funcs.C		ostring.C	pm_random.C	atoi_pearson.C \
-	xtime.C		buffer.C	atoi_larson.C	atomic_lock.C \
-	rw_lock.C	atoi_fast.C	filter.C	mmdb_exception.C \
-	randomize.C
-
-C_API_SRCS = \
-	streambuf.C	charbuf.C	filebuf.C	string.C \
-	stringstream.C	iostream.C	fstream.C	stream.C \
-	ios.C
-
-SRCS = $(BASE_SRCS)	  $(C_API_SRCS)
-OBJS = $(BASE_SRCS:.C=.o) $(C_API_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/Makefile.am b/cde/programs/dtinfo/Makefile.am
index 67d326b9c..f130ad07f 100644
--- a/cde/programs/dtinfo/Makefile.am
+++ b/cde/programs/dtinfo/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = tools DtMmdb mmdb clients dtinfo dtinfogen
+SUBDIRS = tools clients dtinfo
diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
index 56152ef47..80fcb18dc 100644
--- a/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
+++ b/cde/programs/dtinfo/dtinfo/src/Agents/SearchScopeAgentMotif.C
@@ -81,7 +81,7 @@
 #include "Other/XmStringLocalized.hh"
 #include "Managers/CatMgr.hh"
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "Prelude.h"
 
 #include "Registration.hh"
diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
index 857fb743b..e1f5af44e 100644
--- a/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
+++ b/cde/programs/dtinfo/dtinfo/src/Managers/NodeMgr.C
@@ -81,10 +81,10 @@
 #include <tml/tml_objects.hxx>
 #endif
 
-#include "DocParser.h"
-#include "Resolver.h" 
-#include "StyleSheet.h"
-#include "StyleSheetExceptions.h"
+#include "StyleSheet/DocParser.h"
+#include "StyleSheet/Resolver.h"
+#include "StyleSheet/StyleSheet.h"
+#include "StyleSheet/StyleSheetExceptions.h"
 #ifdef JBM
 #include "../OnlineRender/TmlRenderer.hh"
 #else
diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
index 7c774363a..c684d9ce6 100644
--- a/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
+++ b/cde/programs/dtinfo/dtinfo/src/Managers/PrintMgr.C
@@ -74,10 +74,10 @@
 #include "Managers/CatMgr.hh"
 #include "Registration.hh"
 
-#include "DocParser.h"
-#include "Resolver.h" 
-#include "StyleSheet.h"
-#include "StyleSheetExceptions.h"
+#include "StyleSheet/DocParser.h"
+#include "StyleSheet/Resolver.h"
+#include "StyleSheet/StyleSheet.h"
+#include "StyleSheet/StyleSheetExceptions.h"
 #include "../OnlineRender/CanvasRenderer.hh"
 
 #if 0
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
index 82209b2cb..568ce281e 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.C
@@ -48,11 +48,11 @@
 
 #include <utility/funcs.h>
 
-#include "Element.h"
-#include "Attribute.h"
+#include "StyleSheet/Element.h"
+#include "StyleSheet/Attribute.h"
 #include "CanvasRenderer.hh"
-#include "Feature.h"
-#include "FeatureValue.h"
+#include "StyleSheet/Feature.h"
+#include "StyleSheet/FeatureValue.h"
 
 // stylesheet spec states default leading to be 2
 #define DEFAULT_CONTAINER_LEADING 2
@@ -1558,7 +1558,7 @@ CanvasRenderer::really_insert_string (_DtCvSegment *container,
     if ((lang = getenv("LC_ALL")) == NULL)
       if ((lang = getenv("LC_CTYPE")) == NULL)
 	if ((lang = getenv("LANG")) == NULL)
-	  lang = "C";
+	  lang = "C.UTF-8";
 
     _DtHelpGetExactFontIndex(gHelpDisplayArea, // Display Area Structure
 			     lang, // lang
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh
index e5c7f41b3..1cf17555b 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/CanvasRenderer.hh
@@ -24,7 +24,7 @@
 #ifndef _CanvasRenderer_hh
 #define _CanvasRenderer_hh
 
-#include "Renderer.h"
+#include "StyleSheet/Renderer.h"
 #include "FontCache.hh"
 
 // get DtCanvas structure defns
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/FeatureSupport.C b/cde/programs/dtinfo/dtinfo/src/OnlineRender/FeatureSupport.C
index a162d42e2..d017f6d59 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/FeatureSupport.C
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/FeatureSupport.C
@@ -48,9 +48,9 @@
 #include <Prelude.h>
 
 #include <limits.h>
-#include "Feature.h"
-#include "FeatureValue.h"
-#include "StyleSheetExceptions.h"
+#include "StyleSheet/Feature.h"
+#include "StyleSheet/FeatureValue.h"
+#include "StyleSheet/StyleSheetExceptions.h"
 #include <utility/funcs.h>
 #include <sstream>
 using namespace std;
diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/SegClientData.hh b/cde/programs/dtinfo/dtinfo/src/OnlineRender/SegClientData.hh
index 7a6f95fba..2dd98dfab 100644
--- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/SegClientData.hh
+++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/SegClientData.hh
@@ -32,7 +32,7 @@
 #include <Dt/CanvasP.h>
 #include <Dt/CanvasSegP.h>
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 class SegClientData {
 
diff --git a/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.C b/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.C
index e93c061bb..aaa0d1ad1 100644
--- a/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.C
+++ b/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.C
@@ -50,7 +50,7 @@
 
 #include "Prelude.h"
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 #include <unistd.h>
 
diff --git a/cde/programs/dtinfo/dtinfo/src/Support/List_base.C b/cde/programs/dtinfo/dtinfo/src/Support/List_base.C
index 9dfbffa71..46fb991e9 100644
--- a/cde/programs/dtinfo/dtinfo/src/Support/List_base.C
+++ b/cde/programs/dtinfo/dtinfo/src/Support/List_base.C
@@ -47,7 +47,7 @@
  * 
  */
 
-#include <Exceptions.hh>
+#include <dti_excs/Exceptions.hh>
 #include "List_base.hh"
 
 // /////////////////////////////////////////////////////////////////
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh
index da13afa01..7047cd171 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Base.hh
@@ -24,7 +24,7 @@
 #ifndef _UAS_Base_h_
 #define _UAS_Base_h_
 
-# include "Exceptions.hh"
+# include "dti_excs/Exceptions.hh"
 # include "UAS_Pointer.hh"
 
 class UAS_Base: public Destructable {
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh
index 275531a52..533383fcb 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_Exceptions.hh
@@ -24,7 +24,7 @@
 #ifndef _UAS_Exceptions_hh_
 #define _UAS_Exceptions_hh_
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "UAS_String.hh"
 
 #define CASTUASEXCEPT
diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C
index 1317f751a..8cdf2d2bf 100644
--- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C
+++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/UAS_OQLParser.C
@@ -33,7 +33,7 @@
 using namespace std;
 #include <assert.h>
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "UAS_OQLParser.hh"
 
 #include "Managers/CatMgr.hh"
diff --git a/cde/programs/dtinfo/dtinfo/src/config.h b/cde/programs/dtinfo/dtinfo/src/config.h
index e8e3b0d21..0eb880d58 100644
--- a/cde/programs/dtinfo/dtinfo/src/config.h
+++ b/cde/programs/dtinfo/dtinfo/src/config.h
@@ -44,7 +44,7 @@
  * 
  */
 
-#include <Exceptions.hh>
+#include <dti_excs/Exceptions.hh>
 
 /*
   Folio Configuration File
diff --git a/cde/programs/dtinfo/dtinfo/src/main.C b/cde/programs/dtinfo/dtinfo/src/main.C
index 00d9cecd5..9ae141476 100644
--- a/cde/programs/dtinfo/dtinfo/src/main.C
+++ b/cde/programs/dtinfo/dtinfo/src/main.C
@@ -89,7 +89,7 @@
 
 #include "Managers/CatMgr.hh"
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "utility/mmdb_exception.h"
 
 #ifdef MONITOR
diff --git a/cde/programs/dtinfo/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk
index 5a4ea0bc3..6f05b7cd7 100644
--- a/cde/programs/dtinfo/dtinfo_env.mk
+++ b/cde/programs/dtinfo/dtinfo_env.mk
@@ -24,26 +24,18 @@ OLIAS = $(top_builddir)/programs/dtinfo
 OLIASSRC = $(top_srcdir)/programs/dtinfo
 WWL = $(OLIAS)/dtinfo/wwl
 WWLSRC = $(OLIASSRC)/dtinfo/wwl
-MMDB = $(OLIAS)/DtMmdb
-MMDBSRC = $(OLIASSRC)/DtMmdb
-EXCEPTIONS = $(MMDB)/dti_excs
-EXCEPTIONSSRC = $(MMDBSRC)/dti_excs
+MMDB = $(top_builddir)/lib/DtMmdb
+MMDBSRC = $(top_builddir)/lib/DtMmdb
 TOOLS = $(OLIAS)/tools
 UAS = $(OLIAS)/dtinfo/src/UAS
 UASSRC = $(OLIASSRC)/dtinfo/src/UAS
 
 WWL_INCLUDES = -I$(WWLSRC)/include
 WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL
-EXCEPTIONS_INCLUDES = -I$(EXCEPTIONSSRC)
 MMDB_INCLUDES = -I$(MMDBSRC)
-MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la
-MMDB_LIBS_C_API = -L$(MMDB) -lDtMmdb
+MMDB_LIBS= -L$(MMDB) -lDtMmdb
 UAS_INCLUDES = -I$(UASSRC)/Base
-COMMON_CLASS_INCLUDES = -I$(MMDBSRC)/dti_cc -I$(MMDBSRC)
-STYLE_SHEET_INCLUDES = -I$(MMDBSRC)/StyleSheet
 TREERES = $(TOOLS)/misc/treeres
 MSGSETS = $(TOOLS)/misc/msgsets
 
-DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES)	\
-	$(WWL_INCLUDES) $(STYLE_SHEET_INCLUDES)			\
-	$(COMMON_CLASS_INCLUDES)
+DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(MMDB_INCLUDES) $(WWL_INCLUDES)
diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
deleted file mode 100644
index da8faa103..000000000
--- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile
+++ /dev/null
@@ -1,82 +0,0 @@
-XCOMM $TOG: Imakefile /main/2 1997/12/23 11:41:20 bill $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
-
-XCOMM Do not put any -g here, will cause the generation of MasterTemplate.c.c
-XCOMM to use centerline_new, which cannot be linked on HP  
-XCOMM darwinl 6/27/95
-
-#ifdef DtinfoClient
-DEFINES=-DCDE_NEXT
-#else
-DEFINES=
-#endif
-
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/HardCopy $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
-
-#if defined(CplusplusCompilerMajorVersion) && \
-    (CplusplusCompilerMajorVersion == 4) && !defined(SunArchitecture)
-XCOMM need the ptr repository
-CXXEXTRA_DEFINES = -ptr../templates
-#endif
-
-#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy)
-
-EXTRA_SRCS = TemplatesAutoNumber.C
-#endif
-
-LinkSourceFile(FPset.C,$(DTMMDBSRC)/HardCopy)
-LinkSourceFile(HardCopyFP.C,$(DTMMDBSRC)/HardCopy)
-LinkSourceFile(autoNumber.C,$(DTMMDBSRC)/HardCopy)
-LinkSourceFile(autoNumberFP.C,$(DTMMDBSRC)/HardCopy)
-
-BASE_SRCS = FPset.C HardCopyFP.C autoNumber.C autoNumberFP.C
-
-SRCS = $(BASE_SRCS)       $(EXTRA_SRCS)
-OBJS = $(BASE_SRCS:.C=.o) $(EXTRA_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-#ifdef HPArchitecture
-LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
-SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+pti all_tmpls -DEXPAND_TEMPLATES)
-#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
-LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy)
-SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
-#elif defined(AlphaArchitecture)	
-SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
-      defined(SunArchitecture)
-SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES)
-SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES)
-#else
-SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES)
-SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-ptf -DEXPAND_TEMPLATES)
-#endif
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am
deleted file mode 100644
index 17ae72de1..000000000
--- a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/HardCopy
-BUILT_SOURCES = FPset.C HardCopyFP.C autoNumber.C autoNumberFP.C
-
-if LINUX
-BUILT_SOURCES += TemplatesAutoNumber.C
-endif
-
-if BSD
-BUILT_SOURCES += TemplatesAutoNumber.C
-endif
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libHardCopy.la
-
-libHardCopy_la_CXXFLAGS = $(DTINFO_DEFINES) \
-    -I../../DtMmdb -I../../DtMmdb/HardCopy -I../../DtMmdb/dti_excs	\
-    -I$(BASE)
-
-libHardCopy_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/Imakefile b/cde/programs/dtinfo/mmdb/Imakefile
deleted file mode 100644
index 42566dbc6..000000000
--- a/cde/programs/dtinfo/mmdb/Imakefile
+++ /dev/null
@@ -1,253 +0,0 @@
-XCOMM $TOG: Imakefile /main/12 1998/08/10 15:56:48 mgreess $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define IHaveSubdirs
-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 'CXXDEBUGFLAGS=$(CXXDEBUGFLAGS)'
-
-MMDB_SUBDIRS = HardCopy StyleSheet dti_cc
-
-SUBDIRS = \
-	api			btree \
-	btree_berkeley		compression \
-	diskhash		dstr \
-	dti_excs		dynhash \
-	hmphf			index \
-	mgrs			misc \
-	object			oliasdb \
-	schema			storage \
-	utility			$(MMDB_SUBDIRS)
-
-MMDB_DONES = HardCopy/DONE StyleSheet/DONE dti_cc/DONE
-
-DONES = \
-	api/DONE		btree/DONE \
-	btree_berkeley/DONE	compression/DONE \
-	diskhash/DONE		dstr/DONE \
-	dti_excs/DONE		dynhash/DONE \
-	hmphf/DONE		index/DONE \
-	mgrs/DONE		misc/DONE \
-	object/DONE		oliasdb/DONE \
-	schema/DONE		storage/DONE \
-	utility/DONE		$(MMDB_DONES)
-
-EXTRALIBRARYDEPS = $(DONES)
-
-XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
-#undef  TopLevelProject
-#define TopLevelProject		DtInfo
-IMAKE_DEF_DTINFO =  -DTopLevelProject=TopLevelProject \
-		    -DProjectTmplFile='<DtInfo.tmpl>' \
-		    -DProjectRulesFile='<DtInfo.rules>'
-
-MakeSubdirs($(SUBDIRS))
-ForceSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-
-#define CplusplusSource	YES
-
-/*
- * N.B.:  All .o's should be built in the subdirectories.
- */
-
-API_OBJS = \
-	api/base.o			api/info_base.o \
-	api/info_lib.o			api/smart_ptr.o \
-	api/transaction.o		api/utility.o
-
-BTREE_OBJS = \
-	btree/mmdb_btree.o
-
-#if !defined(AIXArchitecture)
-EXTRA_BTREE_BERKELEY_OBJS = btree_berkeley/memmove.o
-#endif
-
-BTREE_BERKELEY_OBJS = \
-	btree_berkeley/bt_close.o	btree_berkeley/bt_conv.o \
-	btree_berkeley/bt_debug.o	btree_berkeley/bt_delete.o \
-	btree_berkeley/bt_get.o		btree_berkeley/bt_open.o \
-	btree_berkeley/bt_overflow.o	btree_berkeley/bt_page.o \
-	btree_berkeley/bt_put.o		btree_berkeley/bt_search.o \
-	btree_berkeley/bt_seq.o		btree_berkeley/bt_split.o \
-	btree_berkeley/bt_stack.o	btree_berkeley/bt_utils.o \
-	btree_berkeley/mktemp.o		btree_berkeley/realloc.o \
-	btree_berkeley/snprintf.o	$(EXTRA_BTREE_BERKELEY_OBJS) \
-	btree_berkeley/mpool.o		btree_berkeley/db.o
-
-COMPRESSION_OBJS = \
-	compression/abs_agent.o		compression/zip.o \
-	compression/huffman.o		compression/trie.o \
-	compression/code.o		compression/lzss.o \
-	compression/sgml.o		compression/ps.o
-
-DISKHASH_OBJS = \
-	diskhash/disk_bucket.o		diskhash/bucket_array.o \
-	diskhash/disk_hash.o
-
-DSTR_OBJS = \
-	dstr/set.o			dstr/bset.o \
-	dstr/slist.o			dstr/dlist_cell.o \
-	dstr/dlist.o			dstr/heap.o \
-	dstr/void_ptr_array.o		dstr/void_ptr_stack.o \
-	dstr/memory_pool.o		dstr/dstr_test.o \
-	dstr/index_agent.o		dstr/token_stack.o \
-	dstr/slist_char_ptr_cell.o
-
-DTI_EXCS_OBJS = \
-	dti_excs/Jump_Environment.o	dti_excs/Exceptions.o \
-	dti_excs/Exception.o		dti_excs/Destructable.o \
-	dti_excs/terminate.o
-
-DYNHASH_OBJS = \
-	dynhash/data_t.o		dynhash/imp_bucket.o \
-	dynhash/imp_die.o
-
-HMPHF_OBJS = \
-	hmphf/buckets.o			hmphf/mphf_funcs.o \
-	hmphf/mphf_hash_table.o		hmphf/params.o \
-	hmphf/pattern.o			hmphf/sorter.o
-
-INDEX_OBJS = \
-	index/btree_index.o		index/dyn_disk_index.o \
-	index/dyn_index.o		index/dyn_memory_index.o \
-	index/fast_mphf.o		index/hash.o \
-	index/index.o			index/inv_lists.o \
-	index/mphf_index.o
-
-MGRS_OBJS = \
-	mgrs/managers.o			mgrs/misc.o \
-	mgrs/query_mgr.o		mgrs/template_mgr.o
-
-MISC_OBJS = \
-	misc/unique_id.o
-
-OBJECT_OBJS = \
-	object/composite.o		object/compressed_pstring.o \
-	object/cset.o			object/dl_list.o \
-	object/dl_list_cell.o		object/handler.o \
-	object/integer.o		object/long_pstring.o \
-	object/oid.o			object/oid_list.o \
-	object/oid_t.o			object/primitive.o \
-	object/pstring.o		object/random_gen.o \
-	object/root.o			object/short_list.o \
-	object/tuple.o
-
-OLIASDB_OBJS = \
-	oliasdb/asciiIn_filters.o 	oliasdb/collectionIterator.o \
-	oliasdb/dlp_hd.o 		oliasdb/dlp_test.o \
-	oliasdb/doc_hd.o 		oliasdb/doc_test.o \
-	oliasdb/graphic_hd.o 		oliasdb/graphic_test.o \
-	oliasdb/loc_test.o 		oliasdb/locator_hd.o \
-	oliasdb/mark.o 			oliasdb/mark_base.o  \
-	oliasdb/mark_test.o 		oliasdb/mmdb.o \
-	oliasdb/node_hd.o 		oliasdb/node_test.o \
-	oliasdb/olias_funcs.o 		oliasdb/olias_test.o \
-	oliasdb/stylesheet_hd.o 	oliasdb/stylesheet_test.o \
-	oliasdb/toc_hd.o 		oliasdb/toc_test.o \
-	oliasdb/user_base.o
-
-SCHEMA_OBJS = \
-	schema/desc.o			schema/store_desc.o \
-	schema/object_dict.o		schema/stored_object_desc.o \
-	schema/index_desc.o		schema/inv_desc.o \
-	schema/agent_desc.o		schema/container_desc.o \
-	schema/sheet.o			schema/token.o
-
-STORAGE_OBJS = \
-	storage/abs_storage.o		storage/chunks_index.o	\
-	storage/heap_comp_funcs.o	storage/lru.o \
-	storage/page.o			storage/page_cache.o \
-	storage/page_rep.o		storage/page_storage.o \
-	storage/rep_cell.o		storage/rep_policy.o \
-	storage/store_test.o		storage/unixf_storage.o \
-	storage/version.o		storage/vm_storage.o
-
-UTILITY_OBJS = \
-	utility/funcs.o			utility/ostring.o \
-	utility/pm_random.o		utility/atoi_pearson.o \
-	utility/xtime.o			utility/buffer.o \
-	utility/atoi_larson.o		utility/atomic_lock.o \
-	utility/rw_lock.o		utility/atoi_fast.o \
-	utility/filter.o		utility/mmdb_exception.o \
-	utility/randomize.o
-
-DTI_CC_OBJS = \
-	dti_cc/CC_Listbase.o		dti_cc/cc_exceptions.o \
-	dti_cc/CC_String.o		dti_cc/CC_Tokenizer.o \
-	dti_cc/CC_Stack.o		dti_cc/CC_Slist.o
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_HARDCOPY_OBJS = HardCopy/TemplatesAutoNumber.o
-#endif
-
-HARDCOPY_OBJS = \
-	HardCopy/FPset.o		HardCopy/HardCopyFP.o \
-	HardCopy/autoNumber.o		HardCopy/autoNumberFP.o \
-	$(EXTRA_HARDCOPY_OBJS)
-
-#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-EXTRA_STYLESHEET_OBJS = StyleSheet/SSTemplates.o
-#endif
-
-STYLESHEET_OBJS = \
-	StyleSheet/Attribute.o		StyleSheet/AttributeList.o \
-	StyleSheet/BitVector.o		StyleSheet/DocParser.o \
-	StyleSheet/Element.o		StyleSheet/Expression.o \
-	StyleSheet/Feature.o		StyleSheet/FeatureDefDictionary.o \
-	StyleSheet/FeatureSet.o		StyleSheet/FeatureValue.o \
-	StyleSheet/PathQualifier.o	StyleSheet/PathTable.o \
-	StyleSheet/Resolver.o		StyleSheet/ResolverStack.o \
-	StyleSheet/SSPath.o		StyleSheet/StyleSheet.o \
-	StyleSheet/StyleSheetExceptions.o \
-	StyleSheet/SymTab.o		StyleSheet/VariableTable.o \
-	StyleSheet/defParser.o		StyleSheet/defToken.o \
-	StyleSheet/style.o		StyleSheet/tokenStyle.o \
-	StyleSheet/RendererHCV.o	$(EXTRA_STYLESHEET_OBJS)
-
-MMDB_OBJS = $(HARDCOPY_OBJS) $(STYLESHEET_OBJS) $(DTI_CC_OBJS)
-
-OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
-	$(BTREE_BERKELEY_OBJS)	$(COMPRESSION_OBJS) \
-	$(DISKHASH_OBJS)	$(DSTR_OBJS) \
-	$(DTI_EXCS_OBJS) 	$(DYNHASH_OBJS) \
-	$(HMPHF_OBJS)		$(INDEX_OBJS) \
-	$(MGRS_OBJS)		$(MISC_OBJS) \
-	$(OBJECT_OBJS)		$(OLIASDB_OBJS) \
-	$(SCHEMA_OBJS)		$(STORAGE_OBJS) \
-	$(UTILITY_OBJS)		$(MMDB_OBJS)
-
-#include <Library.tmpl>
-
-XCOMM Variables to switch on debug mode temporarily
-XCOMM CDEBUGFLAGS = -g -DDEBUG
-XCOMM CXXDEBUGFLAGS = -g -DDEBUG
-
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 5
-AllTarget(libMMDBTemplates.a)
-
-libMMDBTemplates.a:
-	$(RM) $@
-	find ./templates/Templates.DB -name '*.o' -type f -print | xargs -n4 ar cq $@
-
-clean::
-	$(RM) libMMDBTemplates.a
-	ptclean
-#endif
diff --git a/cde/programs/dtinfo/mmdb/Makefile.am b/cde/programs/dtinfo/mmdb/Makefile.am
deleted file mode 100644
index 36e27e680..000000000
--- a/cde/programs/dtinfo/mmdb/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = \
-        api                     btree \
-        btree_berkeley          compression \
-        diskhash                dstr \
-        dti_excs                dynhash \
-        hmphf                   index \
-        mgrs                    misc \
-        object                  oliasdb \
-        schema                  storage \
-        utility			HardCopy \
-	dti_cc			StyleSheet
-
-noinst_LTLIBRARIES = libMMDB.la
-
-libMMDB_la_SOURCES =
-# fake things so libtool creates this as a C++ library
-nodist_EXTRA_libMMDB_la_SOURCES = dummy.cxx
-
-libMMDB_la_LIBADD = api/libapi.la btree_berkeley/libbtree_berkeley.la	\
-			btree/libbtree.la				\
-			compression/libcompression.la			\
-			diskhash/libdiskhash.la dstr/libdstr.la		\
-			dti_cc/libdti_cc.la dti_excs/libdti_excs.la	\
-			dynhash/libdynhash.la HardCopy/libHardCopy.la	\
-			hmphf/libhmphf.la index/libindex.la		\
-			mgrs/libmgrs.la misc/libmisc.la			\
-			object/libobject.la oliasdb/liboliasdb.la	\
-			schema/libschema.la storage/libstorage.la	\
-			StyleSheet/libStyleSheet.la			\
-			utility/libutility.la
diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
deleted file mode 100644
index a8da4fc21..000000000
--- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile
+++ /dev/null
@@ -1,133 +0,0 @@
-XCOMM $TOG: Imakefile /main/2 1997/12/23 11:43:20 bill $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
-
-#ifdef DtinfoClient
-DEFINES = -DCDE_NEXT 
-#else
-DEFINES =
-#endif
-
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/StyleSheet $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)
-
-#ifdef RegenParserFiles
-LinkSourceFile(defParser.y,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(style.y,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(defToken.l,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(tokenStyle.l,$(DTMMDBSRC)/StyleSheet)
-
-YACCSTACK = -DYYSTACKSIZE=20000
-YFLAGS    = -l -d 
-LFLAGS    = -8 -s 
-
-LexTarget(tokenStyle,style)
-YaccTarget(style,style)
-
-LexTarget(defToken,defParser)
-YaccTarget(defParser,defParser)
-#endif
-
-
-#if defined(CplusplusCompilerMajorVersion) && \
-    (CplusplusCompilerMajorVersion == 4) && !defined(SunArchitecture)
-XCOMM need the ptr repository
-CXXEXTRA_DEFINES = -ptr../templates
-#endif
-
-LinkSourceFile(Attribute.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(AttributeList.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(BitVector.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(DocParser.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(Element.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(Expression.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(Feature.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(FeatureDefDictionary.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(FeatureSet.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(FeatureValue.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(PathQualifier.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(PathTable.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(Resolver.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(ResolverStack.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(SSPath.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(StyleSheet.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(StyleSheetExceptions.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(SymTab.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(VariableTable.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(defParser.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(defToken.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(style.C,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(tokenStyle.C,$(DTMMDBSRC)/StyleSheet)
-
-NORMAL_SRCS = \
-	Attribute.C	AttributeList.C		BitVector.C \
-	DocParser.C	Element.C		Expression.C \
-	Feature.C	FeatureDefDictionary.C	FeatureSet.C \
-	FeatureValue.C	PathQualifier.C		PathTable.C \
-	Resolver.C	ResolverStack.C		SSPath.C \
-	StyleSheet.C	StyleSheetExceptions.C	SymTab.C \
-	VariableTable.C	defParser.C		defToken.C \
-	style.C		tokenStyle.C
-
-#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(BSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4)
-LinkSourceFile(SSTemplates.C,$(DTMMDBSRC)/StyleSheet)
-
-TEMPLATE_SRCS = SSTemplates.C
-#endif
-
-LinkSourceFile(RendererHCV.C,$(DTMMDBSRC)/StyleSheet)
-
-VALIDATOR_SRCS = RendererHCV.C
-
-#ifdef HPArchitecture
-LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
-SpecialCPlusPlusObjectRule(SSTemplates.o,,+pti all_tmpls -DEXPAND_TEMPLATES)
-#elif defined(SunArchitecture) && CplusplusCompilerMajorVersion < 4
-LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet)
-SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES)
-#elif defined(AlphaArchitecture)
-SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture) || \
-      defined(SunArchitecture)
-SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES)
-SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES)
-#else
-SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES)
-SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-ptf -DEXPAND_TEMPLATES)
-#endif
-
-LinkSourceFile(hardcopy.feature.spec,$(DTMMDBSRC)/StyleSheet)
-LinkSourceFile(online.feature.spec,$(DTMMDBSRC)/StyleSheet)
-
-InstallMultipleDest(install_buildtools,hardcopy.feature.spec,$(INSTALL_ETC_DIR))
-InstallMultipleDest(install_buildtools,online.feature.spec,$(INSTALL_ETC_DIR))
-
-SRCS = $(NORMAL_SRCS)       $(TEMPLATE_SRCS)       $(VALIDATOR_SRCS)
-OBJS = $(NORMAL_SRCS:.C=.o) $(TEMPLATE_SRCS:.C=.o) $(VALIDATOR_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am
deleted file mode 100644
index c06324777..000000000
--- a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/StyleSheet
-BUILT_SOURCES = Attribute.C AttributeList.C BitVector.C DocParser.C	\
-       Element.C Expression.C Feature.C FeatureDefDictionary.C		\
-       FeatureSet.C FeatureValue.C PathQualifier.C PathTable.C		\
-       Resolver.C ResolverStack.C SSPath.C StyleSheet.C			\
-       StyleSheetExceptions.C SymTab.C VariableTable.C defParser.C	\
-       defToken.C style.C tokenStyle.C RendererHCV.C
-
-SPECFILES = hardcopy.feature.spec online.feature.spec
-
-BUILT_SOURCES += $(SPECFILES)
-
-if LINUX
-BUILT_SOURCES += SSTemplates.C
-endif
-
-if BSD
-BUILT_SOURCES += SSTemplates.C
-endif
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libStyleSheet.la
-
-libStyleSheet_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb \
-                            -I../../DtMmdb/StyleSheet -I../../DtMmdb/dti_excs \
-			    -I../../DtMmdb/dti_cc -I$(BASE)
-
-libStyleSheet_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/api/Imakefile b/cde/programs/dtinfo/mmdb/api/Imakefile
deleted file mode 100644
index fdd6f0a30..000000000
--- a/cde/programs/dtinfo/mmdb/api/Imakefile
+++ /dev/null
@@ -1,47 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:01 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#if defined(SunArchitecture)
-EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
-#endif
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/api -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
-
-LinkSourceFile(base.C,$(DTMMDBSRC)/api)
-LinkSourceFile(info_base.C,$(DTMMDBSRC)/api)
-LinkSourceFile(info_lib.C,$(DTMMDBSRC)/api)
-LinkSourceFile(smart_ptr.C,$(DTMMDBSRC)/api)
-LinkSourceFile(transaction.C,$(DTMMDBSRC)/api)
-LinkSourceFile(utility.C,$(DTMMDBSRC)/api)
-
-SRCS = base.C info_base.C info_lib.C smart_ptr.C transaction.C utility.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/api/Makefile.am b/cde/programs/dtinfo/mmdb/api/Makefile.am
deleted file mode 100644
index 74378b1d7..000000000
--- a/cde/programs/dtinfo/mmdb/api/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/api
-BUILT_SOURCES = base.C info_base.C info_lib.C smart_ptr.C	\
-		    transaction.C utility.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libapi.la
-
-libapi_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/misc \
-                     -I../../DtMmdb/dti_excs -I$(BASE) $(DTINFO_DEFINES)
-
-libapi_la_SOURCES = $(BUILT_SOURCES)
-
-
-
diff --git a/cde/programs/dtinfo/mmdb/btree/Imakefile b/cde/programs/dtinfo/mmdb/btree/Imakefile
deleted file mode 100644
index 8839abe17..000000000
--- a/cde/programs/dtinfo/mmdb/btree/Imakefile
+++ /dev/null
@@ -1,38 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:05 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/btree -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(mmdb_btree.C,$(DTMMDBSRC)/btree)
-
-SRCS = mmdb_btree.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/btree/Makefile.am b/cde/programs/dtinfo/mmdb/btree/Makefile.am
deleted file mode 100644
index 388951e66..000000000
--- a/cde/programs/dtinfo/mmdb/btree/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/btree
-BUILT_SOURCES = mmdb_btree.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libbtree.la
-
-libbtree_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libbtree_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/btree_berkeley/Imakefile b/cde/programs/dtinfo/mmdb/btree_berkeley/Imakefile
deleted file mode 100644
index 4ba7b16f1..000000000
--- a/cde/programs/dtinfo/mmdb/btree_berkeley/Imakefile
+++ /dev/null
@@ -1,86 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:10 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-DEPEND_DEFINES = $(DEPENDDEFINES)
-DEFINES  = -DMEMMOVE
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/btree_berkeley -I$(DTMMDBSRC)
-
-XCOMM Integretion Berkeley ndbm packege (sun.4.1.3 version) to mmdb:  
-XCOMM 9/15/93.  qfc
-XCOMM
-XCOMM cp -r berkeley.db/PORT/sun.4.1.3/{clib,include,sys}/?* .
-XCOMM
-XCOMM change a few "include" lines in db.h, snprintf.h and mmmove.h. 
-XCOMM
-XCOMM Merge Notes:                            9/15/93.  qfc
-XCOMM SRCS1: btree code. from berkeley.db/btree
-XCOMM SRCS2: clib code. from berkeley.db/PORT/sun.4.1.3/clib
-XCOMM SRCS3: mpool code. from berkeley.db/mpool
-XCOMM SRCS4: db code. from berkeley.db/db
-
-LinkSourceFile(bt_close.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_conv.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_debug.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_delete.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_get.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_open.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_overflow.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_page.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_put.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_search.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_seq.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_split.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_stack.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(bt_utils.c,$(DTMMDBSRC)/btree_berkeley)
-
-SRCS1 =	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c \
-	bt_open.c bt_overflow.c bt_page.c bt_put.c bt_search.c \
-	bt_seq.c bt_split.c bt_stack.c bt_utils.c
-
-#ifndef AIXArchitecture
-LinkSourceFile(memmove.c,$(DTMMDBSRC)/btree_berkeley)
-
-EXTRA_SRCS2 = memmove.c
-#endif
-
-LinkSourceFile(mktemp.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(realloc.c,$(DTMMDBSRC)/btree_berkeley)
-LinkSourceFile(snprintf.c,$(DTMMDBSRC)/btree_berkeley)
-
-SRCS2 = mktemp.c realloc.c snprintf.c
-
-LinkSourceFile(mpool.c,$(DTMMDBSRC)/btree_berkeley)
-
-SRCS3 = mpool.c
-
-LinkSourceFile(db.c,$(DTMMDBSRC)/btree_berkeley)
-
-SRCS4 = db.c
-
-SRCS = $(SRCS1)       $(SRCS2)       $(EXTRA_SRCS2)       $(SRCS3)       $(SRCS4)
-OBJS = $(SRCS1:.c=.o) $(SRCS2:.c=.o) $(EXTRA_SRCS2:.c=.o) $(SRCS3:.c=.o) $(SRCS4:.c=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am
deleted file mode 100644
index 9c58c883f..000000000
--- a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/btree_berkeley
-BUILT_SOURCES = bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c	\
-				bt_open.c bt_overflow.c bt_page.c	\
-				bt_put.c bt_search.c bt_seq.c		\
-				bt_split.c bt_stack.c bt_utils.c	\
-				\
-				mktemp.c realloc.c snprintf.c \
-				\
-				mpool.c \
-				\
-				db.c
-
-if LINUX
-BUILT_SOURCES += memmove.c
-endif
-
-if BSD
-BUILT_SOURCES += memmove.c
-endif
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libbtree_berkeley.la
-
-libbtree_berkeley_la_CFLAGS = $(DTINFO_DEFINES) -DMEMMOVE -I../../DtMmdb	\
-                              -I../../DtMmdb/btree_berkeley -I$(BASE)
-
-libbtree_berkeley_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/compression/Imakefile b/cde/programs/dtinfo/mmdb/compression/Imakefile
deleted file mode 100644
index e8977e3d4..000000000
--- a/cde/programs/dtinfo/mmdb/compression/Imakefile
+++ /dev/null
@@ -1,50 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:14 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/compression -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(abs_agent.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(zip.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(huffman.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(trie.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(code.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(lzss.C,$(DTMMDBSRC)/compression)
-
-NORMAL_SRCS = abs_agent.C zip.C huffman.C trie.C code.C lzss.C
-
-LinkSourceFile(sgml.C,$(DTMMDBSRC)/compression)
-LinkSourceFile(ps.C,$(DTMMDBSRC)/compression)
-
-PARSER_SRCS = sgml.C ps.C
-
-SRCS = $(NORMAL_SRCS)       $(PARSER_SRCS)
-OBJS = $(NORMAL_SRCS:.C=.o) $(PARSER_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/compression/Makefile.am b/cde/programs/dtinfo/mmdb/compression/Makefile.am
deleted file mode 100644
index 94b2ebb19..000000000
--- a/cde/programs/dtinfo/mmdb/compression/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/compression
-BUILT_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C
-
-PARSER_FILES = sgml.C ps.C
-BUILT_SOURCES += $(PARSER_FILES)
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libcompression.la
-
-libcompression_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libcompression_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/diskhash/Imakefile b/cde/programs/dtinfo/mmdb/diskhash/Imakefile
deleted file mode 100644
index 4984884ac..000000000
--- a/cde/programs/dtinfo/mmdb/diskhash/Imakefile
+++ /dev/null
@@ -1,40 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:19 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/diskhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(disk_bucket.C,$(DTMMDBSRC)/diskhash)
-LinkSourceFile(bucket_array.C,$(DTMMDBSRC)/diskhash)
-LinkSourceFile(disk_hash.C,$(DTMMDBSRC)/diskhash)
-
-SRCS = disk_bucket.C bucket_array.C disk_hash.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am
deleted file mode 100644
index 7bf4ac36b..000000000
--- a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/diskhash
-BUILT_SOURCES = disk_bucket.C bucket_array.C disk_hash.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libdiskhash.la
-
-libdiskhash_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libdiskhash_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/dstr/Imakefile b/cde/programs/dtinfo/mmdb/dstr/Imakefile
deleted file mode 100644
index 290842063..000000000
--- a/cde/programs/dtinfo/mmdb/dstr/Imakefile
+++ /dev/null
@@ -1,57 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:22 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
-EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
-#endif
-
-DEFINES  = $(EXCEPTION_DEFINES)
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dstr -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(set.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(bset.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(slist.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(dlist_cell.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(dlist.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(heap.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(void_ptr_array.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(void_ptr_stack.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(memory_pool.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(dstr_test.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(index_agent.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(token_stack.C,$(DTMMDBSRC)/dstr)
-LinkSourceFile(slist_char_ptr_cell.C,$(DTMMDBSRC)/dstr)
-
-SRCS =	set.C bset.C slist.C dlist_cell.C dlist.C heap.C \
-	void_ptr_array.C void_ptr_stack.C \
-	memory_pool.C dstr_test.C \
-	index_agent.C token_stack.C slist_char_ptr_cell.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/dstr/Makefile.am b/cde/programs/dtinfo/mmdb/dstr/Makefile.am
deleted file mode 100644
index bab8c0aed..000000000
--- a/cde/programs/dtinfo/mmdb/dstr/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/dstr
-BUILT_SOURCES = set.C bset.C slist.C dlist_cell.C dlist.C heap.C	\
-	void_ptr_array.C void_ptr_stack.C memory_pool.C dstr_test.C	\
-	index_agent.C token_stack.C slist_char_ptr_cell.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libdstr.la
-
-libdstr_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libdstr_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile b/cde/programs/dtinfo/mmdb/dti_cc/Imakefile
deleted file mode 100644
index 3a995df22..000000000
--- a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:27 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dti_cc $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
-
-LinkSourceFile(CC_Listbase.C,$(DTMMDBSRC)/dti_cc)
-LinkSourceFile(cc_exceptions.C,$(DTMMDBSRC)/dti_cc)
-LinkSourceFile(CC_String.C,$(DTMMDBSRC)/dti_cc)
-LinkSourceFile(CC_Tokenizer.C,$(DTMMDBSRC)/dti_cc)
-LinkSourceFile(CC_Stack.C,$(DTMMDBSRC)/dti_cc)
-LinkSourceFile(CC_Slist.C,$(DTMMDBSRC)/dti_cc)
-
-SRCS =  CC_Listbase.C	cc_exceptions.C	CC_String.C \
-	CC_Tokenizer.C	CC_Stack.C	CC_Slist.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
-
-#ifdef TEST
-TEST_OBJS = $(OBJS) \
-	../utility/mmdb_exception.o \
-	../utility/funcs.o \
-	../utility/atoi_fast.o \
-	../utility/pm_random.o \
-	../dti_excs/Jump_Environment.o \
-	../dti_excs/Exceptions.o \
-	../dti_excs/Exception.o \
-	../dti_excs/Destructable.o \
-	../dti_excs/terminate.o \
-	../dti_excs/centerline.o \
-	../misc/unique_id.o -lm
-
-SpecialCPlusPlusObjectRule(CC_Template.o,,-ptf)
-SimpleCPlusPlusProgram(tt, main.o CC_Template.o,$(TEST_OBJS))
-#endif
diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am
deleted file mode 100644
index e857b56d3..000000000
--- a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/dti_cc
-BUILT_SOURCES = CC_Listbase.C cc_exceptions.C CC_String.C	\
-		       CC_Tokenizer.C CC_Stack.C CC_Slist.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-
-noinst_LTLIBRARIES = libdti_cc.la
-
-libdti_cc_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb	\
-		-I../../DtMmdb/dti_cc -I../../DtMmdb/dti_excs -I$(BASE)
-
-libdti_cc_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
deleted file mode 100644
index b61a45bc9..000000000
--- a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile
+++ /dev/null
@@ -1,87 +0,0 @@
-XCOMM $TOG: Imakefile /main/3 1997/09/05 11:32:58 samborn $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3
-EXCEPTION_DEFINES  = -DHAS_TERMINATE -DNATIVE_EXCEPTIONS
-#elif defined(LinuxArchitecture) || defined(BSDArchitecture)
-EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
-#endif
-
-DEFINES  = -DCC_VERSION=30 -DCHECK_INITIALIZED $(EXCEPTION_DEFINES)
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dti_excs
-
-LinkSourceFile(Jump_Environment.C,$(DTMMDBSRC)/dti_excs)
-LinkSourceFile(Exceptions.C,$(DTMMDBSRC)/dti_excs)
-LinkSourceFile(Exception.C,$(DTMMDBSRC)/dti_excs)
-LinkSourceFile(Destructable.C,$(DTMMDBSRC)/dti_excs)
-LinkSourceFile(terminate.C,$(DTMMDBSRC)/dti_excs)
-
-BASE_SRCS = \
-	Jump_Environment.C	Exceptions.C	Exception.C \
-	Destructable.C		terminate.C
-
-SRCS = $(BASE_SRCS)
-OBJS = $(BASE_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
-
-#ifdef TEST
-tests: $(TESTS)
-
-CPlusPlusProgram(test0,test0.o,$(OBJS))
-CPlusPlusProgram(test1,test1.o,$(OBJS))
-CPlusPlusProgram(test2,test2.o,$(OBJS))
-CPlusPlusProgram(test3,test3.o,$(OBJS))
-CPlusPlusProgram(test4,test4.o,$(OBJS))
-CPlusPlusProgram(test5,test5.o,$(OBJS))
-CPlusPlusProgram(test6,test6.o,$(OBJS))
-CPlusPlusProgram(test7,test7.o,$(OBJS))
-CPlusPlusProgram(test8,test8.o,$(OBJS))
-CPlusPlusProgram(test9,test9.o,$(OBJS))
-CPlusPlusProgram(test10,test10.o,$(OBJS))
-CPlusPlusProgram(test11,test11.o,$(OBJS))
-CPlusPlusProgram(test12,test12.o,$(OBJS))
-CPlusPlusProgram(test13,test13.o,$(OBJS))
-CPlusPlusProgram(test14,test14.o,$(OBJS))
-CPlusPlusProgram(test15,test15.o,$(OBJS))
-CPlusPlusProgram(test16,test16.o,$(OBJS))
-CPlusPlusProgram(test17,test17.o,$(OBJS))
-CPlusPlusProgram(test18,test18.o,$(OBJS))
-CPlusPlusProgram(test19,test19.o,$(OBJS))
-CPlusPlusProgram(test20,test20.o,$(OBJS))
-CPlusPlusProgram(test21,test21.o,$(OBJS))
-CPlusPlusProgram(test22,test22.o,$(OBJS))
-CPlusPlusProgram(test23,test23.o,$(OBJS))
-CPlusPlusProgram(test24,test24.o,$(OBJS))
-CPlusPlusProgram(test25,test25.o,$(OBJS))
-CPlusPlusProgram(test26,test26.o,$(OBJS))
-CPlusPlusProgram(test27,test27.o,$(OBJS))
-CPlusPlusProgram(test28,test28.o,$(OBJS))
-CPlusPlusProgram(test29,test29.o,$(OBJS))
-#endif
diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am
deleted file mode 100644
index f0146f2a1..000000000
--- a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/dti_excs
-BUILT_SOURCES = Jump_Environment.C Exceptions.C Exception.C	\
-			 Destructable.C terminate.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libdti_excs.la
-
-libdti_excs_la_CXXFLAGS = $(DTINFO_DEFINES) -DCC_VERSION=30 -DCHECK_INITIALIZED \
-			 -I../../DtMmdb/dti_excs -I$(BASE)
-
-libdti_excs_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/dynhash/Imakefile b/cde/programs/dtinfo/mmdb/dynhash/Imakefile
deleted file mode 100644
index b9a69e28d..000000000
--- a/cde/programs/dtinfo/mmdb/dynhash/Imakefile
+++ /dev/null
@@ -1,40 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:38 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = 
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/dynhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(data_t.C,$(DTMMDBSRC)/dynhash)
-LinkSourceFile(imp_bucket.C,$(DTMMDBSRC)/dynhash)
-LinkSourceFile(imp_die.C,$(DTMMDBSRC)/dynhash)
-
-SRCS = data_t.C imp_bucket.C imp_die.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am
deleted file mode 100644
index 4857d139c..000000000
--- a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/dynhash
-BUILT_SOURCES = data_t.C imp_bucket.C imp_die.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libdynhash.la
-
-libdynhash_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libdynhash_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/hmphf/Imakefile b/cde/programs/dtinfo/mmdb/hmphf/Imakefile
deleted file mode 100644
index f6d86e2cb..000000000
--- a/cde/programs/dtinfo/mmdb/hmphf/Imakefile
+++ /dev/null
@@ -1,48 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:42 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#if defined(LinuxArchitecture) || defined(BSDArchitecture)
-EXCEPTION_DEFINES  = -DNATIVE_EXCEPTIONS
-#endif
-
-DEFINES  = -DPORTABLE_DB $(EXCEPTION_DEFINES)
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/hmphf -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(buckets.C,$(DTMMDBSRC)/hmphf)
-LinkSourceFile(mphf_funcs.C,$(DTMMDBSRC)/hmphf)
-LinkSourceFile(mphf_hash_table.C,$(DTMMDBSRC)/hmphf)
-LinkSourceFile(params.C,$(DTMMDBSRC)/hmphf)
-LinkSourceFile(pattern.C,$(DTMMDBSRC)/hmphf)
-LinkSourceFile(sorter.C,$(DTMMDBSRC)/hmphf)
-
-SRCS =	buckets.C	mphf_funcs.C	mphf_hash_table.C \
-	params.C	pattern.C	sorter.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am
deleted file mode 100644
index 39ce6ba5f..000000000
--- a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/hmphf
-BUILT_SOURCES = buckets.C mphf_funcs.C mphf_hash_table.C params.C	\
-		      pattern.C sorter.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libhmphf.la
-
-libhmphf_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb	\
--I../../DtMmdb/dti_excs -I$(BASE)
-
-libhmphf_la_SOURCES = $(BUILT_SOURCES)
-
diff --git a/cde/programs/dtinfo/mmdb/index/Imakefile b/cde/programs/dtinfo/mmdb/index/Imakefile
deleted file mode 100644
index 15dcbe8be..000000000
--- a/cde/programs/dtinfo/mmdb/index/Imakefile
+++ /dev/null
@@ -1,48 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:47 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/index -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(btree_index.C,$(DTMMDBSRC)/index)
-LinkSourceFile(dyn_disk_index.C,$(DTMMDBSRC)/index)
-LinkSourceFile(dyn_index.C,$(DTMMDBSRC)/index)
-LinkSourceFile(dyn_memory_index.C,$(DTMMDBSRC)/index)
-LinkSourceFile(fast_mphf.C,$(DTMMDBSRC)/index)
-LinkSourceFile(hash.C,$(DTMMDBSRC)/index)
-LinkSourceFile(index.C,$(DTMMDBSRC)/index)
-LinkSourceFile(inv_lists.C,$(DTMMDBSRC)/index)
-LinkSourceFile(mphf_index.C,$(DTMMDBSRC)/index)
-
-SRCS = 	btree_index.C		dyn_disk_index.C	dyn_index.C \
-	dyn_memory_index.C	fast_mphf.C		hash.C \
-	index.C			inv_lists.C		mphf_index.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/index/Makefile.am b/cde/programs/dtinfo/mmdb/index/Makefile.am
deleted file mode 100644
index fcf498d9c..000000000
--- a/cde/programs/dtinfo/mmdb/index/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/index
-BUILT_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C		\
-		      dyn_memory_index.C fast_mphf.C hash.C index.C	\
-		      inv_lists.C mphf_index.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libindex.la
-
-libindex_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \
-			-I$(BASE)
-
-libindex_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/mgrs/Imakefile b/cde/programs/dtinfo/mmdb/mgrs/Imakefile
deleted file mode 100644
index f47be6b1b..000000000
--- a/cde/programs/dtinfo/mmdb/mgrs/Imakefile
+++ /dev/null
@@ -1,41 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:50 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DCOMPACTED_DISK_REP -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/mgrs -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(managers.C,$(DTMMDBSRC)/mgrs)
-LinkSourceFile(misc.C,$(DTMMDBSRC)/mgrs)
-LinkSourceFile(query_mgr.C,$(DTMMDBSRC)/mgrs)
-LinkSourceFile(template_mgr.C,$(DTMMDBSRC)/mgrs)
-
-SRCS = managers.C misc.C query_mgr.C template_mgr.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am
deleted file mode 100644
index 85921d1a0..000000000
--- a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/mgrs
-BUILT_SOURCES = managers.C misc.C query_mgr.C template_mgr.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libmgrs.la
-
-libmgrs_la_CXXFLAGS = $(DTINFO_DEFINES) -DCOMPACTED_DISK_REP -DPORTABLE_DB -I../../DtMmdb \
-		      -I../../DtMmdb/dti_excs -I$(BASE)
-
-libmgrs_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/misc/Imakefile b/cde/programs/dtinfo/mmdb/misc/Imakefile
deleted file mode 100644
index df59359a4..000000000
--- a/cde/programs/dtinfo/mmdb/misc/Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:54 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = -I$(DTMMBDSRC)/misc
-
-LinkSourceFile(unique_id.c,$(DTMMDBSRC)/misc)
-
-SRCS = unique_id.c
-OBJS = $(SRCS:.c=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/misc/Makefile.am b/cde/programs/dtinfo/mmdb/misc/Makefile.am
deleted file mode 100644
index 15de30858..000000000
--- a/cde/programs/dtinfo/mmdb/misc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-MAINTAINERCLEANFILES= Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/misc
-BUILT_SOURCES = unique_id.c
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libmisc.la
-
-libmisc_la_CFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I$(BASE)
-
-libmisc_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/object/Imakefile b/cde/programs/dtinfo/mmdb/object/Imakefile
deleted file mode 100644
index 13e1f0127..000000000
--- a/cde/programs/dtinfo/mmdb/object/Imakefile
+++ /dev/null
@@ -1,62 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 15:59:58 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMBDSRC)/object -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(composite.C,$(DTMMDBSRC)/object)
-LinkSourceFile(compressed_pstring.C,$(DTMMDBSRC)/object)
-LinkSourceFile(cset.C,$(DTMMDBSRC)/object)
-LinkSourceFile(dl_list.C,$(DTMMDBSRC)/object)
-LinkSourceFile(dl_list_cell.C,$(DTMMDBSRC)/object)
-LinkSourceFile(handler.C,$(DTMMDBSRC)/object)
-LinkSourceFile(integer.C,$(DTMMDBSRC)/object)
-LinkSourceFile(long_pstring.C,$(DTMMDBSRC)/object)
-LinkSourceFile(oid.C,$(DTMMDBSRC)/object)
-LinkSourceFile(oid_list.C,$(DTMMDBSRC)/object)
-LinkSourceFile(oid_t.C,$(DTMMDBSRC)/object)
-LinkSourceFile(primitive.C,$(DTMMDBSRC)/object)
-LinkSourceFile(pstring.C,$(DTMMDBSRC)/object)
-LinkSourceFile(random_gen.C,$(DTMMDBSRC)/object)
-LinkSourceFile(root.C,$(DTMMDBSRC)/object)
-LinkSourceFile(short_list.C,$(DTMMDBSRC)/object)
-LinkSourceFile(tuple.C,$(DTMMDBSRC)/object)
-
-SRCS =	composite.C	compressed_pstring.C \
-	cset.C		dl_list.C \
-	dl_list_cell.C	handler.C \
-	integer.C	long_pstring.C \
-	oid.C		oid_list.C \
-	oid_t.C		primitive.C \
-	pstring.C	random_gen.C \
-	root.C		short_list.C \
-	tuple.C
-OBJS = $(SRCS:.C=.o) 
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/object/Makefile.am b/cde/programs/dtinfo/mmdb/object/Makefile.am
deleted file mode 100644
index cb0b8671f..000000000
--- a/cde/programs/dtinfo/mmdb/object/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/object
-BUILT_SOURCES = composite.C compressed_pstring.C cset.C dl_list.C	\
-		       dl_list_cell.C handler.C integer.C		\
-		       long_pstring.C oid.C oid_list.C oid_t.C		\
-		       primitive.C pstring.C random_gen.C root.C	\
-		       short_list.C tuple.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libobject.la
-
-libobject_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \
-			-I$(BASE)
-
-libobject_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile b/cde/programs/dtinfo/mmdb/oliasdb/Imakefile
deleted file mode 100644
index 9b295138a..000000000
--- a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile
+++ /dev/null
@@ -1,78 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 16:00:03 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-#ifdef DtinfoClient
-DEFINES= -DNO_DB_LOCK -DCDE_NEXT
-#else
-DEFINES= -DNO_DB_LOCK $(BYTE_ORDER_DEFINES)
-#endif
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/oliasdb -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) -I$(DTMMDBSRC)/misc
-
-LinkSourceFile(asciiIn_filters.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(collectionIterator.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(dlp_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(dlp_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(doc_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(doc_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(graphic_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(graphic_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(loc_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(locator_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(mark.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(mark_base.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(mark_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(mmdb.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(node_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(node_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(olias_funcs.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(olias_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(stylesheet_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(stylesheet_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(toc_hd.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(toc_test.C,$(DTMMDBSRC)/oliasdb)
-LinkSourceFile(user_base.C,$(DTMMDBSRC)/oliasdb)
-
-BASE_SRCS =  \
-	asciiIn_filters.C 	collectionIterator.C \
-	dlp_hd.C 		dlp_test.C \
-	doc_hd.C 		doc_test.C \
-	graphic_hd.C 		graphic_test.C \
-	loc_test.C 		locator_hd.C \
-	mark.C 			mark_base.C \
-	mark_test.C 		mmdb.C \
-	node_hd.C 		node_test.C \
-	olias_funcs.C 		olias_test.C \
-	stylesheet_hd.C 	stylesheet_test.C \
-	toc_hd.C 		toc_test.C \
-	user_base.C
-
-SRCS = $(BASE_SRCS)
-OBJS = $(BASE_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am
deleted file mode 100644
index e3b394ec8..000000000
--- a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/oliasdb
-BUILT_SOURCES = asciiIn_filters.C collectionIterator.C dlp_hd.C		\
-			dlp_test.C doc_hd.C doc_test.C graphic_hd.C	\
-			graphic_test.C loc_test.C locator_hd.C mark.C	\
-			mark_base.C mark_test.C mmdb.C node_hd.C	\
-			node_test.C olias_funcs.C olias_test.C		\
-			stylesheet_hd.C stylesheet_test.C toc_hd.C	\
-			toc_test.C user_base.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = liboliasdb.la
-
-liboliasdb_la_CXXFLAGS = $(DTINFO_DEFINES) -DNO_DB_LOCK -DCDE_NEXT -I../../DtMmdb \
-			 -I../../DtMmdb/misc -I../../DtMmdb/dti_excs \
-			 -I../../DtMmdb/dti_cc -I../.. -I../../DtMmdb/oliasdb \
-			 -I$(BASE)
-
-liboliasdb_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/schema/Imakefile b/cde/programs/dtinfo/mmdb/schema/Imakefile
deleted file mode 100644
index 0fe31d258..000000000
--- a/cde/programs/dtinfo/mmdb/schema/Imakefile
+++ /dev/null
@@ -1,55 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 16:00:07 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/schema -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
-
-LinkSourceFile(agent_desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(container_desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(index_desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(inv_desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(object_dict.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(store_desc.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(stored_object_desc.C,$(DTMMDBSRC)/schema)
-
-NORMAL_SRCS = \
-	agent_desc.C	container_desc.C	desc.C \
-	index_desc.C	inv_desc.C		object_dict.C \
-	store_desc.C	stored_object_desc.C
-
-LinkSourceFile(sheet.C,$(DTMMDBSRC)/schema)
-LinkSourceFile(token.C,$(DTMMDBSRC)/schema)
-
-PARSER_SRCS = sheet.C token.C
-
-SRCS = $(NORMAL_SRCS)       $(PARSER_SRCS)
-OBJS = $(NORMAL_SRCS:.C=.o) $(PARSER_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/schema/Makefile.am b/cde/programs/dtinfo/mmdb/schema/Makefile.am
deleted file mode 100644
index 468e73a01..000000000
--- a/cde/programs/dtinfo/mmdb/schema/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/schema
-BUILT_SOURCES = desc.C store_desc.C object_dict.C			\
-		       stored_object_desc.C index_desc.C inv_desc.C	\
-		       agent_desc.C container_desc.C sheet.C token.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libschema.la
-
-libschema_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \
-			-I../../DtMmdb/misc -I$(BASE)
-
-libschema_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/storage/Imakefile b/cde/programs/dtinfo/mmdb/storage/Imakefile
deleted file mode 100644
index 6a8b4f3a3..000000000
--- a/cde/programs/dtinfo/mmdb/storage/Imakefile
+++ /dev/null
@@ -1,55 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 16:00:11 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/storage -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES)
-
-LinkSourceFile(abs_storage.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(chunks_index.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(heap_comp_funcs.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(lru.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(page.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(page_cache.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(page_rep.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(page_storage.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(rep_cell.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(rep_policy.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(store_test.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(unixf_storage.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(version.C,$(DTMMDBSRC)/storage)
-LinkSourceFile(vm_storage.C,$(DTMMDBSRC)/storage)
-
-SRCS =	abs_storage.C	chunks_index.C	heap_comp_funcs.C \
-	lru.C		page.C		page_cache.C \
-	page_rep.C	page_storage.C	rep_cell.C \
-	rep_policy.C	store_test.C	unixf_storage.C \
-	version.C	vm_storage.C
-OBJS = $(SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/storage/Makefile.am b/cde/programs/dtinfo/mmdb/storage/Makefile.am
deleted file mode 100644
index bed6a5885..000000000
--- a/cde/programs/dtinfo/mmdb/storage/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/storage
-BUILT_SOURCES = abs_storage.C chunks_index.C heap_comp_funcs.C lru.C	\
-			page.C page_cache.C page_rep.C page_storage.C	\
-			rep_cell.C rep_policy.C store_test.C		\
-			unixf_storage.C version.C vm_storage.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libstorage.la
-
-libstorage_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB	\
--I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE)
-
-libstorage_la_SOURCES = $(BUILT_SOURCES)
diff --git a/cde/programs/dtinfo/mmdb/utility/Imakefile b/cde/programs/dtinfo/mmdb/utility/Imakefile
deleted file mode 100644
index 9c53bcfde..000000000
--- a/cde/programs/dtinfo/mmdb/utility/Imakefile
+++ /dev/null
@@ -1,57 +0,0 @@
-XCOMM $XConsortium: Imakefile /main/1 1996/08/21 16:00:17 drk $
-
-XCOMM                         ** WARNING **
-XCOMM 
-XCOMM The files named here may appear in many different Imakefiles.
-XCOMM If you add or remove a file, be sure to update all locations.
-XCOMM It's unfortunate, but all this redundancy serves a purpose.
-XCOMM
-XCOMM Other possible locations are:
-XCOMM		.../lib/DtMmdb/Imakefile
-XCOMM		.../lib/DtMmdb/<subdir>/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/Imakefile
-XCOMM		.../programs/dtinfo/mmdb/<subdir>/Imakefile
-
-#define DoNormalLib	YES
-#define DoSharedLib	NO
-#define DoDebugLib	NO
-#define DoProfileLib	NO
-#define LibName		MMDB
-#define LibHeaders	NO
-#define LibCreate	NO
-
-#define CplusplusSource	YES
-DEPEND_DEFINES = $(DEPENDDEFINES)
-
-DEFINES  = -DPORTABLE_DB
-INCLUDES = $(CXXDEPENDINCLUDES) -I$(DTMMDBSRC)/utility -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc
-
-LinkSourceFile(atoi_fast.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(atoi_larson.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(atoi_pearson.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(atomic_lock.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(buffer.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(filter.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(funcs.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(mmdb_exception.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(ostring.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(pm_random.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(randomize.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(rw_lock.C,$(DTMMDBSRC)/utility)
-LinkSourceFile(xtime.C,$(DTMMDBSRC)/utility)
-
-BASE_SRCS = \
-	atoi_fast.C		atoi_larson.C		atoi_pearson.C \
-	atomic_lock.C		buffer.C		filter.C \
-	funcs.C			mmdb_exception.C	ostring.C \
-	pm_random.C		randomize.C		rw_lock.C \
-	xtime.C
-
-SRCS = $(BASE_SRCS)
-OBJS = $(BASE_SRCS:.C=.o)
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-
-DependTarget()
diff --git a/cde/programs/dtinfo/mmdb/utility/Makefile.am b/cde/programs/dtinfo/mmdb/utility/Makefile.am
deleted file mode 100644
index 3252f55d0..000000000
--- a/cde/programs/dtinfo/mmdb/utility/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk
-
-BASE = ../../DtMmdb/utility
-BUILT_SOURCES = atoi_fast.C atoi_larson.C atoi_pearson.C		\
-	atomic_lock.C buffer.C filter.C funcs.C mmdb_exception.C	\
-	ostring.C pm_random.C randomize.C rw_lock.C xtime.C
-
-$(BUILT_SOURCES):
-	$(LN_S) $(BASE)/$@ $@
-
-CLEANFILES = $(BUILT_SOURCES)
-
-noinst_LTLIBRARIES = libutility.la
-
-libutility_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB		\
-	-I../../DtMmdb -I../../DtMmdb/dti_excs -I../../DtMmdb/misc -I$(BASE)
-
-libutility_la_SOURCES = $(BUILT_SOURCES)