Please, no more pointless changes like that. Or if you insist, please
do the required tedious changes in *all* affected source files (also
platforms/configurations that you don't build). They could in this
case, to a large exent, have been done "blindly" in a mechanical
fashion even without being able to build on all platforms.