Remove unused headers

Test: builds
Change-Id: I3e2cecc62f7e0fce8cf7f1eaebded6a53b1c4b78
3 files changed