Pull me

- Changes for CMake build
- Must use windows.h when building on MinGW