diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
index 1aeaa02f7b3..532e8985688 100644
--- a/Zend/Optimizer/zend_inference.c
+++ b/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:
diff --git a/Zend/Optimizer/zend_inference.h b/Zend/Optimizer/zend_inference.h
index f27c5ecdc48..65b48ee6a86 100644
--- a/Zend/Optimizer/zend_inference.h
+++ b/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 */