Zend/zend_interfaces: include cleanup

Author: MaxKellermann

Zend/zend_interfaces.c

@@ -16,11 +16,13 @@
    +----------------------------------------------------------------------+
 */
 
+#include "zend_interfaces.h"
 #include "zend.h"
 #include "zend_API.h"
-#include "zend_interfaces.h"
+#include "zend_arena.h"
 #include "zend_exceptions.h"
 #include "zend_interfaces_arginfo.h"
+#include "zend_objects.h" // for zend_object_std_init()
 
 ZEND_API zend_class_entry *zend_ce_traversable;
 ZEND_API zend_class_entry *zend_ce_aggregate;

Zend/zend_interfaces.h

@@ -19,8 +19,12 @@
 #ifndef ZEND_INTERFACES_H
 #define ZEND_INTERFACES_H
 
-#include "zend.h"
-#include "zend_API.h"
+#include "zend_iterators.h" // for zend_object_iterator
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_serialize_data zend_serialize_data;
+typedef struct _zend_unserialize_data zend_unserialize_data;
 
 BEGIN_EXTERN_C()