diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 4c326a6c79b..03601ce3fc7 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -18,14 +18,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_API.h"
 #include "zend_closures.h"
-#include "zend_exceptions.h"
-#include "zend_interfaces.h"
-#include "zend_objects.h"
-#include "zend_objects_API.h"
-#include "zend_globals.h"
+#include "zend_API.h" //for ZEND_METHOD()
+#include "zend_arena.h"
+#include "zend_compile.h" // for union _zend_function
+#include "zend_objects.h" // for zend_object_std_init()
 #include "zend_closures_arginfo.h"
 
 typedef struct _zend_closure {
diff --git a/Zend/zend_closures.h b/Zend/zend_closures.h
index 2d093fa6168..40cb0a36ca3 100644
--- a/Zend/zend_closures.h
+++ b/Zend/zend_closures.h
@@ -20,6 +20,15 @@
 #ifndef ZEND_CLOSURES_H
 #define ZEND_CLOSURES_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_execute_data zend_execute_data;
+typedef union  _zend_function zend_function;
+typedef struct _zend_object zend_object;
+typedef struct _zend_string zend_string;
+typedef struct _zval_struct zval;
+
 BEGIN_EXTERN_C()
 
 /* This macro depends on zend_closure structure layout */