diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 72b57e5419f90..2965de2b931cf 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 
+#include "zend_types.h"
 #include "../TSRM/TSRM.h"
 
 #ifndef ZEND_MM_ALIGNMENT
diff --git a/Zend/zend_attributes.h b/Zend/zend_attributes.h
index 20a868191c6a4..043257e99c56a 100644
--- a/Zend/zend_attributes.h
+++ b/Zend/zend_attributes.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_ATTRIBUTES_H
 #define ZEND_ATTRIBUTES_H
 
+#include "zend_compile.h"
+
 #define ZEND_ATTRIBUTE_TARGET_CLASS			(1<<0)
 #define ZEND_ATTRIBUTE_TARGET_FUNCTION		(1<<1)
 #define ZEND_ATTRIBUTE_TARGET_METHOD		(1<<2)
diff --git a/Zend/zend_builtin_functions.h b/Zend/zend_builtin_functions.h
index a49dab1b46838..237b34b2927be 100644
--- a/Zend/zend_builtin_functions.h
+++ b/Zend/zend_builtin_functions.h
@@ -20,6 +20,10 @@
 #ifndef ZEND_BUILTIN_FUNCTIONS_H
 #define ZEND_BUILTIN_FUNCTIONS_H
 
+#include "zend_types.h"
+
+typedef struct _zval_struct zval;
+
 zend_result zend_startup_builtin_functions(void);
 
 BEGIN_EXTERN_C()
diff --git a/Zend/zend_closures.h b/Zend/zend_closures.h
index 2d093fa616800..ced1b5ba48c15 100644
--- a/Zend/zend_closures.h
+++ b/Zend/zend_closures.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_CLOSURES_H
 #define ZEND_CLOSURES_H
 
+#include "zend_types.h"
+
 BEGIN_EXTERN_C()
 
 /* This macro depends on zend_closure structure layout */
diff --git a/Zend/zend_enum.h b/Zend/zend_enum.h
index 7b58592d42bd5..fcbb82faef1ec 100644
--- a/Zend/zend_enum.h
+++ b/Zend/zend_enum.h
@@ -20,7 +20,7 @@
 #define ZEND_ENUM_H
 
 #include "zend.h"
-#include "zend_types.h"
+#include "zend_API.h"
 
 #include <stdint.h>
 
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
index 242b71a8be05a..b80c17d8f38f2 100644
--- a/Zend/zend_exceptions.h
+++ b/Zend/zend_exceptions.h
@@ -22,6 +22,8 @@
 #ifndef ZEND_EXCEPTIONS_H
 #define ZEND_EXCEPTIONS_H
 
+#include "zend_types.h"
+
 BEGIN_EXTERN_C()
 
 extern ZEND_API zend_class_entry *zend_ce_throwable;
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index c8e91122a3590..64ed97400c9ec 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -19,6 +19,8 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H
 
+#include "zend_portability.h"
+
 BEGIN_EXTERN_C()
 
 /*
diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index b3fb44c353355..dc1d04beacdda 100644
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -22,6 +22,8 @@
 
 #include <stdint.h>
 
+#include "zend_compile.h"
+
 BEGIN_EXTERN_C()
 
 extern ZEND_API zend_class_entry *zend_ce_generator;
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index 59b3daca53fd4..d3cd9f923eeea 100644
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_GLOBALS_MACROS_H
 #define ZEND_GLOBALS_MACROS_H
 
+#include "zend_portability.h"
+
 typedef struct _zend_compiler_globals zend_compiler_globals;
 typedef struct _zend_executor_globals zend_executor_globals;
 typedef struct _zend_php_scanner_globals zend_php_scanner_globals;
diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h
index e54a339ec4bc3..04688d65132b2 100644
--- a/Zend/zend_highlight.h
+++ b/Zend/zend_highlight.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_HIGHLIGHT_H
 #define ZEND_HIGHLIGHT_H
 
+#include "zend_types.h"
+
 #define HL_COMMENT_COLOR     "#FF8000"    /* orange */
 #define HL_DEFAULT_COLOR     "#0000BB"    /* blue */
 #define HL_HTML_COLOR        "#000000"    /* black */
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 6ca5658e970d3..1939d7b89e3ff 100644
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -19,6 +19,8 @@
 #ifndef ZEND_INI_H
 #define ZEND_INI_H
 
