Tidy up unused/badly named headers

Change-Id: I7539d334182938d73d0e533010c3c2da54840e77
6 files changed