These changes allow the obsolete C sources to build again.