Merge pull request #3489 from nrwahl2/nrwahl2-xml_compat_drops
Drop as much of xml_compat.h as we can