fix compiling error and miss file on vs.
Merge pull request #4863 from Dhilan007/develop_crash

fix compiling error and miss file on vs.