We currently have struct definitions duplicated between php_phongo_structs-5.h and php_phongo_structs-7.h. There's no reason we can't consolidate these into one file with a macro that places zend_object std in the appropriate position.