From aa1cd02a4367834026ea2205ea13a2f904455aa1 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 4 Jan 2023 15:23:13 +0100
Subject: [PATCH] Zend/zend_fibers: include cleanup

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

diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c
index f6065561793..57d080d4dd1 100644
--- a/Zend/zend_fibers.c
+++ b/Zend/zend_fibers.c
@@ -17,6 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
+#include "zend_fibers.h"
+#include "zend_objects.h" // for zend_object_std_init()
 #include "zend.h"
 #include "zend_API.h"
 #include "zend_ini.h"
@@ -42,6 +44,9 @@
 # include <sys/mman.h>
 # include <limits.h>
 
+# include <errno.h>
+# include <string.h> // for strerror()
+
 # if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
 #  define MAP_ANONYMOUS MAP_ANON
 # endif
diff --git a/Zend/zend_fibers.h b/Zend/zend_fibers.h
index 5faa788f4ef..15f7d43979d 100644
--- a/Zend/zend_fibers.h
+++ b/Zend/zend_fibers.h
@@ -20,14 +20,18 @@
 #ifndef ZEND_FIBERS_H
 #define ZEND_FIBERS_H
 
-#include "zend_API.h"
-#include "zend_types.h"
+#include "zend_API.h" // for struct zend_fcall_info
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+#include <stddef.h>
 
 #define ZEND_FIBER_GUARD_PAGES 1
 
 #define ZEND_FIBER_DEFAULT_C_STACK_SIZE (4096 * (((sizeof(void *)) < 8) ? 256 : 512))
 #define ZEND_FIBER_VM_STACK_SIZE (1024 * sizeof(zval))
 
+typedef struct _zend_fiber_context zend_fiber_context;
+
 BEGIN_EXTERN_C()
 
 typedef enum {