Upgrade dependencies, clean up base file to make includable.