Restructure definitions to reduce header inclusions

Author: Girgias

ext/bcmath/bcmath.c

@@ -32,6 +32,9 @@
 ZEND_DECLARE_MODULE_GLOBALS(bcmath)
 static PHP_GINIT_FUNCTION(bcmath);
 static PHP_GSHUTDOWN_FUNCTION(bcmath);
+static PHP_MINIT_FUNCTION(bcmath);
+static PHP_MSHUTDOWN_FUNCTION(bcmath);
+static PHP_MINFO_FUNCTION(bcmath);
 
 zend_module_entry bcmath_module_entry = {
 	STANDARD_MODULE_HEADER,

ext/bcmath/libbcmath/src/bcmath.h

@@ -55,7 +55,6 @@ typedef struct bc_struct {
 
 #include <stdbool.h>
 #include "zend_string.h"
-#include "php.h" /* Needed for safe_pemalloc() in init.c */
 #include "../../php_bcmath.h" /* Needed for BCG() macro */
 
 /* The base used in storing the numbers in n_value above.

ext/bcmath/libbcmath/src/config.h

@@ -3,8 +3,3 @@
 #else
 #include <php_config.h>
 #endif
-
-#include "php.h"
-#include <string.h>
-#include "zend.h"
-#include "zend_alloc.h"

ext/bcmath/libbcmath/src/debug.c

@@ -29,11 +29,7 @@
 
 *************************************************************************/
 
-#include <config.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdarg.h>
 #include "bcmath.h"
 #include "private.h"
 

ext/bcmath/php_bcmath.h

@@ -18,17 +18,14 @@
 #define PHP_BCMATH_H
 
 #include "libbcmath/src/bcmath.h"
+#include "zend_API.h"
 
 extern zend_module_entry bcmath_module_entry;
 #define phpext_bcmath_ptr &bcmath_module_entry
 
 #include "php_version.h"
 #define PHP_BCMATH_VERSION PHP_VERSION
 
-PHP_MINIT_FUNCTION(bcmath);
-PHP_MSHUTDOWN_FUNCTION(bcmath);
-PHP_MINFO_FUNCTION(bcmath);
-
 ZEND_BEGIN_MODULE_GLOBALS(bcmath)
 	bc_num _zero_;
 	bc_num _one_;