regressions: Windows header and define fixes.
Merge branch 'master' of https://github.com/davidjoseph/ck