Core Data codegen with Framework

I have an App and App Extension that share a Core Data model, facilitated by placing the model and all of the NSManagedObject subclasses into a separate Framework target. If I try to enable codegen on the Core Data model, I end up with build errors because the generated category headers are not exposed in the public umbrella header for the framework, even though the framework itself will build. As codegen is new, I'm unsure of best practices in this case... clearly the headers are in Derived Data to avoid modification, but is it acceptable to copy them into the public headers of the framework? Is there a better way to approach this?