#include cleanup part 3

Zend/Optimizer/dce.c

@@ -22,6 +22,7 @@
 #include "Optimizer/zend_ssa.h"
 #include "Optimizer/zend_func_info.h"
 #include "Optimizer/zend_call_graph.h"
+#include "zend_arena.h"
 #include "zend_bitset.h"
 
 /* This pass implements a form of dead code elimination (DCE). The algorithm optimistically assumes

Zend/Optimizer/sccp.c

@@ -18,8 +18,11 @@
 */
 
 #include "zend_API.h"
+#include "zend_arena.h"
+#include "zend_multiply.h" // for zend_safe_address_guarded()
 #include "zend_exceptions.h"
 #include "zend_ini.h"
+#include "zend_optimizer.h"
 #include "zend_type_info.h"
 #include "Optimizer/zend_optimizer_internal.h"
 #include "Optimizer/zend_call_graph.h"

Zend/Optimizer/scdf.c

@@ -16,8 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "Optimizer/zend_optimizer_internal.h"
 #include "Optimizer/scdf.h"
+#include "Optimizer/zend_optimizer_internal.h"
+#include "zend_arena.h"
 
 /* This defines a generic framework for sparse conditional dataflow propagation. The algorithm is
  * based on "Sparse conditional constant propagation" by Wegman and Zadeck. We're using a

Zend/Optimizer/scdf.h

@@ -20,6 +20,11 @@
 #define _SCDF_H
 
 #include "zend_bitset.h"
+#include "zend_long.h"
+#include "zend_ssa.h"
+
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_optimizer_ctx zend_optimizer_ctx;
 
 typedef struct _scdf_ctx {
 	zend_op_array *op_array;

Zend/Optimizer/zend_call_graph.c

@@ -16,15 +16,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_extensions.h"
-#include "Optimizer/zend_optimizer.h"
-#include "zend_optimizer_internal.h"
-#include "zend_inference.h"
 #include "zend_call_graph.h"
+#include "zend_arena.h"
+#include "zend_bitset.h"
 #include "zend_func_info.h"
-#include "zend_inference.h"
-#include "zend_call_graph.h"
+#include "zend_optimizer_internal.h"
 
 static void zend_op_array_calc(zend_op_array *op_array, void *context)
 {

Zend/Optimizer/zend_call_graph.h

@@ -20,8 +20,9 @@
 #define ZEND_CALL_GRAPH_H
 
 #include "zend_ssa.h"
-#include "zend_func_info.h"
-#include "zend_optimizer.h"
+
+typedef struct _zend_func_info zend_func_info;
+typedef struct _zend_call_info zend_call_info;
 
 typedef struct _zend_send_arg_info {
 	zend_op                *opline;

Zend/Optimizer/zend_cfg.c

@@ -16,13 +16,12 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
 #include "zend_cfg.h"
-#include "zend_func_info.h"
-#include "zend_worklist.h"
-#include "zend_optimizer.h"
+#include "zend_func_info.h" // for ZEND_FUNC_FREE_LOOP_VAR
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 #include "zend_optimizer_internal.h"
-#include "zend_sort.h"
+#include "zend_worklist.h"
 
 static void zend_mark_reachable(zend_op *opcodes, zend_cfg *cfg, zend_basic_block *b) /* {{{ */
 {

Zend/Optimizer/zend_cfg.h

@@ -19,6 +19,13 @@
 #ifndef ZEND_CFG_H
 #define ZEND_CFG_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+#include <stdint.h>
+
+typedef struct _zend_arena zend_arena;
+typedef struct _zend_op_array zend_op_array;
+
 /* zend_basic_block.flags */
 #define ZEND_BB_START            (1<<0)  /* first block            */
 #define ZEND_BB_FOLLOW           (1<<1)  /* follows the next block */

Zend/Optimizer/zend_inference.c

@@ -16,13 +16,15 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_generators.h"
 #include "zend_inference.h"
+#include "zend_closures.h" // for zend_ce_closure
+#include "zend_generators.h" // for zend_ce_generator
 #include "zend_func_info.h"
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 #include "zend_call_graph.h"
-#include "zend_closures.h"
 #include "zend_worklist.h"
+#include "zend_optimizer.h"
 #include "zend_optimizer_internal.h"
 
 /* The used range inference algorithm is described in:

Zend/Optimizer/zend_inference.h

@@ -19,12 +19,11 @@
 #ifndef ZEND_INFERENCE_H
 #define ZEND_INFERENCE_H
 
-#include "zend_optimizer.h"
+#include "zend_cfg.h" // for CRT_CONSTANT()
+#include "zend_compile.h" // for struct _zend_op
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_ssa.h"
-#include "zend_bitset.h"
-
-/* Bitmask for type inference (zend_ssa_var_info.type) */
-#include "zend_type_info.h"
+#include "zend_type_info.h" // for MAY_BE_*
 
 #define MAY_BE_PACKED_GUARD         (1<<27) /* needs packed array guard */
 #define MAY_BE_CLASS_GUARD          (1<<27) /* needs class guard */

Zend/Optimizer/zend_optimizer.c

@@ -21,17 +21,16 @@
 
 #include "Optimizer/zend_optimizer.h"
 #include "Optimizer/zend_optimizer_internal.h"
-#include "zend_API.h"
-#include "zend_constants.h"
-#include "zend_execute.h"
-#include "zend_vm.h"
-#include "zend_cfg.h"
-#include "zend_func_info.h"
-#include "zend_call_graph.h"
-#include "zend_inference.h"
-#include "zend_dump.h"
-#include "php.h"
+#include "php_globals.h" // for PG()
+#include "zend_API.h" // for ZVAL_EMPTY_STRING()
+#include "zend_arena.h"
+#include "zend_call_graph.h" // for struct _zend_func_info
+#include "zend_dump.h" // for zend_dump_op_array()
+#include "zend_inference.h" // for OP1_INFO(), ...
+#include "zend_ini.h"
 #include "zend_observer.h"
+#include "zend_virtual_cwd.h" //for IS_ABSOLUTE_PATH()
+#include "zend_vm.h"
 
 #ifndef ZEND_OPTIMIZER_MAX_REGISTERED_PASSES
 # define ZEND_OPTIMIZER_MAX_REGISTERED_PASSES 32

Zend/Optimizer/zend_optimizer.h

@@ -22,8 +22,11 @@
 #ifndef ZEND_OPTIMIZER_H
 #define ZEND_OPTIMIZER_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_compile.h" // for zend_op_array
+#include "zend_hash.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_string zend_string;
 
 #define ZEND_OPTIMIZER_PASS_1		(1<<0)   /* Simple local optimizations   */
 #define ZEND_OPTIMIZER_PASS_2		(1<<1)   /*                              */

Zend/Optimizer/zend_ssa.c

@@ -17,12 +17,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_compile.h"
-#include "zend_dfg.h"
 #include "zend_ssa.h"
+#include "zend_arena.h"
+#include "zend_optimizer_internal.h"
+#include "zend_dfg.h"
 #include "zend_dump.h"
-#include "zend_inference.h"
-#include "Optimizer/zend_optimizer_internal.h"
+#include "zend_inference.h" // for zend_sub_will_overflow()
+#include "zend_type_info.h" // for MAY_BE_REF
 
 static bool dominates(const zend_basic_block *blocks, int a, int b) {
 	while (blocks[b].level > blocks[a].level) {

Zend/Optimizer/zend_ssa.h

@@ -19,8 +19,14 @@
 #ifndef ZEND_SSA_H
 #define ZEND_SSA_H
 
-#include "zend_optimizer.h"
 #include "zend_cfg.h"
+#include "zend_compile.h" // for struct _zend_op
+#include "zend_long.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for zend_result
+
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_script zend_script;
 
 typedef struct _zend_ssa_range {
 	zend_long              min;

Zend/zend_arena.h

@@ -19,7 +19,10 @@
 #ifndef _ZEND_ARENA_H_
 #define _ZEND_ARENA_H_
 
-#include "zend.h"
+#include "zend_multiply.h" // for zend_safe_address()
+#include "zend.h" // for zend_error()
+
+#include <stddef.h> // for size_t
 
 #ifndef ZEND_TRACK_ARENA_ALLOC
 

Zend/zend_bitset.h

@@ -19,6 +19,13 @@
 #ifndef _ZEND_BITSET_H_
 #define _ZEND_BITSET_H_
 
+#include "zend_portability.h" // for zend_always_inline
+
+#include "zend_long.h"
+
+#include <stdint.h>
+#include <string.h>
+
 typedef zend_ulong *zend_bitset;
 
 #define ZEND_BITSET_ELM_SIZE sizeof(zend_ulong)

Zend/zend_build.h

@@ -19,6 +19,12 @@
 #ifndef ZEND_BUILD_H
 #define ZEND_BUILD_H
 
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
+
 #define ZEND_TOSTR_(x) #x
 #define ZEND_TOSTR(x) ZEND_TOSTR_(x)
 

Zend/zend_extensions.c

@@ -18,7 +18,10 @@
 */
 
 #include "zend_extensions.h"
-#include "zend_system_id.h"
+#include "zend_arena.h"
+#include "zend_globals.h" // for struct _zend_compiler_globals
+#include "zend_globals_macros.h" // for CG()
+#include "zend_system_id.h" // for zend_add_system_entropy()
 
 ZEND_API zend_llist zend_extensions;
 ZEND_API uint32_t zend_extension_flags = 0;

Zend/zend_extensions.h

@@ -20,8 +20,15 @@
 #ifndef ZEND_EXTENSIONS_H
 #define ZEND_EXTENSIONS_H
 
-#include "zend_compile.h"
-#include "zend_build.h"
+#include "zend_build.h" // for ZEND_TOSTR()
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for zend_result
+
+#include <stddef.h> // for size_t
+
+typedef struct _zend_execute_data zend_execute_data;
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_llist zend_llist;
 
 /*
 The constants below are derived from ext/opcache/ZendAccelerator.h

Zend/zend_float.c

@@ -16,9 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_compile.h"
 #include "zend_float.h"
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 
 ZEND_API void zend_init_fpu(void) /* {{{ */
 {

Zend/zend_float.h

@@ -19,6 +19,8 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
 BEGIN_EXTERN_C()
 
 /*

Zend/zend_long.h

@@ -19,6 +19,12 @@
 #ifndef ZEND_LONG_H
 #define ZEND_LONG_H
 
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h" // for SIZEOF_SIZE_T
+#endif
+
 #include <inttypes.h>
 #include <stdint.h>
 

Zend/zend_map_ptr.h

@@ -19,7 +19,7 @@
 #ifndef ZEND_MAP_PTR_H
 #define ZEND_MAP_PTR_H
 
-#include "zend_portability.h"
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 
 #define ZEND_MAP_PTR_KIND_PTR           0
 #define ZEND_MAP_PTR_KIND_PTR_OR_OFFSET 1
@@ -69,6 +69,8 @@
 # error "Unknown ZEND_MAP_PTR_KIND"
 #endif
 
+typedef struct _zend_string zend_string;
+
 BEGIN_EXTERN_C()
 
 ZEND_API void  zend_map_ptr_reset(void);

Zend/zend_multiply.h

@@ -17,11 +17,12 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend_portability.h"
-
 #ifndef ZEND_MULTIPLY_H
 #define ZEND_MULTIPLY_H
 
+#include "zend_portability.h"
+#include "zend.h" // for zend_error_noreturn()
+
 #if PHP_HAVE_BUILTIN_SMULL_OVERFLOW && SIZEOF_LONG == SIZEOF_ZEND_LONG
 
 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\

Zend/zend_stream.c

@@ -19,9 +19,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_compile.h"
 #include "zend_stream.h"
+#include "zend_globals.h" // struct _zend_compiler_globals
+#include "zend_globals_macros.h" // for CG()
+#include "zend_string.h"
+#include "zend.h" // for zend_stream_open_function
 
 ZEND_DLIMPORT int isatty(int fd);
 

Zend/zend_stream.h

@@ -22,9 +22,16 @@
 #ifndef ZEND_STREAM_H
 #define ZEND_STREAM_H
 
-#include <sys/types.h>
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for zend_uchar
+
+#include <stdbool.h>
+#include <stdio.h> // for FILE
+#include <sys/types.h> // for ssize_t
 #include <sys/stat.h>
 
+typedef struct _zend_string zend_string;
+
 /* Lightweight stream implementation for the ZE scanners.
  * These functions are private to the engine.
  * */

Zend/zend_system_id.c

@@ -15,11 +15,10 @@
    +----------------------------------------------------------------------+
  */
 
-#include "php.h"
 #include "zend_system_id.h"
-#include "zend_extensions.h"
+#include "zend_extensions.h" // for ZEND_EXTENSION_BUILD_ID
 #include "ext/standard/md5.h"
-#include "ext/hash/php_hash.h"
+#include "ext/hash/php_hash.h" // for php_hash_bin2hex()
 
 ZEND_API char zend_system_id[32];