diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 1f3687642ab..4e6fe95917d 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -18,7 +18,10 @@
 */
 
 #include "zend_extensions.h"
-#include "zend_system_id.h"
+#include "zend_arena.h"
+#include "zend_globals.h" // for struct _zend_compiler_globals
+#include "zend_globals_macros.h" // for CG()
+#include "zend_system_id.h" // for zend_add_system_entropy()
 
 ZEND_API zend_llist zend_extensions;
 ZEND_API uint32_t zend_extension_flags = 0;
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 14ba9054d9b..ff28a14509a 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -20,8 +20,15 @@
 #ifndef ZEND_EXTENSIONS_H
 #define ZEND_EXTENSIONS_H
 
-#include "zend_compile.h"
-#include "zend_build.h"
+#include "zend_build.h" // for ZEND_TOSTR()
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for zend_result
+
+#include <stddef.h> // for size_t
+
+typedef struct _zend_execute_data zend_execute_data;
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_llist zend_llist;
 
 /*
 The constants below are derived from ext/opcache/ZendAccelerator.h