diff --git a/include/php_driver.h b/include/php_driver.h index 9d6823225..d9bd236cb 100644 --- a/include/php_driver.h +++ b/include/php_driver.h @@ -50,14 +50,6 @@ extern "C" #endif -#include -#include - -#include "api.h" -#include "DateTime/Date.h" -#include "RetryPolicy/RetryPolicy.h" -#include "SSLOptions/SSLOptions.h" - #define PHP_DRIVER_NAMESPACE "Cassandra" #define PHP_DRIVER_NAMESPACE_ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) \ diff --git a/src/DateTime/Duration.cpp b/src/DateTime/Duration.cpp index ae8c98107..a8aa808c5 100644 --- a/src/DateTime/Duration.cpp +++ b/src/DateTime/Duration.cpp @@ -7,6 +7,7 @@ #include BEGIN_EXTERN_C() +#include zend_class_entry *php_driver_duration_ce = nullptr; diff --git a/src/Exception/DomainException.cpp b/src/Exception/DomainException.cpp index b9667ab98..6b2d3bfa0 100644 --- a/src/Exception/DomainException.cpp +++ b/src/Exception/DomainException.cpp @@ -14,10 +14,12 @@ * limitations under the License. */ + #include "php_driver.h" #include "php_driver_types.h" BEGIN_EXTERN_C() +#include zend_class_entry *php_driver_domain_exception_ce = NULL; diff --git a/src/Exception/InvalidArgumentException.cpp b/src/Exception/InvalidArgumentException.cpp index e26029c7a..d0bb0f0b1 100644 --- a/src/Exception/InvalidArgumentException.cpp +++ b/src/Exception/InvalidArgumentException.cpp @@ -14,9 +14,11 @@ * limitations under the License. */ + #include "php_driver.h" #include "php_driver_types.h" BEGIN_EXTERN_C() +#include zend_class_entry *php_driver_invalid_argument_exception_ce = NULL; diff --git a/src/Exception/LogicException.cpp b/src/Exception/LogicException.cpp index 32e36d794..b4fda8100 100644 --- a/src/Exception/LogicException.cpp +++ b/src/Exception/LogicException.cpp @@ -14,9 +14,12 @@ * limitations under the License. */ + #include "php_driver.h" #include "php_driver_types.h" BEGIN_EXTERN_C() +#include + zend_class_entry *php_driver_logic_exception_ce = NULL; static zend_function_entry LogicException_methods[] = { diff --git a/src/Exception/RuntimeException.cpp b/src/Exception/RuntimeException.cpp index 172f14bad..e3832665a 100644 --- a/src/Exception/RuntimeException.cpp +++ b/src/Exception/RuntimeException.cpp @@ -14,9 +14,13 @@ * limitations under the License. */ + #include "php_driver.h" #include "php_driver_types.h" BEGIN_EXTERN_C() +#include + + zend_class_entry *php_driver_runtime_exception_ce = NULL; static zend_function_entry RuntimeException_methods[] = {