Moving inclusion of database class to inside the defined type for
database