Various small style/include cleanup.

R=yzshen@chromium.org

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