Regenerated the headers after the last commit, they now include the proper #include's for their parent classes, next up adding the includes for the classes referenced by fields.