Zend/zend_list: include cleanup

Author: MaxKellermann

Zend/zend_list.c

@@ -19,10 +19,12 @@
 
 /* resource lists */
 
-#include "zend.h"
 #include "zend_list.h"
-#include "zend_API.h"
-#include "zend_globals.h"
+#include "zend_execute.h" // for get_active_class_name()
+#include "zend_globals.h" // for struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
+#include "zend_hash.h"
+#include "zend_types.h" // for zval
 
 ZEND_API int le_index_ptr;
 

Zend/zend_list.h

@@ -20,8 +20,12 @@
 #ifndef ZEND_LIST_H
 #define ZEND_LIST_H
 
-#include "zend_hash.h"
-#include "zend_globals.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_array HashTable;
+typedef struct _zend_resource zend_resource;
+typedef struct _zend_string zend_string;
+typedef struct _zval_struct zval;
 
 BEGIN_EXTERN_C()