Update file contents to renamed header #2
Fix compiler errors about forced explicit return
Fix minor compiler warnings
Remove erroneous insertion of a semi-colon

This is a bug fix for Issue:#1
Merge remote-tracking branch 'origin/feature/SDL2' into feature/MSVC
Merge remote-tracking branch 'origin/feature/MSVC' into experimental/MSVC