Windows distrib tweak
Merge branch 'master' into introspection
Windows build fixes

Mostly add EXPORT to things, and adding files to CMakeLists