This is a better fix for getting compiation working in MSVC++
Reorganizing a bit to make setup easier