Comment 3 for bug 208821

This is a cleaned up version of the change, which does not include any of the non-CxxTest unit tests. It only affects Windows and should be relatively safe to commit. I haven't done so though since it also affects the normal build process. Which I consider a good thing, as it will prevent people from breaking tests, but I wouldn't want to commit it without at least some community response.