Merge "init: more header cleanup"
am: ab5ab1ebd4

Change-Id: I1f7cdd93e96e47cadf9b80ba428d11a358a49176