diff --git a/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc b/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc
index fcd3cdbb..5cfec721 100644
--- a/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc
+++ b/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc
@@ -126,15 +126,6 @@ SdaiPoly_line::SdaiPoly_line( SdaiPoly_line & e ) {
 }
 SdaiPoly_line::~SdaiPoly_line() {  }
 
-
-#ifdef __O3DB__
-void
-SdaiPoly_line::oodb_reInit() {
-    eDesc = example_schemae_poly_line;
-    attributes [0].aDesc = a_0points;
-}
-#endif
-
 SdaiPoly_line::SdaiPoly_line( SCLP23( Application_instance ) *se, int * addAttrs ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -199,17 +190,6 @@ SdaiShape::SdaiShape( SdaiShape & e ) {
 }
 SdaiShape::~SdaiShape() {  }
 
-
-#ifdef __O3DB__
-void
-SdaiShape::oodb_reInit() {
-    eDesc = example_schemae_shape;
-    attributes [0].aDesc = a_1item_name;
-    attributes [1].aDesc = a_2item_color;
-    attributes [2].aDesc = a_3number_of_sides;
-}
-#endif
-
 SdaiShape::SdaiShape( SCLP23( Application_instance ) *se, int * addAttrs ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -363,15 +343,6 @@ create_SdaiRectangle( os_database * db ) {
 }
 #endif
 
-#ifdef __O3DB__
-void
-SdaiRectangle::oodb_reInit() {
-    eDesc = example_schemae_rectangle;
-    attributes [3].aDesc = a_4height;
-    attributes [4].aDesc = a_5width;
-}
-#endif
-
 SdaiRectangle::SdaiRectangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -450,13 +421,6 @@ SdaiSquare::SdaiSquare( SdaiSquare & e ) {
 }
 SdaiSquare::~SdaiSquare() {  }
 
-#ifdef __O3DB__
-void
-SdaiSquare::oodb_reInit() {
-    eDesc = example_schemae_square;
-}
-#endif
-
 SdaiSquare::SdaiSquare( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiRectangle( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -504,16 +468,6 @@ SdaiTriangle::SdaiTriangle( SdaiTriangle & e ) {
 }
 SdaiTriangle::~SdaiTriangle() {  }
 
-#ifdef __O3DB__
-void
-SdaiTriangle::oodb_reInit() {
-    eDesc = example_schemae_triangle;
-    attributes [3].aDesc = a_6side1_length;
-    attributes [4].aDesc = a_7side2_length;
-    attributes [5].aDesc = a_8side3_length;
-}
-#endif
-
 SdaiTriangle::SdaiTriangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -620,14 +574,6 @@ SdaiCircle::SdaiCircle( SdaiCircle & e ) {
 }
 SdaiCircle::~SdaiCircle() {  }
 
-#ifdef __O3DB__
-void
-SdaiCircle::oodb_reInit() {
-    eDesc = example_schemae_circle;
-    attributes [3].aDesc = a_9radius;
-}
-#endif
-
 SdaiCircle::SdaiCircle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -691,16 +637,6 @@ SdaiLine::SdaiLine( SdaiLine & e ) {
 }
 SdaiLine::~SdaiLine() {  }
 
-
-#ifdef __O3DB__
-void
-SdaiLine::oodb_reInit() {
-    eDesc = example_schemae_line;
-    attributes [0].aDesc = a_10end_point_one;
-    attributes [1].aDesc = a_11end_point_two;
-}
-#endif
-
 SdaiLine::SdaiLine( SCLP23( Application_instance ) *se, int * addAttrs ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
@@ -788,16 +724,6 @@ SdaiCartesian_point::SdaiCartesian_point( SdaiCartesian_point & e ) {
 }
 SdaiCartesian_point::~SdaiCartesian_point() {  }
 
-#ifdef __O3DB__
-void
-SdaiCartesian_point::oodb_reInit() {
-    eDesc = example_schemae_cartesian_point;
-    attributes [0].aDesc = a_12x;
-    attributes [1].aDesc = a_13y;
-    attributes [2].aDesc = a_14z;
-}
-#endif
-
 SdaiCartesian_point::SdaiCartesian_point( SCLP23( Application_instance ) *se, int * addAttrs ) {
     /* Set this to point to the head entity. */
     HeadEntity( se );
diff --git a/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h b/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h
index 33428dd3..4b2a9abd 100644
--- a/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h
+++ b/src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h
@@ -5,10 +5,6 @@
 // regenerate it.
 /* $Id$  */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #ifndef  SCHEMA_H
 #include <schema.h>
 #endif
@@ -110,10 +106,6 @@ class SdaiPoly_line  :    public SCLP23( Application_instance ) {
         SdaiPoly_line( SdaiPoly_line & e );
         ~SdaiPoly_line();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 0 ;
         }
@@ -123,17 +115,10 @@ class SdaiPoly_line  :    public SCLP23( Application_instance ) {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiPoly_line() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiPoly_line ;
-}
-#else
 inline SdaiPoly_line *
 create_SdaiPoly_line() {
     return  new SdaiPoly_line ;
 }
-#endif
 
 /////////    END_ENTITY poly_line
 
@@ -157,10 +142,6 @@ class SdaiShape  :    public SCLP23( Application_instance ) {
         SdaiShape( SdaiShape & e );
         ~SdaiShape();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 1 ;
         }
@@ -176,17 +157,10 @@ class SdaiShape  :    public SCLP23( Application_instance ) {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiShape() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiShape ;
-}
-#else
 inline SdaiShape *
 create_SdaiShape() {
     return  new SdaiShape ;
 }
-#endif
 
 /////////    END_ENTITY shape
 
@@ -208,10 +182,6 @@ class SdaiRectangle  :    public SdaiShape  {
         SdaiRectangle( SdaiRectangle & e );
         ~SdaiRectangle();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 2 ;
         }
@@ -226,17 +196,10 @@ class SdaiRectangle  :    public SdaiShape  {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiRectangle() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiRectangle ;
-}
-#else
 inline SdaiRectangle *
 create_SdaiRectangle() {
     return  new SdaiRectangle ;
 }
-#endif
 
 /////////    END_ENTITY rectangle
 
@@ -254,10 +217,6 @@ class SdaiSquare  :    public SdaiRectangle  {
         SdaiSquare( SdaiSquare & e );
         ~SdaiSquare();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 3 ;
         }
@@ -266,17 +225,10 @@ class SdaiSquare  :    public SdaiRectangle  {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiSquare() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiSquare ;
-}
-#else
 inline SdaiSquare *
 create_SdaiSquare() {
     return  new SdaiSquare ;
 }
-#endif
 
 /////////    END_ENTITY square
 
@@ -300,10 +252,6 @@ class SdaiTriangle  :    public SdaiShape  {
         SdaiTriangle( SdaiTriangle & e );
         ~SdaiTriangle();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 4 ;
         }
@@ -321,17 +269,10 @@ class SdaiTriangle  :    public SdaiShape  {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiTriangle() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiTriangle ;
-}
-#else
 inline SdaiTriangle *
 create_SdaiTriangle() {
     return  new SdaiTriangle ;
 }
-#endif
 
 /////////    END_ENTITY triangle
 
@@ -351,10 +292,6 @@ class SdaiCircle  :    public SdaiShape  {
         SdaiCircle( SdaiCircle & e );
         ~SdaiCircle();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 5 ;
         }
@@ -366,17 +303,10 @@ class SdaiCircle  :    public SdaiShape  {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiCircle() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiCircle ;
-}
-#else
 inline SdaiCircle *
 create_SdaiCircle() {
     return  new SdaiCircle ;
 }
-#endif
 
 /////////    END_ENTITY circle
 
@@ -398,10 +328,6 @@ class SdaiLine  :    public SCLP23( Application_instance ) {
         SdaiLine( SdaiLine & e );
         ~SdaiLine();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 6 ;
         }
@@ -414,17 +340,10 @@ class SdaiLine  :    public SCLP23( Application_instance ) {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiLine() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiLine ;
-}
-#else
 inline SdaiLine *
 create_SdaiLine() {
     return  new SdaiLine ;
 }
-#endif
 
 /////////    END_ENTITY line
 
@@ -448,10 +367,6 @@ class SdaiCartesian_point  :    public SCLP23( Application_instance ) {
         SdaiCartesian_point( SdaiCartesian_point & e );
         ~SdaiCartesian_point();
 
-#ifdef __O3DB__
-        void oodb_reInit();
-#endif
-
         int opcode()  {
             return 7 ;
         }
@@ -467,17 +382,10 @@ class SdaiCartesian_point  :    public SCLP23( Application_instance ) {
 
 };
 
-#ifdef __O3DB__
-inline SCLP23( Application_instance_ptr )
-create_SdaiCartesian_point() {
-    return ( SCLP23( Application_instance_ptr ) ) new SdaiCartesian_point ;
-}
-#else
 inline SdaiCartesian_point *
 create_SdaiCartesian_point() {
     return  new SdaiCartesian_point ;
 }
-#endif
 
 /////////    END_ENTITY cartesian_point
 
diff --git a/src/clSchemas/example/schema.h b/src/clSchemas/example/schema.h
index 61f5e55f..d8c7724d 100644
--- a/src/clSchemas/example/schema.h
+++ b/src/clSchemas/example/schema.h
@@ -8,10 +8,6 @@
 #include <sys/time.h>
 #endif
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <sdai.h>
 
 
diff --git a/src/cleditor/dispnode.h b/src/cleditor/dispnode.h
index 30c917a4..78b8f487 100644
--- a/src/cleditor/dispnode.h
+++ b/src/cleditor/dispnode.h
@@ -16,9 +16,6 @@
 /* $Id: dispnode.h,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 /*#include <STEPattribute.h>*/
 /*#include <STEPentity.h>*/
diff --git a/src/cleditor/dispnodelist.h b/src/cleditor/dispnodelist.h
index 30d288ab..59d63bc9 100644
--- a/src/cleditor/dispnodelist.h
+++ b/src/cleditor/dispnodelist.h
@@ -16,9 +16,6 @@
 /* $Id: dispnodelist.h,v 3.0.1.2 1997/11/05 22:11:40 sauderd DP3.1 $ */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 #include <gennode.h>
 //#include <gennode.inline.h>
diff --git a/src/cleditor/mgrnode.h b/src/cleditor/mgrnode.h
index 150fa87a..5a163292 100644
--- a/src/cleditor/mgrnode.h
+++ b/src/cleditor/mgrnode.h
@@ -15,9 +15,6 @@
 /* $Id: mgrnode.h,v 3.0.1.4 1997/11/05 22:11:37 sauderd DP3.1 $ */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 class GenericNode;
 class DisplayNode;
diff --git a/src/cleditor/mgrnodearray.h b/src/cleditor/mgrnodearray.h
index 0d6be39a..296b2613 100644
--- a/src/cleditor/mgrnodearray.h
+++ b/src/cleditor/mgrnodearray.h
@@ -16,9 +16,6 @@
 /* $Id: mgrnodearray.h,v 3.0.1.3 1997/11/05 22:11:38 sauderd DP3.1 $ */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 #include <string.h>
 
diff --git a/src/cleditor/mgrnodelist.h b/src/cleditor/mgrnodelist.h
index bebc0277..d54aa029 100644
--- a/src/cleditor/mgrnodelist.h
+++ b/src/cleditor/mgrnodelist.h
@@ -16,9 +16,6 @@
 /* $Id: mgrnodelist.h,v 3.0.1.2 1997/11/05 22:11:38 sauderd DP3.1 $ */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 #include <gennode.h>
 //#include <gennode.inline.h>
diff --git a/src/cleditor/needFunc.h b/src/cleditor/needFunc.h
index 2ad8f148..c4452ce9 100644
--- a/src/cleditor/needFunc.h
+++ b/src/cleditor/needFunc.h
@@ -1,7 +1,4 @@
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 // define this to be the name of the display window object for
 // STEP entity instance editing or define your own.
diff --git a/src/cleditor/seeinfodefault.h b/src/cleditor/seeinfodefault.h
index 0e293805..37984bbb 100644
--- a/src/cleditor/seeinfodefault.h
+++ b/src/cleditor/seeinfodefault.h
@@ -16,9 +16,6 @@
 //  dependent on a user interface toolkit
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 
 class MgrNode;
 class DisplayNode;
diff --git a/src/clprobe-ui/headerdisp.cc b/src/clprobe-ui/headerdisp.cc
index f60a46bb..39c8e47a 100644
--- a/src/clprobe-ui/headerdisp.cc
+++ b/src/clprobe-ui/headerdisp.cc
@@ -11,9 +11,6 @@
 
 /* $Id: headerdisp.cc,v 3.0.1.1 1997/11/05 23:01:05 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdlib.h>
 #include <ctype.h>
 #include <stream.h>
diff --git a/src/clprobe-ui/instcmdbufdisp.cc b/src/clprobe-ui/instcmdbufdisp.cc
index 09811361..e32012e6 100644
--- a/src/clprobe-ui/instcmdbufdisp.cc
+++ b/src/clprobe-ui/instcmdbufdisp.cc
@@ -23,9 +23,6 @@
  *    7) i(save incomplete)
  */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/clprobe-ui/probe.cc b/src/clprobe-ui/probe.cc
index 1ec6dcb6..0addd26f 100644
--- a/src/clprobe-ui/probe.cc
+++ b/src/clprobe-ui/probe.cc
@@ -13,10 +13,6 @@
 
 
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 //#define EXCHANGE_FILE_DIR "\0"
 #define EXCHANGE_FILE_DIR "~pdevel/src/probe/data"
 #define WORKING_FILE_DIR "~pdevel/src/probe/data"
diff --git a/src/clprobe-ui/probemain.cc b/src/clprobe-ui/probemain.cc
index 40dfdada..c78685f1 100644
--- a/src/clprobe-ui/probemain.cc
+++ b/src/clprobe-ui/probemain.cc
@@ -11,9 +11,6 @@
 
 /* $Id: probemain.cc,v 3.0.1.1 1997/11/05 23:01:08 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/clprobe-ui/sclfilechooser.cc b/src/clprobe-ui/sclfilechooser.cc
index b8afab91..d62655ff 100644
--- a/src/clprobe-ui/sclfilechooser.cc
+++ b/src/clprobe-ui/sclfilechooser.cc
@@ -11,10 +11,6 @@
 
 /* $Id: sclfilechooser.cc,v 3.0.1.1 1997/11/05 23:01:13 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <IV-2_6/InterViews/adjuster.h>
 #include <IV-2_6/InterViews/border.h>
 #include <IV-2_6/InterViews/box.h>
diff --git a/src/clprobe-ui/seestreditors.cc b/src/clprobe-ui/seestreditors.cc
index 10bae4e9..4cf9fc9f 100644
--- a/src/clprobe-ui/seestreditors.cc
+++ b/src/clprobe-ui/seestreditors.cc
@@ -11,9 +11,6 @@
 
 /* $Id: seestreditors.cc,v 3.0.1.1 1997/11/05 23:01:09 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdio.h>  // for printf()
 #include <ctype.h>  // for iscntrl()
 #include <string.h> // for strchr()
diff --git a/src/clprobe-ui/seinstdisp.cc b/src/clprobe-ui/seinstdisp.cc
index 6ac47a99..24c39a66 100644
--- a/src/clprobe-ui/seinstdisp.cc
+++ b/src/clprobe-ui/seinstdisp.cc
@@ -11,9 +11,6 @@
 
 /* $Id: seinstdisp.cc,v 3.0.1.1 1997/11/05 23:01:10 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdlib.h>
 #include <ctype.h>
 
diff --git a/src/clprobe-ui/setypedisp.cc b/src/clprobe-ui/setypedisp.cc
index 8bbbaed9..e4d41505 100644
--- a/src/clprobe-ui/setypedisp.cc
+++ b/src/clprobe-ui/setypedisp.cc
@@ -11,9 +11,6 @@
 
 /* $Id: setypedisp.cc,v 3.0.1.1 1997/11/05 23:01:11 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdlib.h>
 #include <ctype.h>
 
diff --git a/src/clprobe-ui/stepentdescriptor.cc b/src/clprobe-ui/stepentdescriptor.cc
index 30b65479..c61cf92f 100644
--- a/src/clprobe-ui/stepentdescriptor.cc
+++ b/src/clprobe-ui/stepentdescriptor.cc
@@ -11,9 +11,6 @@
 
 /* $Id: stepentdescriptor.cc,v 3.0.1.4 1997/11/05 23:01:12 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/src/clprobe-ui/stepenteditor.cc b/src/clprobe-ui/stepenteditor.cc
index 1266d8d1..65023506 100644
--- a/src/clprobe-ui/stepenteditor.cc
+++ b/src/clprobe-ui/stepenteditor.cc
@@ -11,10 +11,6 @@
 
 /* $Id: stepenteditor.cc,v 3.0.1.1 1998/02/17 19:42:07 sauderd DP3.1 $ */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <ctype.h>
 #include <stdio.h>
 #include <stream.h>
diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc
index b9091499..44a2b0aa 100644
--- a/src/clutils/gennode.cc
+++ b/src/clutils/gennode.cc
@@ -15,9 +15,6 @@
 #include <gennode.h>
 #include <gennodelist.h>
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
 //////////////////////////////////////////////////////////////////////////////
 // class GenericNode inline functions that depend on other classes
 //  inline functions
diff --git a/src/clutils/gennode.h b/src/clutils/gennode.h
index 7d30180b..dbafbdef 100644
--- a/src/clutils/gennode.h
+++ b/src/clutils/gennode.h
@@ -16,11 +16,8 @@
 /* $Id: gennode.h,v 3.0.1.3 1997/11/05 22:33:47 sauderd DP3.1 $  */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <iostream>
+
 class GenNodeList;
 class MgrNodeList;
 class DisplayNodeList;
diff --git a/src/clutils/gennodearray.h b/src/clutils/gennodearray.h
index ef20c1d7..571eacf9 100644
--- a/src/clutils/gennodearray.h
+++ b/src/clutils/gennodearray.h
@@ -22,10 +22,6 @@
  */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <string.h>
 #include <memory.h>
 #include <stdlib.h> // to get bcopy for CenterLine
diff --git a/src/clutils/gennodelist.h b/src/clutils/gennodelist.h
index a22343af..8921b7be 100644
--- a/src/clutils/gennodelist.h
+++ b/src/clutils/gennodelist.h
@@ -16,10 +16,6 @@
 /* $Id: gennodelist.h,v 3.0.1.2 1997/11/05 22:33:48 sauderd DP3.1 $  */
 
 #include <scl_export.h>
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 #include <iostream>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/src/test/needFunc.h b/src/test/needFunc.h
index 1a429c2d..a473c332 100644
--- a/src/test/needFunc.h
+++ b/src/test/needFunc.h
@@ -1,7 +1,3 @@
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 // define this to be the name of the display window object for
 // STEP entity instance editing or define your own.
 
diff --git a/src/test/tests.h b/src/test/tests.h
index 3012faf9..b6e38199 100644
--- a/src/test/tests.h
+++ b/src/test/tests.h
@@ -12,10 +12,6 @@
  * (circa version 2.0.x) to test the STEP Class Libraries.
  */
 
-#ifdef __O3DB__
-#include <OpenOODB.h>
-#endif
-
 /* C++ Stuff */
 #include <iostream>