The header conformance testing code needed extending for XPG7. This exposed a few bugs in the headers. There are more changes to come.