Adapt the MSDOS build to the latest changes on mainline.