[s2145] Fix build for VS2013. This will ammend commit [s2125]
[s2146] Fix more mistakes in VS2013 files
[s2147] Remove useless defined added in [s2130] by mistake