More changes to setup, build and headers, that allow the package to be
installed even in local installs.