make new refactoring build on linux