Move header clones to its own packages