[DF-3966] small refactoring: fix includes order