From a55c0c5fc3f624a685f42281df26cf87f445be43 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 4 Jan 2023 21:42:29 +0100
Subject: [PATCH] Zend/Optimizer/zend_cfg: include cleanup

---
 Zend/Optimizer/zend_cfg.c | 9 ++++-----
 Zend/Optimizer/zend_cfg.h | 7 +++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Zend/Optimizer/zend_cfg.c b/Zend/Optimizer/zend_cfg.c
index 6d538f71316..e99051542c4 100644
--- a/Zend/Optimizer/zend_cfg.c
+++ b/Zend/Optimizer/zend_cfg.c
@@ -16,13 +16,12 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
 #include "zend_cfg.h"
-#include "zend_func_info.h"
-#include "zend_worklist.h"
-#include "zend_optimizer.h"
+#include "zend_func_info.h" // for ZEND_FUNC_FREE_LOOP_VAR
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 #include "zend_optimizer_internal.h"
-#include "zend_sort.h"
+#include "zend_worklist.h"
 
 static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_block *b) /* {{{ */
 {
diff --git a/Zend/Optimizer/zend_cfg.h b/Zend/Optimizer/zend_cfg.h
index 93d45506068..cf0a591b363 100644
--- a/Zend/Optimizer/zend_cfg.h
+++ b/Zend/Optimizer/zend_cfg.h
@@ -19,6 +19,13 @@
 #ifndef ZEND_CFG_H
 #define ZEND_CFG_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+#include <stdint.h>
+
+typedef struct _zend_arena zend_arena;
+typedef struct _zend_op_array zend_op_array;
+
 /* zend_basic_block.flags */
 #define ZEND_BB_START            (1<<0)  /* first block            */
 #define ZEND_BB_FOLLOW           (1<<1)  /* follows the next block */