The headers were mangled.
These tickets fix two build problems that created packaging issues.