diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 578d4c78cc5c5..eb80bfb14b018 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -24,7 +24,6 @@
 #include <stdio.h>
 
 #include "../TSRM/TSRM.h"
-#include "zend.h"
 
 #ifndef ZEND_MM_ALIGNMENT
 # error "ZEND_MM_ALIGNMENT was not defined during configure"
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index 4c1a87e288a73..963b81e533084 100644
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -21,7 +21,7 @@
 #ifndef ZEND_AST_H
 #define ZEND_AST_H
 
-#include "zend.h"
+#include "zend_types.h"
 
 #ifndef ZEND_AST_SPEC
 # define ZEND_AST_SPEC 1
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 724b5b8c8a57c..765e54fb56ee8 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -20,8 +20,10 @@
 #ifndef ZEND_COMPILE_H
 #define ZEND_COMPILE_H
 
-#include "zend.h"
 #include "zend_ast.h"
+#include "zend_types.h"
+#include "zend_map_ptr.h"
+#include "zend_alloc.h"
 
 #include <stdarg.h>
 #include <stdint.h>
@@ -85,7 +87,6 @@ typedef struct _znode { /* used only during compilation */
 	} u;
 } znode;
 
-/* Temporarily defined here, to avoid header ordering issues */
 typedef struct _zend_ast_znode {
 	zend_ast_kind kind;
 	zend_ast_attr attr;
@@ -492,6 +493,9 @@ struct _zend_op_array {
 #define ZEND_RETURN_VALUE				0
 #define ZEND_RETURN_REFERENCE			1
 
+#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value
+#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value
+
 /* zend_internal_function_handler */
 typedef void (ZEND_FASTCALL *zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
 
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 5726c8a919f43..335cb3f48b855 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -21,7 +21,9 @@
 #ifndef ZEND_HASH_H
 #define ZEND_HASH_H
 
-#include "zend.h"
+#include "zend_types.h"
+#include "zend_gc.h"
+#include "zend_string.h"
 #include "zend_sort.h"
 
 #define HASH_KEY_IS_STRING 1
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index 422bf6a53e2f3..95fa5acf62fb7 100644
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -20,8 +20,10 @@
 #ifndef ZEND_OBJECTS_API_H
 #define ZEND_OBJECTS_API_H
 
-#include "zend.h"
-#include "zend_compile.h"
+#include "zend_types.h"
+#include "zend_gc.h"
+#include "zend_alloc.h"
+#include "zend_compile.h" /* For zend_property_info */
 
 #define OBJ_BUCKET_INVALID			(1<<0)
 
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 1513a19c36070..910e2eed250fe 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -19,7 +19,9 @@
 #ifndef ZEND_STRING_H
 #define ZEND_STRING_H
 
-#include "zend.h"
+#include "zend_types.h"
+#include "zend_gc.h"
+#include "zend_alloc.h"
 
 BEGIN_EXTERN_C()
 
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index ea3fd9c5efcb8..d504b0f0f5795 100644
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -23,6 +23,7 @@
 
 #include "zend_types.h"
 #include "zend_gc.h"
+#include "zend_hash.h"
 
 BEGIN_EXTERN_C()