Cleanup headers

Change-Id: Ibbfc359b8af2f5d12013dd4235ee5b9b83fc6712