diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index 8e11841ad26..41b89d1d86b 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -19,9 +19,11 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_compile.h"
 #include "zend_stream.h"
+#include "zend_globals.h" // struct _zend_compiler_globals
+#include "zend_globals_macros.h" // for CG()
+#include "zend_string.h"
+#include "zend.h" // for zend_stream_open_function
 
 ZEND_DLIMPORT int isatty(int fd);
 
diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index 047719e175a..22541bf8d92 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -22,9 +22,16 @@
 #ifndef ZEND_STREAM_H
 #define ZEND_STREAM_H
 
-#include <sys/types.h>
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+#include "zend_types.h" // for zend_uchar
+
+#include <stdbool.h>
+#include <stdio.h> // for FILE
+#include <sys/types.h> // for ssize_t
 #include <sys/stat.h>
 
+typedef struct _zend_string zend_string;
+
 /* Lightweight stream implementation for the ZE scanners.
  * These functions are private to the engine.
  * */