Restore some files, fix build.