Merge pull request #9005 from fsateler/circular-deps
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 15 May 2018 19:56:50 +0000 (21:56 +0200)
committerGitHub <noreply@github.com>
Tue, 15 May 2018 19:56:50 +0000 (21:56 +0200)
core: Fix some header dependencies


Trivial merge