Zend/zend_builtin_functions: include cleanup

Author: MaxKellermann

Zend/zend_builtin_functions.c

@@ -17,20 +17,17 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_API.h"
-#include "zend_attributes.h"
-#include "zend_gc.h"
 #include "zend_builtin_functions.h"
+#include "zend_API.h" // for ZEND_MINIT_FUNCTION
+#include "zend_attributes.h" // for zend_add_class_attribute()
+#include "zend_closures.h" // for zend_ce_closure
 #include "zend_constants.h"
-#include "zend_ini.h"
-#include "zend_interfaces.h"
-#include "zend_exceptions.h"
+#include "zend_exceptions.h" // for zend_register_default_classes()
 #include "zend_extensions.h"
-#include "zend_closures.h"
 #include "zend_generators.h"
+#include "zend_ini.h"
+#include "zend_interfaces.h" // for zend_call_method_with_1_params()
 #include "zend_builtin_functions_arginfo.h"
-#include "zend_smart_str.h"
 
 /* }}} */
 

Zend/zend_builtin_functions.h

@@ -20,8 +20,11 @@
 #ifndef ZEND_BUILTIN_FUNCTIONS_H
 #define ZEND_BUILTIN_FUNCTIONS_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
 #include "zend_result.h"
 
+typedef struct _zval_struct zval;
+
 zend_result zend_startup_builtin_functions(void);
 
 BEGIN_EXTERN_C()