Revert GH-10220

Cf. <https://github.com/php/php-src/pull/10220#issuecomment-1383739816>.

This reverts commit ecc880f491.
This reverts commit 588a07f737.
This reverts commit f377e15751.
This reverts commit b4ba16fe18.
This reverts commit 694ec1deea.
This reverts commit 6b34de8eba.
This reverts commit aa1cd02a43.
This reverts commit 308fd311ea.
This reverts commit 16203b53e1.
This reverts commit 738fb5ca54.
This reverts commit 9fdbefacd3.
This reverts commit cd4a7c1d90.
This reverts commit 928685eba2.
This reverts commit 01e5ffc85c.

Zend/zend.c

@@ -36,7 +36,6 @@
 #include "zend_observer.h"
 #include "zend_fibers.h"
 #include "zend_call_stack.h"
-#include "zend_strtod.h"
 #include "Optimizer/zend_optimizer.h"
 
 static size_t global_map_ptr_last = 0;

Zend/zend_execute.c

@@ -20,25 +20,34 @@
 
 #define ZEND_INTENSIVE_DEBUGGING 0
 
+#include <stdio.h>
+#include <signal.h>
+
+#include "zend.h"
+#include "zend_compile.h"
 #include "zend_execute.h"
-#include "zend_API.h" // for ZEND_FUNCTION()
-#include "zend_arena.h"
+#include "zend_API.h"
+#include "zend_ptr_stack.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_ini.h"
 #include "zend_exceptions.h"
+#include "zend_interfaces.h"
 #include "zend_closures.h"
-#include "zend_generators.h" // for zend_ce_generator
-#include "zend_inheritance.h" // for zend_do_link_class()
+#include "zend_generators.h"
+#include "zend_vm.h"
+#include "zend_dtrace.h"
+#include "zend_inheritance.h"
+#include "zend_type_info.h"
 #include "zend_smart_str.h"
 #include "zend_observer.h"
+#include "zend_system_id.h"
+#include "zend_call_stack.h"
+#include "Optimizer/zend_func_info.h"
 
 /* Virtual current working directory support */
 #include "zend_virtual_cwd.h"
 
-#include <stdio.h>
-#include <signal.h>
-
 #ifdef HAVE_GCC_GLOBAL_REGS
 # if defined(__GNUC__) && ZEND_GCC_VERSION >= 4008 && defined(i386)
 #  define ZEND_VM_FP_GLOBAL_REG "%esi"
