split some defns into headers