Remove duplicate #include statements (#21085)

* Remove duplicate #include statements across the codebase.

* feat: Restore conditional/unconditional include pairs in lscriu.c

Zend/Optimizer/zend_call_graph.c

@@ -23,8 +23,6 @@
 #include "zend_inference.h"
 #include "zend_call_graph.h"
 #include "zend_func_info.h"
-#include "zend_inference.h"
-#include "zend_call_graph.h"
 
 static void zend_op_array_calc(zend_op_array *op_array, void *context)
 {

Zend/Optimizer/zend_func_info.c

@@ -24,7 +24,6 @@
 #include "zend_inference.h"
 #include "zend_call_graph.h"
 #include "zend_func_info.h"
-#include "zend_inference.h"
 #ifdef _WIN32
 #include "win32/ioutil.h"
 #endif

Zend/zend_compile.h

@@ -1031,12 +1031,6 @@ void zend_assert_valid_class_name(const zend_string *const_name, const char *typ
 zend_string *zend_type_to_string_resolved(zend_type type, zend_class_entry *scope);
 ZEND_API zend_string *zend_type_to_string(zend_type type);
 
-/* BEGIN: OPCODES */
-
-#include "zend_vm_opcodes.h"
-
-/* END: OPCODES */
-
 /* class fetches */
 #define ZEND_FETCH_CLASS_DEFAULT	0
 #define ZEND_FETCH_CLASS_SELF		1

ext/libxml/libxml.c

@@ -35,7 +35,6 @@
 #include <libxml/uri.h>
 #include <libxml/xmlerror.h>
 #include <libxml/xmlsave.h>
-#include <libxml/xmlerror.h>
 #include <libxml/entities.h>
 #ifdef LIBXML_SCHEMAS_ENABLED
 #include <libxml/relaxng.h>

ext/mysqli/mysqli.c

@@ -32,7 +32,6 @@
 #include "zend_exceptions.h"
 #include "ext/spl/spl_exceptions.h"
 #include "zend_interfaces.h"
-#include "zend_attributes.h"
 #include "mysqli_arginfo.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(mysqli)

ext/phar/phar_object.c

@@ -27,7 +27,6 @@
 #include "main/SAPI.h"
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
-#include "zend_exceptions.h"
 
 static zend_class_entry *phar_ce_archive;
 static zend_class_entry *phar_ce_data;

ext/standard/basic_functions.c

@@ -102,7 +102,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
 #include "zend_globals.h"
-#include "php_globals.h"
 #include "SAPI.h"
 #include "php_ticks.h"
 

ext/standard/ftp_fopen_wrapper.c

@@ -41,7 +41,6 @@
 #include "php_standard.h"
 #include "ext/uri/php_uri.h"
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

ext/standard/http_fopen_wrapper.c

@@ -44,7 +44,6 @@
 
 #include "php_standard.h"
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

main/fopen_wrappers.c

@@ -44,7 +44,6 @@
 #include <pwd.h>
 #endif
 
-#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

main/main.c

@@ -64,7 +64,6 @@
 #include "win32/php_registry.h"
 #include "ext/standard/flock_compat.h"
 #endif
-#include "php_syslog.h"
 #include "Zend/zend_exceptions.h"
 
 #if PHP_SIGCHILD
@@ -75,7 +74,6 @@
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
-#include "zend_extensions.h"
 #include "zend_ini.h"
 #include "zend_dtrace.h"
 #include "zend_observer.h"

sapi/apache2handler/apache_config.c

@@ -37,7 +37,6 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
-#include "http_core.h"
 
 #ifdef PHP_AP_DEBUG
 #define phpapdebug(a) fprintf a

sapi/apache2handler/php_functions.c

@@ -41,7 +41,6 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
-#include "http_core.h"
 #include "ap_mpm.h"
 #ifndef PHP_WIN32
 #include "unixd.h"

sapi/apache2handler/sapi_apache2.c

@@ -46,7 +46,6 @@
 #include "http_log.h"
 #include "http_main.h"
 #include "util_script.h"
-#include "http_core.h"
 #include "ap_mpm.h"
 
 #include "php_apache.h"

sapi/cgi/cgi_main.c

@@ -59,7 +59,6 @@
 #include "zend.h"
 #include "zend_extensions.h"
 #include "php_ini.h"
-#include "php_globals.h"
 #include "php_main.h"
 #include "fopen_wrappers.h"
 #include "http_status_codes.h"

sapi/cli/php_cli.c

@@ -31,7 +31,6 @@
 #include "SAPI.h"
 
 #include <stdio.h>
-#include "php.h"
 #ifdef PHP_WIN32
 #include "win32/time.h"
 #include "win32/signal.h"
@@ -51,7 +50,6 @@
 #include "zend.h"
 #include "zend_extensions.h"
 #include "php_ini.h"
-#include "php_globals.h"
 #include "php_main.h"
 #include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"

sapi/cli/php_cli_server.c

@@ -44,7 +44,6 @@
 #include <unistd.h>
 #endif
 
-#include <signal.h>
 #include <locale.h>
 
 #ifdef HAVE_DLFCN_H

sapi/fpm/fpm/fpm_conf.c

@@ -8,7 +8,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <inttypes.h>
 
 #include <stdio.h>

sapi/fpm/fpm/fpm_main.c

@@ -24,7 +24,6 @@
 #include "php_variables.h"
 #include "php_ini_builder.h"
 #include "zend_modules.h"
-#include "php.h"
 #include "zend_ini_scanner.h"
 #include "zend_globals.h"
 #include "zend_stream.h"
@@ -32,7 +31,6 @@
 #include "SAPI.h"
 
 #include <stdio.h>
-#include "php.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -61,7 +59,6 @@
 #include "zend.h"
 #include "zend_extensions.h"
 #include "php_ini.h"
-#include "php_globals.h"
 #include "php_main.h"
 #include "fopen_wrappers.h"
 #include "ext/standard/php_standard.h"

sapi/litespeed/lscriu.c

@@ -73,7 +73,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <dlfcn.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <stdarg.h>

sapi/phpdbg/phpdbg_parser.y

@@ -16,7 +16,6 @@ typedef void* yyscan_t;
 
 #include "phpdbg_cmd.h"
 #include "phpdbg_utils.h"
-#include "phpdbg_cmd.h"
 #include "phpdbg_prompt.h"
 
 #include "phpdbg_parser.h"