diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h b/cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h
index 92d480cf4..3a8b0f050 100644
--- a/cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h
+++ b/cde/programs/dtinfo/DtMmdb/HardCopy/FPExceptions.h
@@ -26,7 +26,7 @@
 #ifndef _FPExceptions_h
 #define _FPExceptions_h
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 /////////////////////////////////////////////////////////
 //
diff --git a/cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am
new file mode 100644
index 000000000..ce005c44b
--- /dev/null
+++ b/cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am
@@ -0,0 +1,11 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libHardCopy.la
+
+libHardCopy_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I..
+
+libHardCopy_la_SOURCES = FPset.C \
+			 HardCopyFP.C \
+			 TemplatesAutoNumber.C \
+			 autoNumber.C \
+			 autoNumberFP.C
diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am
index 67926f4fd..b52f2d0e6 100644
--- a/cde/programs/dtinfo/DtMmdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/Makefile.am
@@ -1,28 +1,49 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = \
-        api                     btree \
-        btree_berkeley          compression \
-        diskhash                dstr \
-        dti_excs                dynhash \
-        hmphf                   index \
-        mgrs                    misc \
-        object                  oliasdb \
-        schema                  storage \
-        utility
+SUBDIRS = HardCopy \
+	  StyleSheet \
+	  api \
+	  btree \
+	  btree_berkeley \
+	  compression \
+	  diskhash \
+	  dstr \
+	  dti_cc \
+	  dti_excs \
+	  dynhash \
+	  hmphf \
+	  index \
+	  mgrs \
+	  misc \
+	  object \
+	  oliasdb \
+	  schema \
+	  storage \
+	  utility
 
 lib_LTLIBRARIES = libDtMmdb.la
 
 libDtMmdb_la_SOURCES =
 
-libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la 
+libDtMmdb_la_LIBADD = HardCopy/libHardCopy.la \
+		      StyleSheet/libStyleSheet.la \
+		      api/libapi.la \
+		      btree/libbtree.la \
 		      btree_berkeley/libbtree_berkeley.la \
-		      compression/libcompression.la diskhash/libdiskhash.la \
-		      dstr/libdstr.la libdti_excs/libdti_excs.la \
-		      dynhash/libdynhash.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 \
+		      compression/libcompression.la \
+		      diskhash/libdiskhash.la \
+		      dstr/libdstr.la \
+		      dti_cc/libdti_cc.la \
+		      dti_excs/libdti_excs.la \
+		      dynhash/libdynhash.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 \
 		      utility/libutility.la
 
 libDtMmdb_la_LDFLAGS = -version-info 2:1:0
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h
index 67d3f59bc..ecc74bccf 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/DocParser.h
@@ -29,7 +29,7 @@
 using namespace std;
 
 #include "SymTab.h"
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 class Resolver;
 class Attribute;
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
new file mode 100644
index 000000000..6cb41b98b
--- /dev/null
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libStyleSheet.la
+
+libStyleSheet_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I..
+
+libStyleSheet_la_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 \
+			   RendererHCV.C \
+			   Resolver.C \
+			   ResolverStack.C \
+			   SSPath.C \
+			   SSTemplates.C \
+			   StyleSheet.C \
+			   StyleSheetExceptions.C \
+			   SymTab.C \
+			   VariableTable.C \
+			   defParser.C \
+			   defToken.C \
+			   style.C \
+			   tokenStyle.C
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h b/cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h
index d3e4bf25f..77c652b42 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Renderer.h
@@ -26,7 +26,7 @@
 #define _Renderer_h 1
 
 #include "Feature.h"
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 /* **************************************************************
  * class Renderer
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h b/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h
index 98e731d78..a2127b8e4 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/Resolver.h
@@ -33,7 +33,7 @@ class ResolverStack;
 
 #include "SSPath.h"
 #include "ResolverStack.h"
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 
 /* **************************************************************
diff --git a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h b/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h
index 5fd16f513..5f101486f 100644
--- a/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h
+++ b/cde/programs/dtinfo/DtMmdb/StyleSheet/StyleSheetExceptions.h
@@ -24,7 +24,7 @@
 #ifndef _StyleSheetExceptions_h
 #define _StyleSheetExceptions_h
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "SymTab.h"
 
 #define CASTEXCEPT
diff --git a/cde/programs/dtinfo/DtMmdb/api/Makefile.am b/cde/programs/dtinfo/DtMmdb/api/Makefile.am
index bc408295f..7c4c7a031 100644
--- a/cde/programs/dtinfo/DtMmdb/api/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/api/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libapi.la
 
-libapi_la_CXXFLAGS = -DC_API -I.. -I../misc -I../dti_excs
+libapi_la_CXXFLAGS = -I..
 
 libapi_la_SOURCES = base.C info_base.C info_lib.C smart_ptr.C transaction.C \
 		    utility.C
diff --git a/cde/programs/dtinfo/DtMmdb/api/info_lib.C b/cde/programs/dtinfo/DtMmdb/api/info_lib.C
index e1ce42a8e..715d2d78a 100644
--- a/cde/programs/dtinfo/DtMmdb/api/info_lib.C
+++ b/cde/programs/dtinfo/DtMmdb/api/info_lib.C
@@ -48,7 +48,7 @@
  */
 
 
