2 files changed, 9 insertions, 10 deletions

diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index a4a0ed4..95caa65 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -11,6 +11,12 @@
 #include "config.h"
 #endif
 
+#ifdef PHP_WIN32
+#include "win32/glob.h"
+#else
+#include <glob.h>
+#endif
+
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
@@ -41,6 +47,7 @@
 #include "zend_extensions.h"
 #include "zend_hash.h"
 #include "zend_string.h"
+#include "zend_smart_str.h"
 #include "zend_types.h"
 #include "zend_vm.h"
 
@@ -150,9 +157,9 @@ HashTable *sp_internal_functions_hook;
 HashTable *sp_eval_blacklist_functions_hook;
 
 #if PHP_VERSION_ID >= 80000
-zend_string* eval_source_string;
+const zend_string* eval_source_string;
 #else
-zval* eval_source_string;
+const zval* eval_source_string;
 #endif
 
 ZEND_END_MODULE_GLOBALS(snuffleupagus)
diff --git a/src/snuffleupagus.c b/src/snuffleupagus.c
index 06b93e1..4c9e904 100644
--- a/src/snuffleupagus.c
+++ b/src/snuffleupagus.c
@@ -1,11 +1,3 @@
-#ifdef PHP_WIN32
-#include "win32/glob.h"
-#else
-#include <glob.h>
-#endif
-
-#include "zend_smart_str.h"
-
 #include "php_snuffleupagus.h"
 
 #ifndef ZEND_EXT_API