Changes to build a library-less project with current build-system