VS files are not in repo anymore
Make everything compile after merge.

Namespaces were missing and be aware that NOMINMAX has to be
specified in the preprocessor to avoid picking up windows
defines.