Optimize header inclusion to minimize dependency.

[heinsaar]

@ArakelMkrtchyan, @DavitTevanyan did this without remembering this was assigned to you - but don't worry, there are other hard issues to choose from.