build system changes for easier build from public sources