Avoid anonymous namespace in header from r210747