From 9b9ea0d7c696f2990a159b2a2dafbc04547dc10f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Thu, 5 Jan 2023 09:01:24 +0100
Subject: [PATCH] Zend/zend_list: include cleanup

---
 Zend/zend_list.c | 8 +++++---
 Zend/zend_list.h | 8 ++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 51ef3e1d92e..6b2742c6808 100644
--- a/Zend/zend_list.c
+++ b/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;
 
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 680915121e2..643abe65023 100644
--- a/Zend/zend_list.h
+++ b/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()