+#include "zend_modules.h"
+
 #define ZEND_INI_USER	(1<<0)
 #define ZEND_INI_PERDIR	(1<<1)
 #define ZEND_INI_SYSTEM	(1<<2)
diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index f0cfac2e7affe..62546413c7cb2 100644
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -20,6 +20,10 @@
 #ifndef _ZEND_INI_SCANNER_H
 #define _ZEND_INI_SCANNER_H
 
+#include "zend_types.h"
+
+typedef struct _zend_file_handle zend_file_handle;
+
 /* Scanner modes */
 #define ZEND_INI_SCANNER_NORMAL 0 /* Normal mode. [DEFAULT] */
 #define ZEND_INI_SCANNER_RAW    1 /* Raw mode. Option values are not parsed */
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h
index 7d237982034e6..75549188ed6bb 100644
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
@@ -17,6 +17,11 @@
    +----------------------------------------------------------------------+
 */
 
+#ifndef ZEND_ITERATORS_H
+#define ZEND_ITERATORS_H
+
+#include "zend_types.h"
+
 /* These iterators were designed to operate within the foreach()
  * structures provided by the engine, but could be extended for use
  * with other iterative engine opcodes.
@@ -89,3 +94,5 @@ ZEND_API void zend_iterator_dtor(zend_object_iterator *iter);
 
 ZEND_API void zend_register_iterator_wrapper(void);
 END_EXTERN_C()
+
+#endif /* ZEND_ITERATORS_H */
diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index ca32329a557f2..612c845479272 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_SCANNER_H
 #define ZEND_SCANNER_H
 
