Moved all windows specific #define/#undef to WinHeaders.h
Merge branch 'master' of https://github.com/taylor001/crown