Renamed bundled Expat headers to avoid any possibility of accidental including system headers when using bundled Expat, or vice-versa. Should help with SVN crashes reported by Thomas.