based on r45210, xsd-330 with header patches