The issue is largely obsolete as we pull in all API types from their actual sources now. Submitted a PR to do so for two more types which were (partially) copied until now.