Zend/zend_objects: include cleanup

Author: MaxKellermann

Zend/zend_objects.c

@@ -18,13 +18,14 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_globals.h"
-#include "zend_variables.h"
-#include "zend_API.h"
-#include "zend_interfaces.h"
-#include "zend_exceptions.h"
-#include "zend_weakrefs.h"
+#include "zend_objects.h"
+#include "zend_objects_API.h"
+#include "zend_exceptions.h" // for zend_rethrow_exception()
+#include "zend_execute.h" // for ZEND_REF_HAS_TYPE_SOURCES
+#include "zend_types.h" // for GC_SET_REFCOUNT()
+#include "zend_weakrefs.h" // for zend_weakrefs_notify()
+#include "zend.h" // for struct _zend_class_entry
+#include "zend_API.h" // for zend_call_known_instance_method_with_0_params()
 
 static zend_always_inline void _zend_object_std_init(zend_object *object, zend_class_entry *ce)
 {

Zend/zend_objects.h

@@ -20,7 +20,10 @@
 #ifndef ZEND_OBJECTS_H
 #define ZEND_OBJECTS_H
 
-#include "zend.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_object zend_object;
 
 BEGIN_EXTERN_C()
 ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce);

Zend/zend_objects_API.c

@@ -18,11 +18,12 @@
    +----------------------------------------------------------------------+
 */
 
+#include "zend_objects_API.h"
+#include "zend_objects.h" // for zend_objects_destroy_object()
 #include "zend.h"
 #include "zend_globals.h"
 #include "zend_variables.h"
 #include "zend_API.h"
-#include "zend_objects_API.h"
 #include "zend_fibers.h"
 
 ZEND_API void ZEND_FASTCALL zend_objects_store_init(zend_objects_store *objects, uint32_t init_size)

Zend/zend_objects_API.h

@@ -20,8 +20,12 @@
 #ifndef ZEND_OBJECTS_API_H
 #define ZEND_OBJECTS_API_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_gc.h" // for GC_MAY_LEAK
+#include "zend_compile.h" // for ZEND_ACC_USE_GUARDS
+#include "zend.h" // for _zend_class_entry
+
+typedef struct _zend_object zend_object;
 
 #define OBJ_BUCKET_INVALID			(1<<0)