diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
index 3e455b702cb..11c62d83e1a 100644
--- a/Zend/zend_enum.c
+++ b/Zend/zend_enum.c
@@ -16,13 +16,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_compile.h"
+#include "zend_enum.h"
+#include "zend_arena.h" // ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX2
+#include "zend_API.h" // for INIT_CLASS_ENTRY_EX()
 #include "zend_enum_arginfo.h"
 #include "zend_interfaces.h"
-#include "zend_enum.h"
-#include "zend_extensions.h"
+#include "zend_extensions.h" // for zend_internal_run_time_cache_reserved_size()
+#include "zend_objects.h" // for zend_objects_new()
 #include "zend_observer.h"
 
 #define ZEND_ENUM_DISALLOW_MAGIC_METHOD(propertyName, methodName) \
diff --git a/Zend/zend_enum.h b/Zend/zend_enum.h
index dbb230c4175..895100f0922 100644
--- a/Zend/zend_enum.h
+++ b/Zend/zend_enum.h
@@ -19,8 +19,11 @@
 #ifndef ZEND_ENUM_H
 #define ZEND_ENUM_H
 
-#include "zend.h"
-#include "zend_types.h"
+#include "zend_compile.h" // for OBJ_PROP_NUM
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
+typedef struct _zend_class_entry zend_class_entry;
+typedef struct _zend_function_entry zend_function_entry;
 
 BEGIN_EXTERN_C()