-#include "unique_id.h"
+#include "misc/unique_id.h"
 #include "api/info_lib.h"
 #include "utility/db_version.h"
 #include "oliasdb/locator_hd.h"
diff --git a/cde/programs/dtinfo/DtMmdb/api/utility.C b/cde/programs/dtinfo/DtMmdb/api/utility.C
index f6d950217..ac7fbd431 100644
--- a/cde/programs/dtinfo/DtMmdb/api/utility.C
+++ b/cde/programs/dtinfo/DtMmdb/api/utility.C
@@ -49,7 +49,7 @@
 
 
 #include "api/utility.h"
-#include "unique_id.h"
+#include "misc/unique_id.h"
 
 typedef char* charPtr;
 
diff --git a/cde/programs/dtinfo/DtMmdb/btree/Makefile.am b/cde/programs/dtinfo/DtMmdb/btree/Makefile.am
index 10496002c..5d60eabe4 100644
--- a/cde/programs/dtinfo/DtMmdb/btree/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/btree/Makefile.am
@@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libbtree.la
 
-libbtree_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
+libbtree_la_CXXFLAGS = -I..
 
 libbtree_la_SOURCES = mmdb_btree.C
diff --git a/cde/programs/dtinfo/DtMmdb/compression/Makefile.am b/cde/programs/dtinfo/DtMmdb/compression/Makefile.am
index 97b675f66..f6e276356 100644
--- a/cde/programs/dtinfo/DtMmdb/compression/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/compression/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libcompression.la
 
-libcompression_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
+libcompression_la_CXXFLAGS = -I..
 
 libcompression_la_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C \
 			    sgml.C ps.C
diff --git a/cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am b/cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am
index 2bcf23793..b7519ff4c 100644
--- a/cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/diskhash/Makefile.am
@@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libdiskhash.la
 
-libdiskhash_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
+libdiskhash_la_CXXFLAGS = -I..
 
 libdiskhash_la_SOURCES = disk_bucket.C bucket_array.C disk_hash.C
diff --git a/cde/programs/dtinfo/DtMmdb/dstr/Makefile.am b/cde/programs/dtinfo/DtMmdb/dstr/Makefile.am
index 2103e2e17..0e1b0f9af 100644
--- a/cde/programs/dtinfo/DtMmdb/dstr/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/dstr/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libdstr.la
 
-libdstr_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
+libdstr_la_CXXFLAGS = -I..
 
 libdstr_la_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 \
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C
index bfd05fef0..2ce16b455 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Dlist.C
@@ -24,7 +24,7 @@
 #ifndef __CC_Dlist_cc
 #define __CC_Dlist_cc
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "cc_exceptions.h"
 #include "CC_Dlist.h"
 
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C
index b5a180978..4ea466b8b 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Listbase.C
@@ -49,7 +49,7 @@
  *                  Campbell, CA  95008
  * 
  */
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "cc_exceptions.h"
 #include "CC_Listbase.h"
 
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h
index 378f5d19a..053cb7c3b 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/CC_Stack.h
@@ -24,7 +24,7 @@
 #ifndef _Stack_hh
 #define _Stack_hh
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "CC_Slist.h"
 
 template <class T> class Stack: public Destructable
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am b/cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am
new file mode 100644
index 000000000..8154fa43f
--- /dev/null
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am
@@ -0,0 +1,19 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+noinst_LTLIBRARIES = libdti_cc.la
+
+libdti_cc_la_CXXFLAGS = -I..
+
+libdti_cc_la_SOURCES = CC_Dlist.C \
+		       CC_Listbase.C \
+		       CC_Slist.C \
+		       CC_Stack.C \
+		       CC_String.C \
+		       CC_Tokenizer.C \
+		       cc_exceptions.C \
+		       cc_hdict.C \
+		       cc_povec.C \
+		       cc_pvect.C \
+		       cc_vvect.C \
+		       hdictinit.C \
+		       vectinit.C
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h
index 3bd19d822..a1c58ea16 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_exceptions.h
@@ -28,7 +28,7 @@
 #include <fstream>
 #include <iostream>
 using namespace std;
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 #define END_TRY end_try 
 
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C
index b202e42e1..d8a08c70b 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_hdict.C
@@ -1,6 +1,7 @@
 // $TOG: cc_hdict.C /main/5 1998/04/17 11:45:00 mgreess $
 
 #include "dti_cc/cc_exceptions.h"
