Merge "tinyxml: reduce visibility."