Merge pull request #2229 from xfxyjwf/fixbuild

Remove missing files from build.