Merge "init: more header cleanup"