OS_INC edits, xml2 stuff for SunOS