Fix Windows build more.
Merge pull request #559 from nico/9_9

Fix Windows build more.