From 6b55bf228cb2da8705737d414f394950a92d8aae Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 4 Jan 2023 21:12:08 +0100
Subject: [PATCH] Zend/zend_language_scanner: include cleanup

---
 Zend/zend_language_scanner.h | 8 ++++++++
 Zend/zend_language_scanner.l | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index ca32329a557..c93b0fea56e 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -20,6 +20,14 @@
 #ifndef ZEND_SCANNER_H
 #define ZEND_SCANNER_H
 
+#include "zend_globals.h" // for zend_php_scanner_event
+#include "zend_multibyte.h" // for zend_encoding_filter
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_ptr_stack.h"
+#include "zend_stack.h"
+
+typedef struct _zend_file_handle zend_file_handle;
+
 typedef struct _zend_lex_state {
 	unsigned int yy_leng;
 	unsigned char *yy_start;
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index c73a50948d6..c1ba518ddfb 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -27,6 +27,7 @@
 # define YYDEBUG(s, c)
 #endif
 
+#include "zend_language_scanner.h"
 #include "zend_language_scanner_defs.h"
 
 #include <errno.h>
@@ -35,9 +36,9 @@
 # include <Winuser.h>
 #endif
 #include "zend_alloc.h"
+#include "zend_arena.h"
 #include <zend_language_parser.h>
 #include "zend_compile.h"
-#include "zend_language_scanner.h"
 #include "zend_highlight.h"
 #include "zend_constants.h"
 #include "zend_variables.h"