Fixed declarations of recursive data types and different versions of DbXRef type name