Merge "init: clean up more headers"
am: 4f6feec25b

Change-Id: Icd46443f3405b80c3f10981301eb931cc204d6a2