Delete headers that have been moved

Change-Id: I72e81a3ea789fe15d5a6cea281ebe43f82220669