Provide a mechanism to declare untypedef'ed structs
Merge branch 'feature/c-annotation'