Rework header/includes

@dreamer-dead could you please review these changes?