GitLab

Also remove an unused header and add it where actually used.

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

Cr-Commit-Position: refs/heads/master@{#295789}