Remove unused headers

Change-Id: Idadb17aeb85b011d114ffc1d81c920544bac1989
4 files changed