Cleanup of the source files, fixing inclusion and removing the ancient rursolve.