Fix Windows build.
Fix VS2013.
Remove include.
Merge pull request #4524 from thedax/fixWindows

Fix Windows build, and VS2013 build.