Further refactoring patch removing extraneous includes Change-Id: I3ca9a4990ae3e7fd85de646a095e72e4baf67c0f