How did the additional includes sneak into database.h? Fixed!