Thus, BeOS compatibility is preserved (and there is no risk of breaking GCC5<->GCC2 interoperation on hybrid builds.) This commit only makes the actual change, the build fixes are in the next commit.