+#include "zend_globals.h"
+
 typedef struct _zend_lex_state {
 	unsigned int yy_leng;
 	unsigned char *yy_start;
diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index cce5ad5ce95a7..848543eba0a62 100644
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_LLIST_H
 #define ZEND_LLIST_H
 
+#include "zend_portability.h"
+
 typedef struct _zend_llist_element {
 	struct _zend_llist_element *next;
 	struct _zend_llist_element *prev;
diff --git a/Zend/zend_map_ptr.h b/Zend/zend_map_ptr.h
index aa726e0cdd32d..7a0d853dbd166 100644
--- a/Zend/zend_map_ptr.h
+++ b/Zend/zend_map_ptr.h
@@ -21,6 +21,8 @@
 
 #include "zend_portability.h"
 
+typedef struct _zend_string zend_string;
+
 #define ZEND_MAP_PTR_KIND_PTR           0
 #define ZEND_MAP_PTR_KIND_PTR_OR_OFFSET 1
 
diff --git a/Zend/zend_multibyte.h b/Zend/zend_multibyte.h
index 7eb99fc69a1a0..16ba56ec69fd2 100644
--- a/Zend/zend_multibyte.h
+++ b/Zend/zend_multibyte.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_MULTIBYTE_H
 #define ZEND_MULTIBYTE_H
 
+#include "zend_types.h"
+
 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);
diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index 23a6c18241603..35498f34617c0 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -22,6 +22,8 @@
 
 #include <stdint.h>
 
+#include "zend_types.h"
+
 struct _zend_property_info;
 
 #define ZEND_WRONG_PROPERTY_INFO \
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index 1126da5800d1b..3ef1478fe4c3d 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_PTR_STACK_H
 #define ZEND_PTR_STACK_H
 
+#include "zend_alloc.h"
+
 typedef struct _zend_ptr_stack {
 	int top, max;
 	void **elements;
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
index 93edc1f0e0213..e88892da35aaa 100644
--- a/Zend/zend_signal.h
+++ b/Zend/zend_signal.h
@@ -25,6 +25,8 @@
 
 #include <signal.h>
 
+#include "zend_portability.h"
+
 #ifndef NSIG
 #define NSIG 65
 #endif
diff --git a/Zend/zend_smart_str_public.h b/Zend/zend_smart_str_public.h
index e81a6839b3bbb..6a3b526254e48 100644
--- a/Zend/zend_smart_str_public.h
+++ b/Zend/zend_smart_str_public.h
@@ -17,6 +17,10 @@
 #ifndef ZEND_SMART_STR_PUBLIC_H
 #define ZEND_SMART_STR_PUBLIC_H
 
+#include <stddef.h>
+
+typedef struct _zend_string zend_string;
+
 typedef struct {
 	/** See smart_str_extract() */
 	zend_string *s;
diff --git a/Zend/zend_sort.h b/Zend/zend_sort.h
index e606935f79029..5954575dbc25d 100644
--- a/Zend/zend_sort.h
+++ b/Zend/zend_sort.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_SORT_H
 #define ZEND_SORT_H
 
+#include "zend_types.h"
+
 BEGIN_EXTERN_C()
 ZEND_API void zend_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp);
 ZEND_API void zend_insert_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp);
diff --git a/Zend/zend_stack.h b/Zend/zend_stack.h
index 68c3621533f92..a2edc12b1fb4c 100644
--- a/Zend/zend_stack.h
+++ b/Zend/zend_stack.h
@@ -20,6 +20,8 @@
 #ifndef ZEND_STACK_H
 #define ZEND_STACK_H
 
+#include "zend_portability.h"
+
 typedef struct _zend_stack {
 	int size, top, max;
 	void *elements;
diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index c1f8ddfb85ca8..33d8656dad5ee 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -25,6 +25,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include "zend_types.h"
+
 /* Lightweight stream implementation for the ZE scanners.
  * These functions are private to the engine.
  * */
diff --git a/Zend/zend_system_id.c b/Zend/zend_system_id.c
index 27adf3fe1a4a2..37bed895a7b96 100644
--- a/Zend/zend_system_id.c
+++ b/Zend/zend_system_id.c
@@ -26,7 +26,7 @@ ZEND_API char zend_system_id[32];
 static PHP_MD5_CTX context;
 static int finalized = 0;
 
-ZEND_API ZEND_RESULT_CODE zend_add_system_entropy(const char *module_name, const char *hook_name, const void *data, size_t size)
+ZEND_API zend_result zend_add_system_entropy(const char *module_name, const char *hook_name, const void *data, size_t size)
 {
 	if (finalized == 0) {
 		PHP_MD5Update(&context, module_name, strlen(module_name));
diff --git a/Zend/zend_system_id.h b/Zend/zend_system_id.h
index 60514e15a0976..b6785f8d7b672 100644
--- a/Zend/zend_system_id.h
+++ b/Zend/zend_system_id.h
@@ -17,11 +17,13 @@
 #ifndef ZEND_SYSTEM_ID_H
 #define ZEND_SYSTEM_ID_H
 
+#include "zend_types.h"
+
 BEGIN_EXTERN_C()
 /* True global; Write-only during MINIT/startup */
 extern ZEND_API char zend_system_id[32];
 
-ZEND_API ZEND_RESULT_CODE zend_add_system_entropy(const char *module_name, const char *hook_name, const void *data, size_t size);
+ZEND_API zend_result zend_add_system_entropy(const char *module_name, const char *hook_name, const void *data, size_t size);
 END_EXTERN_C()
 
 void zend_startup_system_id(void);
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h
index 15c3b984a9dc7..acfb5c46c60e0 100644
--- a/Zend/zend_virtual_cwd.h
+++ b/Zend/zend_virtual_cwd.h
@@ -63,6 +63,8 @@
 #include <errno.h>
 #endif
 
+#include "zend_stream.h"
+
 #ifdef ZEND_WIN32
 #include "win32/readdir.h"
 #include <sys/utime.h>
diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h
index 1b7cf1362d7e1..c9c41c75c72a2 100644
--- a/Zend/zend_vm.h
+++ b/Zend/zend_vm.h
@@ -19,6 +19,11 @@
 #ifndef ZEND_VM_H
 #define ZEND_VM_H
 
+#include "zend_portability.h"
+
+typedef struct _zend_op zend_op;
+typedef struct _zend_execute_data zend_execute_data;
+
 BEGIN_EXTERN_C()
 
 ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler(zend_op* opcode);