GitLab

Removes need for allowing circular includes.

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

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