Simple port from the TDB1 versions.  Also, change to "tdb2.h" includes
so they can be built even in other directories in future.