Merge "init: small header clean up"