Fix base path for include-file statements.
Fix "include :config-with-no-package" in packages from "include-file".