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

---
 Zend/zend_gc.c | 11 ++++++++---
 Zend/zend_gc.h |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index 66324672b1e..ccd75a0706b 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -66,9 +66,14 @@
  *
  * @see http://researcher.watson.ibm.com/researcher/files/us-bacon/Bacon01Concurrent.pdf
  */
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_fibers.h"
+
+#include "zend_gc.h"
+#include "zend_alloc.h" // for ZEND_MM_OVERHEAD
+#include "zend_fibers.h" // for zend_fiber_switch_block()
+#include "zend_globals.h" // for struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
+#include "zend_objects.h" // for zend_objects_destroy_object()
+#include "zend.h" // for zend_error()
 
 #ifndef GC_BENCH
 # define GC_BENCH 0
diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index 0589e193f4a..0ee7e38460e 100644
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -20,6 +20,9 @@
 #ifndef ZEND_GC_H
 #define ZEND_GC_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for GC_TYPE_INFO()
+
 BEGIN_EXTERN_C()
 
 typedef struct _zend_gc_status {