diff --git a/Zend/zend_observer.c b/Zend/zend_observer.c
index 79929bfdd80..7ff183f0efa 100644
--- a/Zend/zend_observer.c
+++ b/Zend/zend_observer.c
@@ -18,10 +18,10 @@
 */
 
 #include "zend_observer.h"
-
-#include "zend_extensions.h"
+#include "zend_fibers.h"
+#include "zend_extensions.h" // for zend_get_op_array_extension_handles()
 #include "zend_llist.h"
-#include "zend_vm.h"
+#include "zend_vm.h" // for ZEND_VM_SET_OPCODE_HANDLER()
 
 #define ZEND_OBSERVER_DATA(function) \
 	ZEND_OP_ARRAY_EXTENSION((&(function)->common), zend_observer_fcall_op_array_extension)
diff --git a/Zend/zend_observer.h b/Zend/zend_observer.h
index fc4d9a62c89..8c5b20b3495 100644
--- a/Zend/zend_observer.h
+++ b/Zend/zend_observer.h
@@ -20,9 +20,15 @@
 #ifndef ZEND_OBSERVER_H
 #define ZEND_OBSERVER_H
 
-#include "zend.h"
-#include "zend_compile.h"
-#include "zend_fibers.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 struct _zend_fiber_context zend_fiber_context;
+typedef union  _zend_function zend_function;
+typedef struct _zend_op_array zend_op_array;
+typedef struct _zend_string zend_string;
+typedef struct _zval_struct zval;
 
 BEGIN_EXTERN_C()