From fc1f528e5e3ee45ab17ae8dcfad6a6422ff2002d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 4 Jan 2023 20:22:28 +0100
Subject: [PATCH] Zend/zend_interfaces: include cleanup

---
 Zend/zend_interfaces.c | 4 +++-
 Zend/zend_interfaces.h | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index d05310b737b..52cc476578b 100644
--- a/Zend/zend_interfaces.c
+++ b/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;
diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h
index 883e482f510..e8291213d7f 100644
--- a/Zend/zend_interfaces.h
+++ b/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()