From fd2d86964250cc992739d9a2f8019cf287f14f6c Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Sat, 8 Jun 2024 17:15:36 +0100 Subject: [PATCH] Clean-up some more headers (#14416) Remove unused headers (such as php_ini.h for extensions that don't define INI settings) Use more specific headers when possible --- ext/ctype/ctype.c | 2 -- ext/date/php_date.c | 3 --- ext/exif/exif.c | 2 +- ext/filter/php_filter.h | 2 -- ext/gmp/gmp.c | 1 - ext/iconv/iconv.c | 1 - ext/intl/idn/idn.c | 2 -- ext/json/json.c | 2 -- ext/json/json_encoder.c | 3 +-- ext/mbstring/mb_gpc.c | 2 -- ext/mysqli/mysqli_api.c | 3 --- ext/mysqli/mysqli_driver.c | 2 -- ext/mysqli/mysqli_exception.c | 2 -- ext/mysqli/mysqli_nonapi.c | 2 -- ext/mysqli/mysqli_prop.c | 2 -- ext/mysqli/mysqli_report.c | 2 -- ext/mysqli/mysqli_result_iterator.c | 1 - ext/mysqli/mysqli_warning.c | 2 -- ext/odbc/php_odbc.c | 1 - ext/openssl/openssl.c | 2 +- ext/pcntl/pcntl.c | 1 - ext/pgsql/pgsql.c | 2 +- ext/readline/readline_cli.c | 9 +-------- ext/session/session.c | 1 - ext/shmop/shmop.c | 1 - ext/simplexml/simplexml.c | 3 +-- ext/soap/php_http.c | 5 +---- ext/soap/php_sdl.c | 1 - ext/soap/php_soap.h | 2 -- ext/sodium/libsodium.c | 1 - ext/spl/php_spl.c | 1 - ext/spl/php_spl.h | 1 - ext/spl/spl_array.c | 2 -- ext/spl/spl_directory.c | 1 - ext/spl/spl_dllist.c | 1 - ext/spl/spl_exceptions.c | 4 ---- ext/spl/spl_fixedarray.c | 2 -- ext/spl/spl_iterators.c | 2 -- ext/spl/spl_observer.c | 2 -- ext/sqlite3/sqlite3.c | 3 +-- ext/sysvmsg/sysvmsg.c | 1 - ext/sysvshm/sysvshm.c | 1 - ext/tokenizer/tokenizer.c | 1 - ext/tokenizer/tokenizer_data.c | 2 -- ext/tokenizer/tokenizer_data_gen.php | 2 -- ext/xml/xml.c | 2 +- ext/xmlwriter/php_xmlwriter.c | 3 +-- ext/xsl/php_xsl.c | 1 - ext/zip/php_zip.c | 3 +-- 49 files changed, 11 insertions(+), 89 deletions(-) diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c index 21ea526d8de..510930936e4 100644 --- a/ext/ctype/ctype.c +++ b/ext/ctype/ctype.c @@ -19,10 +19,8 @@ #endif #include "php.h" -#include "php_ini.h" #include "php_ctype.h" #include "ctype_arginfo.h" -#include "SAPI.h" #include "ext/standard/info.h" #include diff --git a/ext/date/php_date.c b/ext/date/php_date.c index bba044f9ea0..6b30c31d282 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -15,13 +15,10 @@ */ #include "php.h" -#include "php_streams.h" #include "php_main.h" -#include "php_globals.h" #include "php_ini.h" #include "ext/standard/info.h" #include "ext/standard/php_versioning.h" -#include "ext/standard/php_math.h" #include "php_date.h" #include "zend_interfaces.h" #include "zend_exceptions.h" diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 7dffb30490a..a785690a21f 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -43,7 +43,7 @@ #include "exif_arginfo.h" #include #include "php_ini.h" -#include "ext/standard/php_string.h" +#include "ext/standard/php_string.h" /* for php_basename() */ #include "ext/standard/php_image.h" #include "ext/standard/info.h" diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index ac15fa20f74..4587a375e43 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -18,10 +18,8 @@ #ifndef PHP_FILTER_H #define PHP_FILTER_H -#include "SAPI.h" #include "zend_API.h" #include "php.h" -#include "php_ini.h" extern zend_module_entry filter_module_entry; #define phpext_filter_ptr &filter_module_entry diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 91b65840c3c..295b9e4759f 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "php_gmp.h" #include "php_gmp_int.h" #include "ext/standard/info.h" diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 78f48d84e96..b5c85471960 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -21,7 +21,6 @@ #endif #include "php.h" -#include "php_globals.h" #include "ext/standard/info.h" #include "main/php_output.h" #include "SAPI.h" diff --git a/ext/intl/idn/idn.c b/ext/intl/idn/idn.c index 0b528799380..af7a1809022 100644 --- a/ext/intl/idn/idn.c +++ b/ext/intl/idn/idn.c @@ -24,11 +24,9 @@ #include #include -#include "ext/standard/php_string.h" #include "idn.h" #include "intl_error.h" -#include "intl_convert.h" /* }}} */ enum { diff --git a/ext/json/json.c b/ext/json/json.c index 31ed76703ec..1ea8eb56f90 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -20,9 +20,7 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" -#include "ext/standard/html.h" #include "zend_smart_str.h" #include "php_json.h" #include "php_json_encoder.h" diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c index 9ae6a973089..75e71b7e278 100644 --- a/ext/json/json_encoder.c +++ b/ext/json/json_encoder.c @@ -20,12 +20,11 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "ext/standard/html.h" #include "zend_smart_str.h" #include "php_json.h" #include "php_json_encoder.h" +#include "zend_portability.h" #include #include "zend_enum.h" diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c index ff46087c7e9..f90d86974fb 100644 --- a/ext/mbstring/mb_gpc.c +++ b/ext/mbstring/mb_gpc.c @@ -17,14 +17,12 @@ /* {{{ includes */ #include "php.h" -#include "php_ini.h" #include "php_variables.h" #include "libmbfl/mbfl/mbfilter_pass.h" #include "mbstring.h" #include "ext/standard/url.h" #include "php_globals.h" -#include "SAPI.h" #include "TSRM.h" #include "mb_gpc.h" diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 395fa44606d..95aa156c4f8 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -23,9 +23,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "php_globals.h" -#include "ext/standard/info.h" #include "zend_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" diff --git a/ext/mysqli/mysqli_driver.c b/ext/mysqli/mysqli_driver.c index d5b831381b0..60cd94f41c5 100644 --- a/ext/mysqli/mysqli_driver.c +++ b/ext/mysqli/mysqli_driver.c @@ -21,8 +21,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "php_mysqli_structs.h" #include "zend_exceptions.h" diff --git a/ext/mysqli/mysqli_exception.c b/ext/mysqli/mysqli_exception.c index 3d15881863e..562b454a7be 100644 --- a/ext/mysqli/mysqli_exception.c +++ b/ext/mysqli/mysqli_exception.c @@ -21,8 +21,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" #include "zend_exceptions.h" diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 36b55d5d7cf..1920a454416 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -23,8 +23,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "zend_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 279a93b3d39..3ff4fac0ec4 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -22,8 +22,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c index b757f6f54fc..7af85742f56 100644 --- a/ext/mysqli/mysqli_report.c +++ b/ext/mysqli/mysqli_report.c @@ -19,8 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "php_mysqli_structs.h" extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno, char *format, ...); diff --git a/ext/mysqli/mysqli_result_iterator.c b/ext/mysqli/mysqli_result_iterator.c index c781fcae9de..200c80c56fc 100644 --- a/ext/mysqli/mysqli_result_iterator.c +++ b/ext/mysqli/mysqli_result_iterator.c @@ -23,7 +23,6 @@ #include #include "php.h" -#include "php_ini.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" #include "zend_interfaces.h" diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index bcd4786c387..46eec2c3dff 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -21,8 +21,6 @@ #include #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index df0306780fc..6a5ba2dc594 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -27,7 +27,6 @@ #include "zend_attributes.h" #include "ext/standard/info.h" -#include "ext/standard/php_standard.h" #include "Zend/zend_interfaces.h" #include "zend_smart_str.h" diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index bbbfcc33719..0e5caada721 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -34,7 +34,7 @@ #include "ext/standard/file.h" #include "ext/standard/info.h" #include "ext/standard/php_fopen_wrappers.h" -#include "ext/standard/md5.h" +#include "ext/standard/md5.h" /* For make_digest_ex() */ #include "ext/standard/base64.h" #ifdef PHP_WIN32 # include "win32/winutil.h" diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index f4acfcea363..b26bde1ff8f 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -28,7 +28,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_pcntl.h" #include "php_signal.h" diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index ef0cbac40b8..54cb422a7ff 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -30,7 +30,7 @@ #include "php.h" #include "php_ini.h" -#include "ext/standard/php_standard.h" +#include "ext/standard/info.h" #include "zend_smart_str.h" #include "ext/pcre/php_pcre.h" #ifdef PHP_WIN32 diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c index 8130c4b6533..7bbd84aa656 100644 --- a/ext/readline/readline_cli.c +++ b/ext/readline/readline_cli.c @@ -25,20 +25,13 @@ #define rl_completion_matches completion_matches #endif -#include "php_globals.h" -#include "php_variables.h" #include "zend_hash.h" -#include "zend_modules.h" #include "SAPI.h" #include #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" +#include "ext/standard/info.h" #include "zend_smart_str.h" #ifdef __riscos__ diff --git a/ext/session/session.c b/ext/session/session.c index d14d5f96ebc..1203c3baf16 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -32,7 +32,6 @@ #include #include "php_ini.h" -#include "SAPI.h" #include "rfc1867.h" #include "php_variables.h" #include "php_session.h" diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index be4f57ad271..7109f218169 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -22,7 +22,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "php_shmop.h" #include "shmop_arginfo.h" diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 3bc7964541e..13e92a1f6cf 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -23,9 +23,8 @@ #include "php.h" #if defined(HAVE_LIBXML) && defined(HAVE_SIMPLEXML) -#include "php_ini.h" #include "ext/standard/info.h" -#include "ext/standard/php_string.h" +#include "ext/standard/php_string.h" /* For php_trim() */ #include "php_simplexml.h" #include "php_simplexml_exports.h" #include "simplexml_arginfo.h" diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c index 621c905a555..55b3c3e47a6 100644 --- a/ext/soap/php_http.c +++ b/ext/soap/php_http.c @@ -17,10 +17,7 @@ */ #include "php_soap.h" -#include "ext/standard/base64.h" -#include "ext/standard/md5.h" -#include "ext/random/php_random_csprng.h" -#include "ext/hash/php_hash.h" +#include "ext/hash/php_hash.h" /* For php_hash_bin2hex() */ static char *get_http_header_value_nodup(char *headers, char *type, size_t *len); static char *get_http_header_value(char *headers, char *type); diff --git a/ext/soap/php_sdl.c b/ext/soap/php_sdl.c index bc17a3d3041..91141c2f106 100644 --- a/ext/soap/php_sdl.c +++ b/ext/soap/php_sdl.c @@ -20,7 +20,6 @@ #include "ext/libxml/php_libxml.h" #include "libxml/uri.h" -#include "ext/standard/md5.h" #include "zend_virtual_cwd.h" #include "main/php_open_temporary_file.h" diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h index fd179e9b513..65ba76fcf11 100644 --- a/ext/soap/php_soap.h +++ b/ext/soap/php_soap.h @@ -20,8 +20,6 @@ #define PHP_SOAP_H #include "php.h" -#include "php_globals.h" -#include "ext/standard/info.h" #include "ext/standard/php_standard.h" #if defined(HAVE_PHP_SESSION) && !defined(COMPILE_DL_SESSION) #include "ext/session/php_session.h" diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c index 0f36eec3a3e..0dd6db0f3a8 100644 --- a/ext/sodium/libsodium.c +++ b/ext/sodium/libsodium.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_libsodium.h" #include "zend_attributes.h" diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index ed01572ab52..edad4cddca2 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "php_main.h" #include "ext/standard/info.h" #include "php_spl.h" diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h index 1f76dee1e1f..c2f7ebf9eee 100644 --- a/ext/spl/php_spl.h +++ b/ext/spl/php_spl.h @@ -18,7 +18,6 @@ #define PHP_SPL_H #include "php.h" -#include #define PHP_SPL_VERSION PHP_VERSION diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 4f5e680a0a6..0d5611d871f 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -19,8 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "ext/standard/php_var.h" #include "zend_smart_str.h" #include "zend_interfaces.h" diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 8f764e1b99d..bbe00cd212f 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/file.h" #include "ext/standard/php_filestat.h" #include "ext/standard/flock_compat.h" diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c index d45df4b4da4..072dd7ffc50 100644 --- a/ext/spl/spl_dllist.c +++ b/ext/spl/spl_dllist.c @@ -23,7 +23,6 @@ #include "zend_hash.h" #include "php_spl.h" -#include "ext/standard/info.h" #include "ext/standard/php_var.h" #include "zend_smart_str.h" #include "spl_functions.h" diff --git a/ext/spl/spl_exceptions.c b/ext/spl/spl_exceptions.c index efb8e7429bd..7720a22bea1 100644 --- a/ext/spl/spl_exceptions.c +++ b/ext/spl/spl_exceptions.c @@ -19,15 +19,11 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "zend_interfaces.h" #include "zend_exceptions.h" #include "spl_exceptions_arginfo.h" #include "php_spl.h" -#include "spl_functions.h" -#include "spl_engine.h" #include "spl_exceptions.h" PHPAPI zend_class_entry *spl_ce_LogicException; diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c index 31052f443f6..632957975cd 100644 --- a/ext/spl/spl_fixedarray.c +++ b/ext/spl/spl_fixedarray.c @@ -20,8 +20,6 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "zend_exceptions.h" #include "php_spl.h" diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 49b9eb7b13d..dde6695b3fa 100644 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -19,8 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "zend_exceptions.h" #include "zend_interfaces.h" #include "ext/pcre/php_pcre.h" diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 0de3a15a07b..155dead21ed 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -20,8 +20,6 @@ #endif #include "php.h" -#include "php_ini.h" -#include "ext/standard/info.h" #include "ext/standard/php_array.h" #include "ext/standard/php_var.h" #include "zend_smart_str.h" diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 84ee14b8154..0f26593b850 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -23,12 +23,11 @@ #include "ext/standard/info.h" #include "php_sqlite3.h" #include "php_sqlite3_structs.h" -#include "main/SAPI.h" +#include "SAPI.h" #include #include "zend_exceptions.h" -#include "SAPI.h" #include "sqlite3_arginfo.h" ZEND_DECLARE_MODULE_GLOBALS(sqlite3) diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index 20bdecedb50..d588bf7917a 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_globals.h" #include "ext/standard/info.h" #include "php_sysvmsg.h" #include "sysvmsg_arginfo.h" diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index bec3af680e0..27d9dd2260a 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -29,7 +29,6 @@ #include "ext/standard/info.h" #include "ext/standard/php_var.h" #include "zend_smart_str.h" -#include "php_ini.h" /* SysvSharedMemory class */ diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c index ede1f8a4697..58594cac307 100644 --- a/ext/tokenizer/tokenizer.c +++ b/ext/tokenizer/tokenizer.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_tokenizer.h" diff --git a/ext/tokenizer/tokenizer_data.c b/ext/tokenizer/tokenizer_data.c index 77b67de6b1c..e1fa407532f 100644 --- a/ext/tokenizer/tokenizer_data.c +++ b/ext/tokenizer/tokenizer_data.c @@ -19,8 +19,6 @@ This file is generated using tokenizer_data_gen.php */ -#include "php.h" -#include "zend.h" #include char *get_token_type_name(int token_type) diff --git a/ext/tokenizer/tokenizer_data_gen.php b/ext/tokenizer/tokenizer_data_gen.php index 1d83cb559a9..79753b6e81a 100755 --- a/ext/tokenizer/tokenizer_data_gen.php +++ b/ext/tokenizer/tokenizer_data_gen.php @@ -58,8 +58,6 @@ $result = << char *get_token_type_name(int token_type) diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 912f93aa129..f157914e736 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -24,7 +24,7 @@ #include "zend_variables.h" #include "ext/standard/info.h" -#include "ext/standard/html.h" +#include "ext/standard/html.h" /* For php_next_utf8_char() */ #ifdef HAVE_XML diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c index f0851e47563..bc4fc2db86d 100644 --- a/ext/xmlwriter/php_xmlwriter.c +++ b/ext/xmlwriter/php_xmlwriter.c @@ -21,11 +21,10 @@ #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_xmlwriter.h" #include "php_xmlwriter_arginfo.h" -#include "ext/standard/php_string.h" +#include "ext/standard/php_string.h" /* For php_dirname() */ static zend_class_entry *xmlwriter_class_entry_ce; diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c index 605a933c286..86949653da1 100644 --- a/ext/xsl/php_xsl.c +++ b/ext/xsl/php_xsl.c @@ -19,7 +19,6 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "php_xsl.h" #include "php_xsl_arginfo.h" diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index c91309919d9..c72b085573d 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -20,10 +20,9 @@ #endif #include "php.h" -#include "php_ini.h" #include "ext/standard/info.h" #include "ext/standard/file.h" -#include "ext/standard/php_string.h" +#include "ext/standard/php_string.h" /* For php_basename() */ #include "ext/pcre/php_pcre.h" #include "ext/standard/php_filestat.h" #include "zend_attributes.h"