diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C
index d262a3e9b..ee5435b4a 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/AusText.C
@@ -32,7 +32,7 @@
  */
 
 /* imported interfaces */
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "Task.h"
 #include "FlexBuffer.h"
 #include "Token.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C
index 749b03151..b7b13979a 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/BookTasks.C
@@ -44,7 +44,7 @@ using namespace std;
 #include "NodeTask.h"
 #include "TOCTask.h"
 #include "BookCaseDB.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "StringList.h"
 #include "StyleTask.h"
 #include "api/utility.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h
index 4cc5f86be..211cbf2a5 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ConcatTask.h
@@ -25,7 +25,7 @@
 #define __Concat_h__
 
 #include "Task.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 
 class ExprList;
 class Token;
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C
index 05c92973b..e3b867737 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Content.C
@@ -27,7 +27,7 @@
 
 /* imported interfaces */
 #include "Dispatch.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "Token.h"
 #include "SGMLName.h"
 
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
index 4862633ee..bc4661302 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/DataBase.h
@@ -25,7 +25,7 @@
 #ifndef __DataBase_h
 #define __DataBase_h
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "object/c_codes.h" /* mmdb codes */
 #include "oliasdb/olias_consts.h"
 #include <errno.h>
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C
index 830a8c510..4af8e9675 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/FirstOf.C
@@ -30,7 +30,7 @@
 #include "ExprList.h"
 #include "Expression.h"
 #include "Token.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "ConcatTask.h"
 #include "Content.h"
 #include "AttributeData.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C
index 9a6286ff5..4cf1f0871 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/GenericId.C
@@ -29,7 +29,7 @@
 #include "Dispatch.h"
 #include "SGMLName.h"
 #include "OLAF.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "Token.h"
 
 #ifdef FISH_DEBUG
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C
index bbb5a39cc..3ff30e431 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/GraphicsTask.C
@@ -33,7 +33,7 @@ using namespace std;
 #include "Dispatch.h"
 #include "FlexBuffer.h"
 #include "OLAF.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "Token.h"
 #include "SearchEng.h"
 #include "BookTasks.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C
index b5b3785a6..8ccdbd12c 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/LcfTask.C
@@ -39,7 +39,7 @@
 #include "Token.h"
 #include "NodeTask.h"
 #include "DataBase.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "OLAF.h"
 #include "BookTasks.h"
 #include "BookCaseDB.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C
index bf272fed2..332e460fe 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/MixedGen.C
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <strings.h>
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "FlexBuffer.h"
 #include "oliasdb/mmdb.h"
 #include "oliasdb/asciiIn_filters.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C
index 0179f65d7..c5101a35b 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/NCFGen.C
@@ -28,7 +28,7 @@
 #include <sstream>
 using namespace std;
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "DataBase.h"
 #include "BookCaseDB.h"
 #include "Task.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C
index 482fe8168..da269754a 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeData.C
@@ -49,7 +49,7 @@ using namespace std;
 #include "SearchEng.h"
 #include "OLAF.h"
 #include "SGMLName.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "BookTasks.h"
 #include "DataBase.h"
 #include "BookCaseDB.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C
index 85809a0ca..c569a8927 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeParser.C
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include "dti_cc/CC_Stack.h"
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "DataBase.h"
 
 #include "Dispatch.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C
index f8fe8c623..f1c63c20e 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/NodeTask.C
@@ -40,7 +40,7 @@ using namespace std;
 #include "BookTasks.h"
 #include "BookCaseDB.h"
 #include "DataBase.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "NodeData.h"
 #include "StyleTask.h"
 #include "api/utility.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
index c4b82adc0..ed9bd0864 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/ReplaceIdIdref.ll
@@ -20,7 +20,7 @@
 #include "SearchEng.h"
 #include "OLAF.h"
 #include "SGMLName.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "BookTasks.h"
 #include "DataBase.h"
 #include "BookCaseDB.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C
index 0cdc21052..ff5a02f96 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchEng.C
@@ -24,7 +24,7 @@
 
 /* imported interfaces */
 #include "dti_cc/CC_Stack.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "Task.h"
 #include "FlexBuffer.h"
 #include "Token.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
index 3c1688e32..021340442 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/SearchPath.C
@@ -30,7 +30,7 @@
 #include <sstream>
 using namespace std;
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "Task.h"
 #include "api/utility.h"
 
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C
index 5e58dba4d..62d069c0c 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleTask.C
@@ -37,7 +37,7 @@
 #include "DataBase.h"
 #include "FlexBuffer.h"
 #include "OLAF.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "SGMLName.h"
 #include "StringList.h"
 #include "Token.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C
index dd7334145..7fef03521 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/StyleUpdate.C
@@ -27,7 +27,7 @@
 using namespace std;
 
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 #include "dti_cc/CC_Stack.h"
 
 #include "DataBase.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C
index 94bba5037..09b5958a8 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.C
@@ -30,7 +30,7 @@
 #include "AttributeRec.h"
 #include "OLAF.h"
 #include "SGMLName.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 #include "BookTasks.h"
 #include "DataBase.h"
 #include "BookCaseDB.h"
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h
index 76cf2a543..9b6db46f2 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/TOCTask.h
@@ -26,7 +26,7 @@
 #define __TOCTask_h
 
 #include "Task.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 
 class DBTable;
 class BookTask;
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C b/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C
index cc6167e2d..0c901e898 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.C
@@ -163,12 +163,12 @@ void TestTask::data(const char *data, size_t)
 }
 
 /*
- * TestTask 2 is for OL-Data testing
+ * TestTask 2 is for OL_Data testing
  */
 
 #include <stdio.h>
 #include "OLAF.h"
-#include "OL-Data.h"
+#include "OL_Data.h"
 TestTask2::TestTask2()
 {
   f_base = -1;
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h
index d7fac5d0b..490b3a55a 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Task.h
@@ -27,7 +27,7 @@
 
 #include <stddef.h>
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 class Unexpected : public Exception{
 public:
diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h b/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h
index de449dc56..0a0fd249c 100644
--- a/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h
+++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Token.h
@@ -29,7 +29,7 @@
 #include <sstream>
 using namespace std;
 
-#include "Exceptions.hh"
+#include "dti_excs/Exceptions.hh"
 
 #include "SGMLDefn.h"
 #include "AttributeList.h"