diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 6b280d02a9a..cd3e9b92127 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -627,7 +627,7 @@ skip:
 PHP_FUNCTION(spl_autoload_unregister)
 {
 	char *func_name, *error = NULL;
-	int func_name_len;
+	zend_str_size_int func_name_len;
 	char *lc_name = NULL;
 	zval *zcallable;
 	int success = FAILURE;
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 3556a39f58a..890bc7e4755 100644
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -183,7 +183,7 @@ static zend_object_value spl_filesystem_object_new_check(zend_class_entry *class
 /* }}} */
 
 
-PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, int *len TSRMLS_DC) /* {{{ */
+PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, zend_str_size_int *len TSRMLS_DC) /* {{{ */
 {
 #ifdef HAVE_GLOB
 	if (intern->type == SPL_FS_DIR) {
@@ -589,7 +589,7 @@ static HashTable* spl_filesystem_object_get_debug_info(zval *obj, int *is_temp T
 	HashTable *rv;
 	zval *tmp, zrv;
 	char *pnstr, *path;
-	int  pnlen, path_len;
+	zend_str_size_int  pnlen, path_len;
 	char stmp[2];
 
 	*is_temp = 1;
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
index d5a9f83ae14..0e0e990e0c1 100644
--- a/ext/spl/spl_dllist.c
+++ b/ext/spl/spl_dllist.c
@@ -511,7 +511,7 @@ static HashTable* spl_dllist_object_get_debug_info(zval *obj, int *is_temp TSRML
 	spl_ptr_llist_element *current = intern->llist->head, *next;
 	zval *tmp, zrv, *dllist_array;
 	char *pnstr;
-	int  pnlen;
+	zend_str_size_int pnlen;
 	int  i = 0;
 
 	*is_temp = 0;
diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c
index 7f17d5ef239..93ed1b34e26 100644
--- a/ext/spl/spl_functions.c
+++ b/ext/spl/spl_functions.c
@@ -133,7 +133,7 @@ int spl_add_classes(zend_class_entry *pce, zval *list, int sub, int allow, int c
 }
 /* }}} */
 
-char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, int prop_len, int *name_len TSRMLS_DC) /* {{{ */
+char * spl_gen_private_prop_name(zend_class_entry *ce, char *prop_name, zend_str_size_int prop_len, zend_str_size_int *name_len TSRMLS_DC) /* {{{ */
 {
 	char *rv;
 
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
index 77b31c06dcd..6572643cd6d 100644
--- a/ext/spl/spl_heap.c
+++ b/ext/spl/spl_heap.c
@@ -523,7 +523,7 @@ static HashTable* spl_heap_object_get_debug_info_helper(zend_class_entry *ce, zv
 	spl_heap_object *intern  = (spl_heap_object*)zend_object_store_get_object(obj TSRMLS_CC);
 	zval *tmp, zrv, *heap_array;
 	char *pnstr;
-	int  pnlen;
+	zend_str_size_int pnlen;
 	int  i;
 
 	*is_temp = 0;
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index c0c37c25cc5..67db7015bbb 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -318,7 +318,7 @@ static HashTable* spl_object_storage_debug_info(zval *obj, int *is_temp TSRMLS_D
 	HashPosition pos;
 	zval *tmp, *storage;
 	char md5str[33];
-	int name_len;
+	zend_str_size_int name_len;
 	char *zname;
 
 	*is_temp = 0;