+#include "dti_cc/cc_hdict.h"
 
 template <class K, class V> CC_Boolean kv_pair<K, V>::f_needRemove = FALSE;
 
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C
index 822d3c627..d99bb2fc4 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_povec.C
@@ -22,6 +22,9 @@
  */
 // $XConsortium: cc_povec.cc /main/3 1996/06/11 16:56:44 cde-hal $
 
+#include "dti_cc/cc_povec.h"
+#include "dti_cc/cc_pvect.h"
+
 template <class T>
 dlist_array<T>::dlist_array(const dlist_array<T>& da) 
 {
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C
index 8334110f1..09d4c48d0 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_pvect.C
@@ -23,6 +23,7 @@
 // $TOG: cc_pvect.C /main/6 1998/04/17 11:45:20 mgreess $
 
 #include "dti_cc/cc_exceptions.h"
+#include "dti_cc/cc_pvect.h"
 
 template <class T> 
 pointer_vector<T>::pointer_vector(const pointer_vector<T>& pv) :
diff --git a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C
index e1d23dd2c..3453aa4c8 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C
+++ b/cde/programs/dtinfo/DtMmdb/dti_cc/cc_vvect.C
@@ -23,6 +23,7 @@
 // $XConsortium: cc_vvect.C /main/4 1996/08/21 15:49:18 drk $
 
 #include "dti_cc/cc_exceptions.h"
+#include "dti_cc/cc_vvect.h"
 
 template <class T> 
 value_vector<T>::value_vector(const value_vector<T>& vv) :
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am
index fa5deee53..a518b7cc2 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Makefile.am
@@ -2,11 +2,11 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libdti_excs.la
 
-libdti_excs_la_CXXFLAGS = -DC_API -DCC_VERSION=30 -DCHECK_INITIALIZED
+libdti_excs_la_CXXFLAGS = -DNATIVE_EXCEPTIONS
 
 if SOLARIS
 libdti_excs_la_CXXFLAGS += -DHAS_TERMINATE
 endif
 
 libdti_excs_la_SOURCES = Jump_Environment.C      Exceptions.C    Exception.C \
-			 Destructable.C          terminate.C	 init.C
+			 Destructable.C          terminate.C
diff --git a/cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am b/cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am
index 1c837550a..a996e23a2 100644
--- a/cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/dynhash/Makefile.am
@@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libdynhash.la
 
-libdynhash_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
+libdynhash_la_CXXFLAGS = -I..
 
 libdynhash_la_SOURCES = data_t.C imp_bucket.C imp_die.C
diff --git a/cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am b/cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am
index 3f0669e20..62d7f6c28 100644
--- a/cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/hmphf/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libhmphf.la
 
-libhmphf_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
+libhmphf_la_CXXFLAGS = -DPORTABLE_DB -I..
 
 libhmphf_la_SOURCES = buckets.C       mphf_funcs.C    mphf_hash_table.C \
 		      params.C        pattern.C       sorter.C
diff --git a/cde/programs/dtinfo/DtMmdb/index/Makefile.am b/cde/programs/dtinfo/DtMmdb/index/Makefile.am
index 9e0b929cf..30358d5ba 100644
--- a/cde/programs/dtinfo/DtMmdb/index/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/index/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libindex.la
 
-libindex_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
+libindex_la_CXXFLAGS = -DPORTABLE_DB -I..
 
 libindex_la_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C  \
 		      dyn_memory_index.C fast_mphf.C hash.C index.C \
diff --git a/cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am b/cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am
index c9cf20aa3..59422c878 100644
--- a/cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/mgrs/Makefile.am
@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libmgrs.la
 
-libmgrs_la_CXXFLAGS = -DC_API -DCOMPACTED_DISK_REP -DPORTABLE_DB -I.. \
-		      -I../dti_excs
+libmgrs_la_CXXFLAGS = -DCOMPACTED_DISK_REP -DPORTABLE_DB -I..
 
 libmgrs_la_SOURCES = managers.C misc.C query_mgr.C template_mgr.C
diff --git a/cde/programs/dtinfo/DtMmdb/misc/Makefile.am b/cde/programs/dtinfo/DtMmdb/misc/Makefile.am
index ef83ec7e8..427ed7e40 100644
--- a/cde/programs/dtinfo/DtMmdb/misc/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/misc/Makefile.am
@@ -2,6 +2,4 @@ MAINTAINERCLEANFILES= Makefile.in
 
 noinst_LTLIBRARIES = libmisc.la
 
-libmisc_la_CFLAGS = -DPORTABLE_DB
-
 libmisc_la_SOURCES = unique_id.c
diff --git a/cde/programs/dtinfo/DtMmdb/object/Makefile.am b/cde/programs/dtinfo/DtMmdb/object/Makefile.am
index dc96b75c0..c7a361908 100644
--- a/cde/programs/dtinfo/DtMmdb/object/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/object/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libobject.la
 
-libobject_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
+libobject_la_CXXFLAGS = -DPORTABLE_DB -I..
 
 libobject_la_SOURCES = composite.C     compressed_pstring.C    cset.C \
 		       dl_list.C       dl_list_cell.C          handler.C \
diff --git a/cde/programs/dtinfo/DtMmdb/object/new_delete.h b/cde/programs/dtinfo/DtMmdb/object/new_delete.h
index 2d70ea77d..d586e435a 100644
--- a/cde/programs/dtinfo/DtMmdb/object/new_delete.h
+++ b/cde/programs/dtinfo/DtMmdb/object/new_delete.h
@@ -51,7 +51,7 @@
 #ifndef _new_delete_h
 #define _new_delete_h 1
 
-#include "new_delete_simple.h"
+#include "dti_excs/new_delete_simple.h"
 
 #ifdef C_API
 #include <stdlib.h>
diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
index 436f1c46e..b3e018670 100644
--- a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am
@@ -6,29 +6,19 @@ infolib_DATA = mmdb.infolib.spec
 
 noinst_LTLIBRARIES = liboliasdb.la
 
-liboliasdb_la_CXXFLAGS = -DC_API -DNO_DB_LOCK -DCDE_NEXT -I.. -I../misc \
-			 -I../dti_excs -I../dti_cc -I../..
+liboliasdb_la_CXXFLAGS = -DNO_DB_LOCK -I..
 
-liboliasdb_la_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		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
+liboliasdb_la_SOURCES = asciiIn_filters.C \
+			collectionIterator.C \
+			dlp_hd.C \
+			doc_hd.C \
+			graphic_hd.C \
+			locator_hd.C \
+			mark.C \
+			mark_base.C \
+			mmdb.C \
+			node_hd.C \
+			olias_funcs.C \
+			stylesheet_hd.C \
+			toc_hd.C \
+			user_base.C
diff --git a/cde/programs/dtinfo/DtMmdb/schema/Makefile.am b/cde/programs/dtinfo/DtMmdb/schema/Makefile.am
index 7b3fc449c..c9991baae 100644
--- a/cde/programs/dtinfo/DtMmdb/schema/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/schema/Makefile.am
@@ -1,9 +1,8 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-
 noinst_LTLIBRARIES = libschema.la
 
-libschema_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs -I../misc
+libschema_la_CXXFLAGS = -I..
 
 libschema_la_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 \
diff --git a/cde/programs/dtinfo/DtMmdb/storage/Makefile.am b/cde/programs/dtinfo/DtMmdb/storage/Makefile.am
index f17489b87..3c083b5fd 100644
--- a/cde/programs/dtinfo/DtMmdb/storage/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/storage/Makefile.am
@@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libstorage.la
 
-libstorage_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
+libstorage_la_CXXFLAGS = -DPORTABLE_DB -I..
 
 libstorage_la_SOURCES = abs_storage.C   chunks_index.C  heap_comp_funcs.C \
 			lru.C           page.C          page_cache.C \
diff --git a/cde/programs/dtinfo/DtMmdb/utility/Makefile.am b/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
index 080f67ccb..10beddabc 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
+++ b/cde/programs/dtinfo/DtMmdb/utility/Makefile.am
@@ -2,12 +2,10 @@ MAINTAINERCLEANFILES = Makefile.in
 
 noinst_LTLIBRARIES = libutility.la
 
-libutility_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs -I../misc
+libutility_la_CXXFLAGS = -DPORTABLE_DB -I..
 
 libutility_la_SOURCES = 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	streambuf.C     charbuf.C \
-		        filebuf.C       string.C 	stringstream.C \
-			iostream.C      fstream.C       stream.C 	ios.C
+			randomize.C
diff --git a/cde/programs/dtinfo/DtMmdb/utility/funcs.C b/cde/programs/dtinfo/DtMmdb/utility/funcs.C
index c32478b6c..44f1eb68d 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/funcs.C
+++ b/cde/programs/dtinfo/DtMmdb/utility/funcs.C
@@ -44,7 +44,7 @@
 
 
 #include "utility/funcs.h"
-#include "unique_id.h"
+#include "misc/unique_id.h"
 
 #define X_INCLUDE_TIME_H
 #define XOS_USE_XT_LOCKING
diff --git a/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h b/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h
index 773c9d443..fd1eab894 100644
--- a/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h
+++ b/cde/programs/dtinfo/DtMmdb/utility/mmdb_exception.h
@@ -51,7 +51,7 @@
 #ifndef _mmdb_exception_h
 #define _mmdb_exception_h 1
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 #ifdef C_API
 #include "utility/c_fstream.h"