shifting common declarations out of the defined type