based on r45960, xsd-330 with header patches