@@ -5339,9 +5348,6 @@ static zend_always_inline zend_execute_data *_zend_vm_stack_push_call_frame(uint
 /* This callback disables optimization of "vm_stack_data" variable in VM */
 ZEND_API void (ZEND_FASTCALL *zend_touch_vm_stack_data)(void *vm_stack_data) = NULL;
 
-#include "zend_fibers.h" // needed by zend_vm_execute.h
-#include "zend_interfaces.h" // needed by zend_vm_execute.h
-#include "zend_objects.h" // needed by zend_vm_execute.h
 #include "zend_vm_execute.h"
 
 ZEND_API zend_result zend_set_user_opcode_handler(zend_uchar opcode, user_opcode_handler_t handler)

Zend/zend_execute.h

@@ -21,15 +21,10 @@
 #ifndef ZEND_EXECUTE_H
 #define ZEND_EXECUTE_H
 
-#include "zend_compile.h" // for zend_op_array
-#include "zend_list.h" // for zend_rsrc_list_get_rsrc_type()
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-#include "zend_types.h" // for zend_execute_data
-
-#if ZEND_DEBUG
-#include "zend_globals.h" // for struct _zend_executor_globals
-#include "zend_globals_macros.h" // for EG()
-#endif
+#include "zend_compile.h"
+#include "zend_hash.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
 
 BEGIN_EXTERN_C()
 struct _zend_fcall_info;
@@ -187,7 +182,6 @@ ZEND_API zend_result ZEND_FASTCALL zval_update_constant_ex(zval *pp, zend_class_
 ZEND_API zend_result ZEND_FASTCALL zval_update_constant_with_ctx(zval *pp, zend_class_entry *scope, zend_ast_evaluate_ctx *ctx);
 
 /* dedicated Zend executor functions - do not use! */
-typedef struct _zend_vm_stack *zend_vm_stack;
 struct _zend_vm_stack {
 	zval *top;
 	zval *end;

Zend/zend_execute_API.c

@@ -18,18 +18,26 @@
    +----------------------------------------------------------------------+
 */
 
+#include <stdio.h>
+#include <signal.h>
+
+#include "zend.h"
+#include "zend_compile.h"
+#include "zend_execute.h"
 #include "zend_API.h"
+#include "zend_stack.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_exceptions.h"
 #include "zend_closures.h"
+#include "zend_generators.h"
+#include "zend_vm.h"
+#include "zend_float.h"
 #include "zend_fibers.h"
 #include "zend_weakrefs.h"
+#include "zend_inheritance.h"
 #include "zend_observer.h"
-
-#include <stdio.h>
-#include <signal.h>
-
+#include "zend_call_stack.h"
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif

Zend/zend_fibers.c

@@ -17,8 +17,6 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_fibers.h"
-#include "zend_objects.h" // for zend_object_std_init()
 #include "zend.h"
 #include "zend_API.h"
 #include "zend_ini.h"
@@ -46,9 +44,6 @@
 # include <sys/mman.h>
 # include <limits.h>
 
-# include <errno.h>
-# include <string.h> // for strerror()
-
 # if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
 #  define MAP_ANONYMOUS MAP_ANON
 # endif

Zend/zend_fibers.h

@@ -20,18 +20,14 @@
 #ifndef ZEND_FIBERS_H
 #define ZEND_FIBERS_H
 
-#include "zend_API.h" // for struct zend_fcall_info
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-
-#include <stddef.h>
+#include "zend_API.h"
+#include "zend_types.h"
 
 #define ZEND_FIBER_GUARD_PAGES 1
 
 #define ZEND_FIBER_DEFAULT_C_STACK_SIZE (4096 * (((sizeof(void *)) < 8) ? 256 : 512))
 #define ZEND_FIBER_VM_STACK_SIZE (1024 * sizeof(zval))
 
-typedef struct _zend_fiber_context zend_fiber_context;
-
 BEGIN_EXTERN_C()
 
 typedef enum {

Zend/zend_ini.c

@@ -16,18 +16,16 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_ini.h"
 #include "zend.h"
 #include "zend_sort.h"
 #include "zend_API.h"
+#include "zend_ini.h"
 #include "zend_alloc.h"
 #include "zend_operators.h"
 #include "zend_strtod.h"
 #include "zend_modules.h"
 #include "zend_smart_str.h"
-
 #include <ctype.h>
-#include <errno.h>
 
 static HashTable *registered_zend_ini_directives;
 

Zend/zend_ini.h

@@ -19,24 +19,12 @@
 #ifndef ZEND_INI_H
 #define ZEND_INI_H
 
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-#include "zend_types.h" // for zend_result
-
-#include <stdint.h>
-
 #define ZEND_INI_USER	(1<<0)
 #define ZEND_INI_PERDIR	(1<<1)
 #define ZEND_INI_SYSTEM	(1<<2)
 
 #define ZEND_INI_ALL (ZEND_INI_USER|ZEND_INI_PERDIR|ZEND_INI_SYSTEM)
 
-// forward declarations
-typedef struct _zend_file_handle zend_file_handle;
-typedef struct _zend_ini_entry zend_ini_entry;
-typedef struct _zend_module_entry zend_module_entry;
-typedef struct _zend_string zend_string;
-typedef struct _zend_array HashTable;
-
 #define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
 #define ZEND_INI_DISP(name) ZEND_COLD void name(zend_ini_entry *ini_entry, int type)
 

Zend/zend_multibyte.c

@@ -17,10 +17,10 @@
    +----------------------------------------------------------------------+
 */
 
+#include "zend.h"
+#include "zend_compile.h"
+#include "zend_operators.h"
 #include "zend_multibyte.h"
-#include "zend_alloc.h"
-#include "zend_globals.h" // for struct _zend_compiler_globals
-#include "zend_globals_macros.h" // for LANG_SCNG()
 #include "zend_ini.h"
 
 static const zend_encoding *dummy_encoding_fetcher(const char *encoding_name)

Zend/zend_multibyte.h

@@ -20,12 +20,6 @@
 #ifndef ZEND_MULTIBYTE_H
 #define ZEND_MULTIBYTE_H
 
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-#include "zend_types.h" // for zend_result
-
-#include <stdbool.h>
-#include <stddef.h> // for size_t
-
 typedef struct _zend_encoding zend_encoding;
 
 typedef size_t (*zend_encoding_filter)(unsigned char **str, size_t *str_length, const unsigned char *buf, size_t length);

Zend/zend_object_handlers.c

@@ -18,13 +18,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_object_handlers.h"
 #include "zend.h"
 #include "zend_globals.h"
 #include "zend_variables.h"
 #include "zend_API.h"
 #include "zend_objects.h"
 #include "zend_objects_API.h"
+#include "zend_object_handlers.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "zend_closures.h"

Zend/zend_object_handlers.h

@@ -20,8 +20,6 @@
 #ifndef ZEND_OBJECT_HANDLERS_H
 #define ZEND_OBJECT_HANDLERS_H
 
-#include "zend_types.h"
-
 struct _zend_property_info;
 
 #define ZEND_WRONG_PROPERTY_INFO \

Zend/zend_operators.c

@@ -18,20 +18,18 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_operators.h"
+#include <ctype.h>
+
 #include "zend.h"
+#include "zend_operators.h"
 #include "zend_variables.h"
-#include "zend_objects.h" // for zend_objects_new()
 #include "zend_globals.h"
-#include "zend_multiply.h" // for ZEND_SIGNED_MULTIPLY_LONG()
 #include "zend_list.h"
 #include "zend_API.h"
 #include "zend_strtod.h"
 #include "zend_exceptions.h"
 #include "zend_closures.h"
 
-#include <ctype.h>
-
 #include <locale.h>
 #ifdef HAVE_LANGINFO_H
 # include <langinfo.h>

Zend/zend_operators.h

@@ -21,19 +21,20 @@
 #ifndef ZEND_OPERATORS_H
 #define ZEND_OPERATORS_H
 
-#include "zend_hash.h" // for zend_hash_num_elements()
-#include "zend_object_handlers.h" // for struct _zend_object_handlers
-#include "zend_portability.h" // for BEGIN_EXTERN_
-#include "zend_types.h" // for zend_result
-#include "zend_string.h" // for zend_string_copy()
-
+#include <errno.h>
 #include <math.h>
+#include <assert.h>
 #include <stddef.h>
 
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
 
+#include "zend_portability.h"
+#include "zend_strtod.h"
+#include "zend_multiply.h"
+#include "zend_object_handlers.h"
+
 #define LONG_SIGN_MASK ZEND_LONG_MIN
 
 BEGIN_EXTERN_C()

Zend/zend_ptr_stack.c

@@ -17,8 +17,8 @@
    +----------------------------------------------------------------------+
 */
 
+#include "zend.h"
 #include "zend_ptr_stack.h"
-
 #include <stdarg.h>
 
 ZEND_API void zend_ptr_stack_init_ex(zend_ptr_stack *stack, bool persistent)

Zend/zend_ptr_stack.h

@@ -20,9 +20,6 @@
 #ifndef ZEND_PTR_STACK_H
 #define ZEND_PTR_STACK_H
 
-#include "zend_alloc.h" // for safe_perealloc()
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-
 typedef struct _zend_ptr_stack {
 	int top, max;
 	void **elements;

Zend/zend_signal.c

@@ -28,15 +28,12 @@
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
-
-#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>
 
+#include "zend.h"
+#include "zend_globals.h"
+#include <signal.h>
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

Zend/zend_signal.h

@@ -21,18 +21,9 @@
 #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

Zend/zend_smart_str.c

@@ -14,11 +14,9 @@
    +----------------------------------------------------------------------+
  */
 
+#include <zend.h>
 #include "zend_smart_str.h"
 #include "zend_smart_string.h"
-#include "zend_globals_macros.h" // for EG()
-#include "zend_globals.h" // struct _zend_executor_globals
-#include "zend_strtod.h" // for zend_gcvt()
 
 #define SMART_STR_OVERHEAD   (ZEND_MM_OVERHEAD + _ZSTR_HEADER_SIZE + 1)
 #define SMART_STR_START_SIZE 256

Zend/zend_smart_str.h

@@ -17,15 +17,10 @@
 #ifndef ZEND_SMART_STR_H
 #define ZEND_SMART_STR_H
 
+#include <zend.h>
+#include "zend_globals.h"
 #include "zend_smart_str_public.h"
 
-#include "zend_operators.h" // for zend_print_long_to_buf()
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-#include "zend_string.h"
-
-// forward declarations
-typedef struct _zval_struct zval;
-
 BEGIN_EXTERN_C()
 
 ZEND_API void ZEND_FASTCALL smart_str_erealloc(smart_str *str, size_t len);

Zend/zend_smart_str_public.h

@@ -17,11 +17,6 @@
 #ifndef ZEND_SMART_STR_PUBLIC_H
 #define ZEND_SMART_STR_PUBLIC_H
 
-#include <stddef.h> // for size_t
-
-// forward declarations
-typedef struct _zend_string zend_string;
-
 typedef struct {
 	/** See smart_str_extract() */
 	zend_string *s;

Zend/zend_smart_string.h

@@ -20,9 +20,8 @@
 
 #include "zend_smart_string_public.h"
 
-#include "zend_alloc.h" // for pefree()
-#include "zend_operators.h" // for zend_print_long_to_buf()
-#include "zend_portability.h" // for ZEND_FASTCALL
+#include <stdlib.h>
+#include <zend.h>
 
 /* wrapper */
 

Zend/zend_smart_string_public.h

@@ -18,7 +18,7 @@
 #ifndef PHP_SMART_STRING_PUBLIC_H
 #define PHP_SMART_STRING_PUBLIC_H
 
-#include <stddef.h> // for size_t
+#include <sys/types.h>
 
 typedef struct {
 	char *c;

Zend/zend_variables.c

@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_variables.h"
+#include <stdio.h>
 #include "zend.h"
 #include "zend_API.h"
 #include "zend_ast.h"

Zend/zend_variables.h

@@ -21,7 +21,6 @@
 #ifndef ZEND_VARIABLES_H
 #define ZEND_VARIABLES_H
 
-#include "zend_hash.h" // for zend_array_dup()
 #include "zend_types.h"
 #include "zend_gc.h"
 

ext/intl/collator/collator_is_numeric.c

@@ -14,9 +14,6 @@
  */
 
 #include "collator_is_numeric.h"
-#include "zend_strtod.h"
-
-#include <errno.h>
 
 /* {{{ Taken from PHP6:zend_u_strtod() */
 static double collator_u_strtod(const UChar *nptr, UChar **endptr) /* {{{ */

ext/json/json_encoder.c

@@ -28,7 +28,6 @@
 #include "php_json_encoder.h"
 #include <zend_exceptions.h>
 #include "zend_enum.h"
-#include "zend_strtod.h" // for ZEND_DOUBLE_MAX_LENGTH
 
 static const char digits[] = "0123456789abcdef";
 

ext/json/json_scanner.re

@@ -18,7 +18,6 @@
 #include "php_json_scanner.h"
 #include "php_json_scanner_defs.h"
 #include "php_json_parser.h"
-#include "zend_strtod.h"
 #include "json_parser.tab.h"
 
 #define	YYCTYPE     php_json_ctype

ext/mbstring/libmbfl/filters/mbfilter_base64.c

@@ -30,7 +30,6 @@
 
 #include "mbfilter.h"
 #include "mbfilter_base64.h"
-#include "zend_multiply.h" // for zend_safe_address_guarded()
 
 static size_t mb_base64_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf, size_t bufsize, unsigned int *state);
 static void mb_wchar_to_base64(uint32_t *in, size_t len, mb_convert_buf *buf, bool end);

ext/mysqlnd/mysql_float_to_double.h

@@ -20,7 +20,6 @@
 #include "main/php.h"
 #include <float.h>
 #include "main/snprintf.h"
-#include "zend_strtod.h"
 
 #define MAX_CHAR_BUF_LEN 255
 

ext/mysqlnd/mysqlnd_connection.c

@@ -30,8 +30,6 @@
 #include "mysqlnd_ext_plugin.h"
 #include "zend_smart_str.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
 
 extern MYSQLND_CHARSET *mysqlnd_charsets;
 

ext/mysqlnd/mysqlnd_wireprotocol.c

@@ -23,7 +23,6 @@
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
-#include "zend_strtod.h"
 
 #define BAIL_IF_NO_MORE_DATA \
 	if (UNEXPECTED((size_t)(p - begin) > packet->header.size)) { \

ext/oci8/oci8_collection.c

@@ -35,7 +35,6 @@
 
 #include "php_oci8.h"
 #include "php_oci8_int.h"
-#include "zend_strtod.h"
 
 /* {{{ php_oci_collection_create()
  Create and return connection handle */

ext/opcache/jit/zend_jit.c

@@ -51,10 +51,6 @@
 #include <pthread.h>
 #endif
 
-#ifdef HAVE_MPROTECT
-#include <errno.h>
-#endif
-
 #ifdef ZTS
 int jit_globals_id;
 #else

ext/opcache/zend_file_cache.c

@@ -42,7 +42,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <errno.h>
 #include <fcntl.h>
 
 #if HAVE_UNISTD_H

ext/openssl/xp_ssl.c

@@ -36,8 +36,6 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
-#include <errno.h>
-
 #ifdef PHP_WIN32
 #include "win32/winutil.h"
 #include "win32/time.h"

ext/pcre/php_pcre.c

@@ -20,7 +20,6 @@
 #include "php_pcre.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
-#include "zend_multiply.h" // for zend_safe_address_guarded()
 #include "zend_smart_str.h"
 #include "SAPI.h"
 

ext/pdo_pgsql/pgsql_driver.c

@@ -34,8 +34,6 @@
 #include "zend_exceptions.h"
 #include "pgsql_driver_arginfo.h"
 
-#include <errno.h>
-
 static bool pgsql_handle_in_transaction(pdo_dbh_t *dbh);
 
 static char * _pdo_pgsql_trim_message(const char *message, int persistent)

ext/pgsql/pgsql.c

@@ -39,7 +39,6 @@
 #include "php_pgsql.h"
 #include "php_globals.h"
 #include "zend_exceptions.h"
-#include "zend_strtod.h"
 
 #ifdef HAVE_PGSQL
 

ext/phar/phar_object.c

@@ -21,8 +21,6 @@
 #include "func_interceptors.h"
 #include "phar_object_arginfo.h"
 
-#include <errno.h>
-
 static zend_class_entry *phar_ce_archive;
 static zend_class_entry *phar_ce_data;
 static zend_class_entry *phar_ce_PharException;

ext/random/gammasection.c

@@ -24,8 +24,6 @@
 #include "php_random.h"
 #include <math.h>
 
-#include <float.h> // for DBL_MAX
-
 /* This file implements the γ-section algorithm as published in:
  *
  * Drawing Random Floating-Point Numbers from an Interval. Frédéric

ext/random/random.c

@@ -41,7 +41,6 @@
 # include <process.h>
 #else
 # include <sys/time.h>
-# include <errno.h>
 #endif
 
 #ifdef __linux__

ext/random/randomizer.c

@@ -27,8 +27,6 @@
 #include "Zend/zend_enum.h"
 #include "Zend/zend_exceptions.h"
 
-#include <float.h> // for DBL_MANT_DIG
-
 static inline void randomizer_common_init(php_random_randomizer *randomizer, zend_object *engine_object) {
 	if (engine_object->ce->type == ZEND_INTERNAL_CLASS) {
 		/* Internal classes always php_random_engine struct */

ext/shmop/shmop.c

@@ -33,13 +33,11 @@
 #include "tsrm_win32.h"
 #endif
 
+
 #ifdef HAVE_SHMOP
 
 #include "ext/standard/info.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 /* {{{ shmop_module_entry */
 zend_module_entry shmop_module_entry = {
 	STANDARD_MODULE_HEADER,

ext/soap/php_encoding.c

@@ -25,8 +25,6 @@
 #include "zend_strtod.h"
 #include "zend_interfaces.h"
 
-#include <errno.h>
-
 /* zval type decode */
 static zval *to_zval_double(zval* ret, encodeTypePtr type, xmlNodePtr data);
 static zval *to_zval_long(zval* ret, encodeTypePtr type, xmlNodePtr data);

ext/sockets/conversions.c

@@ -24,7 +24,6 @@
 # include <stdint.h>
 #endif
 
-#include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>

ext/sockets/multicast.c

@@ -39,7 +39,6 @@
 #include "sockaddr_conv.h"
 #include "main/php_network.h"
 
-#include <errno.h>
 
 enum source_op {
 	JOIN_SOURCE,

ext/sockets/sendrecvmsg.c

@@ -28,8 +28,6 @@
 #include <TSRM/TSRM.h>
 #endif
 
-#include <errno.h>
-
 #define MAX_USER_BUFF_SIZE ((size_t)(100*1024*1024))
 #define DEFAULT_BUFF_SIZE 8192
 #define MAX_ARRAY_KEY_SIZE 128

ext/sockets/sockaddr_conv.c

@@ -5,7 +5,6 @@
 #ifdef PHP_WIN32
 #include "windows_common.h"
 #else
-#include <errno.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #endif

ext/spl/spl_directory.c

@@ -36,9 +36,6 @@
 #include "spl_directory_arginfo.h"
 #include "spl_exceptions.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 #define SPL_HAS_FLAG(flags, test_flag) ((flags & test_flag) ? 1 : 0)
 
 /* declare the class handlers */

ext/standard/array.c

@@ -40,7 +40,6 @@
 #include "zend_smart_str.h"
 #include "zend_bitset.h"
 #include "zend_exceptions.h"
-#include "zend_strtod.h"
 #include "ext/spl/spl_array.h"
 #include "ext/random/php_random.h"
 

ext/standard/basic_functions.c

@@ -117,10 +117,6 @@ PHPAPI php_basic_globals basic_globals;
 #include "streamsfuncs.h"
 #include "basic_functions_arginfo.h"
 
-#if defined(HAVE_NANOSLEEP) || !defined(PHP_WIN32)
-#include <errno.h>
-#endif
-
 typedef struct _user_tick_function_entry {
 	zend_fcall_info fci;
 	zend_fcall_info_cache fci_cache;

ext/standard/dns.c

@@ -57,9 +57,6 @@ extern void __res_ndestroy(res_state statp);
 #endif
 #endif
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 255
 #endif

ext/standard/exec.c

@@ -46,10 +46,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_NICE
-#include <errno.h>
-#endif
-
 #include <limits.h>
 
 #ifdef PHP_WIN32

ext/standard/formatted_print.c

@@ -19,7 +19,6 @@
 #include "ext/standard/head.h"
 #include "php_string.h"
 #include "zend_execute.h"
-#include "zend_strtod.h" // for zend_gcvt()
 #include <stdio.h>
 
 #include <locale.h>

ext/standard/ftok.c

@@ -27,10 +27,6 @@
 #endif
 
 #ifdef HAVE_FTOK
-
-#include <errno.h>
-#include <string.h> // for strerror()
-
 /* {{{ Convert a pathname and a project identifier to a System V IPC key */
 PHP_FUNCTION(ftok)
 {

ext/standard/hrtime.c

@@ -17,7 +17,6 @@
 
 #include "php.h"
 #include "hrtime.h"
-#include "zend_strtod.h"
 
 /* {{{ */
 /* This file reuses code parts from the cross-platform timer library

ext/standard/mail.c

@@ -44,8 +44,6 @@
 
 #ifdef PHP_WIN32
 # include "win32/sendmail.h"
-#else
-# include <errno.h>
 #endif
 
 #define SKIP_LONG_HEADER_SEP(str, pos)																	\

ext/standard/math.c

@@ -23,7 +23,6 @@
 #include "zend_exceptions.h"
 #include "zend_portability.h"
 #include "zend_bitset.h"
-#include "zend_strtod.h"
 
 #include <math.h>
 #include <float.h>

ext/standard/net.c

@@ -47,9 +47,6 @@
 # include <netdb.h>
 #endif
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 PHPAPI zend_string* php_inet_ntop(const struct sockaddr *addr) {
 	socklen_t addrlen = sizeof(struct sockaddr_in);
 

ext/standard/php_fopen_wrapper.c

@@ -29,9 +29,6 @@
 #include "php_fopen_wrappers.h"
 #include "SAPI.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 static ssize_t php_stream_output_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
 {
 	PHPWRITE(buf, count);

ext/standard/proc_open.c

@@ -36,9 +36,6 @@
 #include <fcntl.h>
 #endif
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 /* This symbol is defined in ext/standard/config.m4.
  * Essentially, it is set if you HAVE_FORK || PHP_WIN32
  * Other platforms may modify that configure check and add suitable #ifdefs

ext/standard/streamsfuncs.c

@@ -40,9 +40,6 @@ typedef unsigned long long php_timeout_ull;
 typedef unsigned __int64 php_timeout_ull;
 #endif
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 #define GET_CTX_OPT(stream, wrapper, name, val) (PHP_STREAM_CONTEXT(stream) && NULL != (val = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), wrapper, name)))
 
 static php_stream_context *decode_context_param(zval *contextresource);

ext/standard/var.c

@@ -28,7 +28,6 @@
 #include "php_incomplete_class.h"
 #include "zend_enum.h"
 #include "zend_exceptions.h"
-#include "zend_strtod.h" // for zend_gcvt()
 /* }}} */
 
 struct php_serialize_data {

ext/standard/var_unserializer.re

@@ -19,7 +19,6 @@
 #include "php_incomplete_class.h"
 #include "zend_portability.h"
 #include "zend_exceptions.h"
-#include "zend_strtod.h"
 
 /* {{{ reference-handling for unserializer: var_* */
 #define VAR_ENTRIES_MAX 1018     /* 1024 - offsetof(php_unserialize_data, entries) / sizeof(void*) */

ext/sysvmsg/sysvmsg.c

@@ -22,13 +22,10 @@
 #include "php_globals.h"
 #include "ext/standard/info.h"
 #include "php_sysvmsg.h"
+#include "sysvmsg_arginfo.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
 
-#include <errno.h>
-#include "sysvmsg_arginfo.h"
-
-#include <string.h> // for strerror()
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>

main/main.c

@@ -82,8 +82,6 @@
 #include "rfc1867.h"
 
 #include "ext/standard/html_tables.h"
-
-#include <float.h> // for DBL_*, used by main_arginfo.h
 #include "main_arginfo.h"
 /* }}} */
 

main/snprintf.c

@@ -17,7 +17,7 @@
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
-#include "snprintf.h"
+#include "php.h"
 
 #include <zend_strtod.h>
 

main/snprintf.h

@@ -66,9 +66,6 @@ Example:
 #ifndef SNPRINTF_H
 #define SNPRINTF_H
 
-#include "php.h" // for PHPAPI
-#include "zend_portability.h" // for BEGIN_EXTERN_C
-
 #include <stdbool.h>
 
 BEGIN_EXTERN_C()

main/spprintf.c

@@ -75,8 +75,7 @@
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE
 #endif
-#include "spprintf.h"
-#include "zend_strtod.h"
+#include "php.h"
 
 #include <stddef.h>
 #include <stdio.h>

main/spprintf.h

@@ -18,8 +18,6 @@
 #define SPPRINTF_H
 
 #include "snprintf.h"
-#include "php.h" // for PHPAPI
-#include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_smart_str_public.h"
 #include "zend_smart_string_public.h"
 

main/streams/plain_wrapper.c

@@ -42,9 +42,6 @@
 # include "win32/readdir.h"
 #endif
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 #define php_stream_fopen_from_fd_int(fd, mode, persistent_id)	_php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_CC)
 #define php_stream_fopen_from_fd_int_rel(fd, mode, persistent_id)	 _php_stream_fopen_from_fd_int((fd), (mode), (persistent_id) STREAMS_REL_CC)
 #define php_stream_fopen_from_file_int(file, mode)	_php_stream_fopen_from_file_int((file), (mode) STREAMS_CC)

main/streams/streams.c

@@ -32,9 +32,6 @@
 #include <fcntl.h>
 #include "php_streams_int.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 /* {{{ resource and registration code */
 /* Global wrapper hash, copied to FG(stream_wrappers) on registration of volatile wrapper */
 static HashTable url_stream_wrappers_hash;

main/streams/xp_socket.c

@@ -25,11 +25,8 @@
 
 #ifdef AF_UNIX
 #include <sys/un.h>
-#include <string.h> // for strerror()
 #endif
 
-#include <errno.h>
-
 #ifndef MSG_DONTWAIT
 # define MSG_DONTWAIT 0
 #endif

sapi/cgi/cgi_main.c

@@ -95,8 +95,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 # include "valgrind/callgrind.h"
 #endif
 
-#include <errno.h>
-
 #ifndef PHP_WIN32
 /* XXX this will need to change later when threaded fastcgi is implemented.  shane */
 struct sigaction act, old_term, old_quit, old_int;

sapi/cli/php_cli.c

@@ -92,8 +92,6 @@
 # include "openssl/applink.c"
 #endif
 
-#include <errno.h>
-
 PHPAPI extern char *php_ini_opened_path;
 PHPAPI extern char *php_ini_scanned_path;
 PHPAPI extern char *php_ini_scanned_files;

sapi/cli/php_cli_server.c

@@ -106,9 +106,6 @@
 #include "php_cli_process_title.h"
 #include "php_cli_process_title_arginfo.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 #define OUTPUT_NOT_CHECKED -1
 #define OUTPUT_IS_TTY 1
 #define OUTPUT_NOT_TTY 0

sapi/fpm/fpm/fpm_main.c

@@ -93,9 +93,6 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #include "fpm_log.h"
 #include "zlog.h"
 
-#include <errno.h>
-#include <string.h> // for strerror()
-
 /* XXX this will need to change later when threaded fastcgi is implemented.  shane */
 struct sigaction act, old_term, old_quit, old_int;
 

sapi/phpdbg/phpdbg_io.c

@@ -20,8 +20,6 @@
 
 #include "phpdbg_io.h"
 
-#include <errno.h>
-
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* is easy to generalize ... but not needed for now */