Fixing build with files that seem to have disappeared in git