Try to fix the windows build. The comments in other files don't seem to
be quite accurate. =]