Fix difference between linux and win.

Compiling with two different versions of headers is bad. Crashing is
bad. This is not bad.
Merge branch 'linux-build'