Remove unnecessary includes

Test: build

Change-Id: Icf18be5d36a20962870a0d9e6323ab4861e8659a
4 files changed