MBS-5759: add proper includes to unbreak tests