add geometry include which is needed only on windows
Merge branch 'master' into mingw