Index: trunk/utils.c
===================================================================
--- trunk/utils.c	(revision 954)
+++ trunk/utils.c	(revision 961)
@@ -585,8 +585,6 @@
 	ZEND_24(NOTHING, const) char *filename;
 
-#ifndef ZEND_ENGINE_2_2
 	HashTable orig_included_files;
 	HashTable *tmp_included_files;
-#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -774,7 +772,5 @@
 	memset(sandbox, 0, sizeof(sandbox[0]));
 
-#ifndef ZEND_ENGINE_2_2
 	memcpy(&OG(included_files), &EG(included_files), sizeof(EG(included_files)));
-#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -795,11 +791,7 @@
 #endif
 
-#ifndef ZEND_ENGINE_2_2
 	TG(included_files) = &EG(included_files);
-#endif
-
-#ifndef ZEND_ENGINE_2_2
+
 	zend_hash_init_ex(TG(included_files), 5, NULL, NULL, 0, 1);
-#endif
 #ifdef HAVE_XCACHE_CONSTANT
 	h = OG(zend_constants);
@@ -934,8 +926,7 @@
 #endif
 
-#ifndef ZEND_ENGINE_2_2
 	i = 1;
+	/* still needed because in zend_language_scanner.l, require()/include() check file_handle.handle.stream.handle */
 	zend_hash_add(&OG(included_files), sandbox->filename, strlen(sandbox->filename) + 1, (void *)&i, sizeof(int), NULL);
-#endif
 }
 /* }}} */
@@ -988,12 +979,8 @@
 	zend_hash_destroy(&TG(auto_globals));
 #endif
-#ifndef ZEND_ENGINE_2_2
 	zend_hash_destroy(TG(included_files));
-#endif
-
-#ifndef ZEND_ENGINE_2_2
+
 	/* restore orig here, as EG/CG holded tmp before */
 	memcpy(&EG(included_files), &OG(included_files), sizeof(EG(included_files)));
-#endif
 
 #ifdef XCACHE_ERROR_CACHING