- protection with __WINDOWS__ and not WIN32 or _WIN32 - protect all the headers This commit was SVN r8463.