move common declarations into drt, where possible