Clean up some of the includes following my refactoring patch.

Combination of removing unused includes, include-what-you-use and forward-decl'ing to move an include to the .cc file.

BUG=579109

Review URL: https://codereview.chromium.org/1701883006

Cr-Commit-Position: refs/heads/master@{#376014}
4 files changed