From 928685eba2b2f0ded90e7f78fd806ea164002f6e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 4 Jan 2023 14:59:41 +0100
Subject: [PATCH] Zend/zend_signal: include cleanup

---
 Zend/zend_signal.c | 9 ++++++---
 Zend/zend_signal.h | 9 +++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index aa74bdd147c..8fd55942f86 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -28,11 +28,14 @@
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
-#include <string.h>
 
-#include "zend.h"
-#include "zend_globals.h"
+#include "zend_signal.h"
+#include "zend_alloc.h"
+#include "zend.h" // for zend_output_debug_string(), zend_error(), ...
+
+#include <errno.h>
 #include <signal.h>
+#include <string.h>
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
index 93edc1f0e02..53ef58fa53f 100644
--- a/Zend/zend_signal.h
+++ b/Zend/zend_signal.h
@@ -21,9 +21,18 @@
 #ifndef ZEND_SIGNAL_H
 #define ZEND_SIGNAL_H
 
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h" // for ZEND_SIGNALS
+#endif
+
 #ifdef ZEND_SIGNALS
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
 #include <signal.h>
+#include <stdbool.h>
 
 #ifndef NSIG
 #define NSIG 65