[BUG #8414] fixed mixin includes