Included all of odb.  Modified include definitions;  accepted warnings