This looks OK to me. Unfortunately, the real testing that's needed is with compilers < 3.4. If you can do that it would increase confidence in the change. But either way, I think it's worthwhile enough to be able to complete the header unification that this should go in before 2.16. Thanks, Roland