From ef7fbfd71025f034b0bfcb413efd181ce798fc1b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Thu, 5 Jan 2023 10:33:43 +0100
Subject: [PATCH] Zend/zend_API: include cleanup

---
 Zend/zend_API.c |  8 +++-----
 Zend/zend_API.h | 12 ++++++------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index c06d6119b7a..6c42d274c0d 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -19,15 +19,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_execute.h"
 #include "zend_API.h"
-#include "zend_modules.h"
+#include "zend_arena.h"
+#include "zend_objects.h" // for zend_objects_new()
 #include "zend_extensions.h"
 #include "zend_constants.h"
-#include "zend_interfaces.h"
+#include "zend_interfaces.h" // for zend_ce_stringable
 #include "zend_exceptions.h"
-#include "zend_closures.h"
 #include "zend_inheritance.h"
 #include "zend_ini.h"
 #include "zend_enum.h"
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index cbc455eaab0..44ea4eaf878 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -22,13 +22,13 @@
 #ifndef ZEND_API_H
 #define ZEND_API_H
 
-#include "zend_modules.h"
-#include "zend_list.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
-#include "zend_execute.h"
-#include "zend_type_info.h"
+#include "zend_compile.h" // for zif_handler
+#include "zend_execute.h" // for get_active_function_or_method_name()
+#include "zend_globals.h" // for struct _zend_compiler_globals used by ZEND_MAP_PTR_GET_IMM()
+#include "zend_globals_macros.h" // for CG() used by ZEND_MAP_PTR_GET_IMM()
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 
+typedef struct _zend_module_entry zend_module_entry;
 
 BEGIN_EXTERN_C()