Merge pull request #764 from mikeller/fix_generated_files

Fixed generated files to work seamlessly on win32.

Author: mikeller