Fixes for cygwin

Fails to compile without these changes.

Also, one of the files was using a mix of CRLF and LF. Changed to LF only using dos2unix.