Match changes to unix build system.