moving header related things into own namespace