Merge "init: clean up more headers"