diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 41147a19ec0..6b0a4c5693c 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -2687,7 +2687,7 @@ PHP_FUNCTION(fbsql_fetch_object)
 {
 	php_fbsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, FBSQL_ASSOC);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 4c2d2e8de1d..c253afdcaae 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -982,7 +982,7 @@ PHP_FUNCTION(msql_fetch_object)
 {
 	php_msql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index f20b5f94c0a..44fb7cd7249 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -1271,7 +1271,7 @@ PHP_FUNCTION(mssql_fetch_object)
 {
 	php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index eb3a96ebdd1..c859beaece5 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -1661,7 +1661,7 @@ PHP_FUNCTION(mysql_fetch_object)
 	php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 2);
 
 	if (Z_TYPE_P(return_value) == IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 36c950dfcd4..faa4f362efd 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1365,7 +1365,7 @@ PHP_FUNCTION(odbc_fetch_object)
 {
 	php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, ODBC_OBJECT);
 	if (Z_TYPE_P(return_value) == IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index bc0dca5aa14..fa96dd254cf 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -1288,7 +1288,7 @@ PHP_FUNCTION(pg_fetch_object)
 {
 	php_pgsql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index dbef99ecc11..8a13ebacaa4 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -116,7 +116,7 @@ static void php_browscap_parser_cb(zval *arg1, zval *arg2, int callback_type, vo
 				INIT_PZVAL(processed);
 
 				/* OBJECTS_FIXME */
-				Z_OBJCE_P(current_section) = &zend_standard_class_def;
+				Z_OBJCE_P(current_section) = ZEND_STANDARD_CLASS_DEF_PTR;
 				Z_OBJPROP_P(current_section) = (HashTable *) malloc(sizeof(HashTable));
 				Z_TYPE_P(current_section) = IS_OBJECT;
 				zend_hash_init(Z_OBJPROP_P(current_section), 0, NULL, (dtor_func_t) browscap_entry_dtor, 1);
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 68ae3938d0e..7518f8c3037 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -458,7 +458,7 @@ yy27:
 	INIT_PZVAL(*rval);
 	
 	return object_common2(UNSERIALIZE_PASSTHRU,
-			object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));
+			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
 yy28:	yych = *++YYCURSOR;
 	if(yych <= ','){
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 8820baa1137..24f587ac79c 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -323,7 +323,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 	INIT_PZVAL(*rval);
 	
 	return object_common2(UNSERIALIZE_PASSTHRU,
-			object_common1(UNSERIALIZE_PASSTHRU, &zend_standard_class_def));
+			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
 
 "O:" iv ":" ["]	{
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 182351572b5..93ab6e3dffb 100644
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -1074,7 +1074,7 @@ PHP_FUNCTION(sybase_fetch_object)
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
 		Z_TYPE_P(return_value)=IS_OBJECT;
 		Z_OBJPROP_P(return_value) = Z_ARRVAL_P(return_value);
-		Z_OBJCE_P(return_value) = &zend_standard_class_def;
+		Z_OBJCE_P(return_value) = ZEND_STANDARD_CLASS_DEF_PTR;
 	}
 }
 /* }}} */
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 8c1ad93ac33..75f5d3f28f3 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -1411,7 +1411,7 @@ PHP_FUNCTION(sybase_fetch_object)
 {
 	php_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 	if (Z_TYPE_P(return_value)==IS_ARRAY) {
-		object_and_properties_init(return_value, &zend_standard_class_def, Z_ARRVAL_P(return_value));
+		object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
 	}
 }
 /* }}} */