ext/spl: Remove some useless header includes and clarify usages

Author: Girgias

ext/spl/spl_array.c

@@ -24,7 +24,6 @@
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 
-#include "php_spl.h"
 #include "spl_functions.h"
 #include "spl_iterators.h"
 #include "spl_array.h"

ext/spl/spl_array.h

@@ -18,8 +18,6 @@
 #define SPL_ARRAY_H
 
 #include "php.h"
-#include "php_spl.h"
-#include "spl_iterators.h"
 
 #define SPL_ARRAY_STD_PROP_LIST      0x00000001
 #define SPL_ARRAY_ARRAY_AS_PROPS     0x00000002

ext/spl/spl_directory.c

@@ -27,8 +27,7 @@
 #include "zend_exceptions.h"
 #include "zend_interfaces.h"
 
-#include "php_spl.h"
-#include "spl_functions.h"
+#include "spl_functions.h" /* For spl_gen_private_prop_name() */
 #include "spl_iterators.h"
 #include "spl_directory.h"
 #include "spl_directory_arginfo.h"

ext/spl/spl_directory.h

@@ -18,7 +18,6 @@
 #define SPL_DIRECTORY_H
 
 #include "php.h"
-#include "php_spl.h"
 
 extern PHPAPI zend_class_entry *spl_ce_SplFileInfo;
 extern PHPAPI zend_class_entry *spl_ce_DirectoryIterator;

ext/spl/spl_dllist.c

@@ -23,11 +23,9 @@
 #include "zend_exceptions.h"
 #include "zend_hash.h"
 
-#include "php_spl.h"
 #include "ext/standard/php_var.h"
 #include "zend_smart_str.h"
-#include "spl_functions.h"
-#include "spl_iterators.h"
+#include "spl_functions.h" /* For spl_gen_private_prop_name() */
 #include "spl_dllist.h"
 #include "spl_dllist_arginfo.h"
 #include "spl_exceptions.h"

ext/spl/spl_dllist.h

@@ -18,7 +18,6 @@
 #define SPL_DLLIST_H
 
 #include "php.h"
-#include "php_spl.h"
 
 #define SPL_DLLIST_IT_KEEP   0x00000000
 #define SPL_DLLIST_IT_FIFO   0x00000000 /* FIFO flag makes the iterator traverse the structure as a FirstInFirstOut */

ext/spl/spl_exceptions.c

@@ -23,7 +23,6 @@
 #include "zend_exceptions.h"
 #include "spl_exceptions_arginfo.h"
 
-#include "php_spl.h"
 #include "spl_exceptions.h"
 
 PHPAPI zend_class_entry *spl_ce_LogicException;

ext/spl/spl_exceptions.h

@@ -18,7 +18,6 @@
 #define SPL_EXCEPTIONS_H
 
 #include "php.h"
-#include "php_spl.h"
 
 extern PHPAPI zend_class_entry *spl_ce_LogicException;
 extern PHPAPI zend_class_entry *spl_ce_BadFunctionCallException;

ext/spl/spl_fixedarray.c

@@ -23,13 +23,10 @@
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 
-#include "php_spl.h"
 #include "spl_fixedarray_arginfo.h"
-#include "spl_functions.h"
 #include "spl_fixedarray.h"
 #include "spl_exceptions.h"
-#include "spl_iterators.h"
-#include "ext/json/php_json.h"
+#include "ext/json/php_json.h" /* For php_json_serializable_ce */
 
 static zend_object_handlers spl_handler_SplFixedArray;
 PHPAPI zend_class_entry *spl_ce_SplFixedArray;

ext/spl/spl_functions.c

@@ -19,7 +19,6 @@
 #endif
 
 #include "php.h"
-#include "php_spl.h"
 
 /* {{{ spl_add_class_name */
 void spl_add_class_name(zval *list, zend_class_entry *pce, int allow, int ce_flags)