Remove unnecessary includes and forward declarations

Bug: 67908544
Test: build
Change-Id: I824625940ba562571b16ed21e351ee17807d7d30
19 files changed