diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index f67033b1116..fd5a0895b2a 100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -17,8 +17,10 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_API.h"
+#include "zend_iterators.h"
+#include "zend_objects.h"
+#include "zend_object_handlers.h"
+#include "zend_API.h" // for INIT_CLASS_ENTRY
 
 static zend_class_entry zend_iterator_class_entry;
 
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h
index 5e7451f7eac..98337961948 100644
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
@@ -17,6 +17,11 @@
    +----------------------------------------------------------------------+
 */
 
+#ifndef ZEND_ITERATORS_H
+#define ZEND_ITERATORS_H
+
+#include "zend_types.h" // for zval
+
 /* These iterators were designed to operate within the foreach()
  * structures provided by the engine, but could be extended for use
  * with other iterative engine opcodes.
@@ -89,3 +94,5 @@ ZEND_API void zend_iterator_dtor(zend_object_iterator *iter);
 
 ZEND_API void zend_register_iterator_wrapper(void);
 END_EXTERN_C()
+
+#endif /* ZEND_ITERATORS_H */