Adjust include so the amalgamation works with MSVC
Merge branch 'master' of https://github.com/ctrychta/velox