diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
index 81a2c38849bf617e19d5c7c42a900bd4e7c13c98..3ed64adb69f78a08c8c2498563153f9a6998fec3 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php
@@ -144,9 +144,4 @@ abstract class t3lib_cache_backend_AbstractBackend implements t3lib_cache_backen
 		return $expiryTime;
 	}
 }
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_abstractbackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
index 85e0636433dce8ef316e15aa24e775be2e60e47f..8dad52e4e44e829e525f82191ec651406f748188 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * A caching backend which stores cache entries by using APC.
  *
@@ -315,10 +314,4 @@ class t3lib_cache_backend_ApcBackend extends t3lib_cache_backend_AbstractBackend
 
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_apcbackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
index 1ce23f404ec257f3cf61ea69cecc550ef3a010ca..4ecc475383f4c14f9e78b2791cf4e36c1bd4a94f 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php
@@ -519,10 +519,4 @@ class t3lib_cache_backend_DbBackend extends t3lib_cache_backend_AbstractBackend
 		}
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_dbbackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
index 6585912ab2c9ae9189e8fd809aa793259d59579d..3d402122e83f05688b20aed9dd9bf7e252d5a34f 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php
@@ -526,10 +526,4 @@ class t3lib_cache_backend_FileBackend extends t3lib_cache_backend_AbstractBacken
 		return ($this->isCacheFileExpired($pathAndFilename)) ? FALSE : require_once($pathAndFilename);
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_filebackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
index d947db141bc6fe4f90ee01ab5eebb8ac00e22a12..1e1376d45cd06c2ca813a1cb6eb61cafcb685e61 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php
@@ -470,10 +470,4 @@ class t3lib_cache_backend_MemcachedBackend extends t3lib_cache_backend_AbstractB
 	public function collectGarbage() {
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_memcachedbackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
index d9ef5795eec7f0a1b59ef94ba0170b4eb1416642..bf57be70e9701a1c7da9f3c281e95288a7aea161 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php
@@ -127,10 +127,4 @@ class t3lib_cache_backend_NullBackend extends t3lib_cache_backend_AbstractBacken
 	public function collectGarbage() {
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_nullbackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
index 2d2fcbe0b07d0ee8d801641c68541019a413edd6..fccf8345aff5c434f0ddcf86df62f948ba0598ad 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php
@@ -371,8 +371,4 @@ class t3lib_cache_backend_PdoBackend extends t3lib_cache_backend_AbstractBackend
 		}
 	}
 }
-
-if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php']) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_pdobackend.php']);
-}
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
index fbd6f6db4a8859dfb2c3f4ce050abdbf7a2c013d..487f179379d9a76377f160075a60bdcda666467d 100644
--- a/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
+++ b/t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php
@@ -169,9 +169,4 @@ class t3lib_cache_backend_TransientMemoryBackend extends t3lib_cache_backend_Abs
 	public function collectGarbage() {
 	}
 }
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/backend/class.t3lib_cache_backend_transientmemorybackend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
index 8e66bafbd4040e31f9c6c8f087d0d946e29864cc..dca824aeba50dfa28ae63951c5f236e68ad7ab10 100644
--- a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
+++ b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_backend.php
@@ -122,6 +122,5 @@ interface t3lib_cache_backend_Backend {
 	 * @api
 	 */
 	public function collectGarbage();
-
 }
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
index 1c7cd2c60499cff1af26dd3203dbac7bf536d1e7..e591af2f582fc01c9f97892d162219c901b66d08 100644
--- a/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
+++ b/t3lib/cache/backend/interfaces/interface.t3lib_cache_backend_phpcapablebackend.php
@@ -42,6 +42,5 @@ interface t3lib_cache_backend_PhpCapableBackend extends t3lib_cache_backend_Back
 	 * @api
 	 */
 	public function requireOnce($entryIdentifier);
-
 }
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_exception.php b/t3lib/cache/class.t3lib_cache_exception.php
index 9ca84c40b9e570e474a2a6bc72c8fb1ecda77971..2bdc9624cf7c3796301f06d6a435fa4ee2387118 100644
--- a/t3lib/cache/class.t3lib_cache_exception.php
+++ b/t3lib/cache/class.t3lib_cache_exception.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * A generic Cache exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_Exception extends Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_exception.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_exception.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_factory.php b/t3lib/cache/class.t3lib_cache_factory.php
index 775ae8b8080f492f69de555336b7c6f8ef9859b4..e6bcbbbd336cc543c1e30ce997c6fdabc2c9700c 100644
--- a/t3lib/cache/class.t3lib_cache_factory.php
+++ b/t3lib/cache/class.t3lib_cache_factory.php
@@ -106,12 +106,5 @@ class t3lib_cache_Factory implements t3lib_Singleton {
 		$this->cacheManager->registerCache($cache);
 		return $cache;
 	}
-
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_factory.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_factory.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/class.t3lib_cache_manager.php b/t3lib/cache/class.t3lib_cache_manager.php
index 0d6503adaaca56a647defc1e198ba0786c0e19d8..fa372f9815ec217ebf460402069002d70ba721fa 100644
--- a/t3lib/cache/class.t3lib_cache_manager.php
+++ b/t3lib/cache/class.t3lib_cache_manager.php
@@ -276,10 +276,4 @@ class t3lib_cache_Manager implements t3lib_Singleton {
 		$this->cacheFactory->create($identifier, $frontend, $backend, $backendOptions);
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_manager.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_manager.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php b/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
index f47e2089bfc377ea7185f3870cb5c00e9f36776a..f13fdcc78713d13a818ce0aa9cfd930e4636eee1 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * A "Class Already Loaded" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_ClassAlreadyLoaded extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_classalreadyloaded.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php b/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
index 33d88aa97f5ea46308d447ab29bcce8e695e7268..2e31b95ae25e9656993076ebc43cc6911baa6b8c 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * A "Duplicate Identifier" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_DuplicateIdentifier extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_duplicateidentifier.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php b/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
index e515ebad5c3b9164f0966b54fefeeb710adb040c..9154ee03aaf335b0f374da776cc96b02c2dd3032 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * An "Invalid Backend" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_InvalidBackend extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidbackend.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php b/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
index c32a89db3331adb1435fe10cbbd590602f83427f..76f3c2090835e171b61d19c8eb3bd522bd7c535f 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * An "Invalid Cache" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_InvalidCache extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invalidcache.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php b/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
index ce3f7eade4abbed49557234da8731cdab268b299..0ae12ae8d6a3c76b95606503cbae02236b27e179 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * An "Invalid Data" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_InvalidData extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_invaliddata.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php b/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
index b4683f99254e086895092a02a476a60dcda6ffb3..63fcc787575bda164b484038b5f8c09fed4a9aff 100644
--- a/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
+++ b/t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php
@@ -22,7 +22,6 @@
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-
 /**
  * A "No Such Cache" exception
  *
@@ -33,12 +32,5 @@
  * @api
  */
 class t3lib_cache_exception_NoSuchCache extends t3lib_cache_Exception {
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/exception/class.t3lib_cache_exception_nosuchcache.php']);
 }
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
index 72c1fe0e95ee163aa5f2e6dbfd078a5fa8d1f271..a1a1952e5cd57f062f4bbd0031c2454de06b8975 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php
@@ -221,12 +221,5 @@ abstract class t3lib_cache_frontend_AbstractFrontend implements t3lib_cache_fron
 	public function isValidTag($tag) {
 		return preg_match(self::PATTERN_TAG, $tag) === 1;
 	}
-
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/frontend/class.t3lib_cache_frontend_abstractfrontend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
index e25f012072245b3269b5ae741498b04facb37db0..c90ebac69bae82e31dd22211c8723d5da5abb1d4 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_phpfrontend.php
@@ -33,6 +33,7 @@
  * @scope prototype
  */
 class t3lib_cache_frontend_PhpFrontend extends t3lib_cache_frontend_StringFrontend {
+
 	/**
 	 * Constructs the cache
 	 *
@@ -94,9 +95,4 @@ class t3lib_cache_frontend_PhpFrontend extends t3lib_cache_frontend_StringFronte
 		return $this->backend->requireOnce($entryIdentifier);
 	}
 }
-
-if (defined('TYPO3_MODE') && $GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_frontend_phpfrontend.php']) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_frontend_phpfrontend.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
index 55d1a03090bcd2bde95f06e7903d42a4af596ecd..b1590170439f557853179a1191aa79ddd235ca50 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_stringfrontend.php
@@ -118,12 +118,5 @@ class t3lib_cache_frontend_StringFrontend extends t3lib_cache_frontend_AbstractF
 		}
 		return $entries;
 	}
-
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_stringcache.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_stringcache.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php b/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
index e667bd8f1e626cd733a519e9f4aceadb3241dcbd..28e30ca0ef8b3d913236e72c188a0a02f8f1067f 100644
--- a/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
+++ b/t3lib/cache/frontend/class.t3lib_cache_frontend_variablefrontend.php
@@ -142,12 +142,5 @@ class t3lib_cache_frontend_VariableFrontend extends t3lib_cache_frontend_Abstrac
 		}
 		return $entries;
 	}
-
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_variablecache.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/cache/class.t3lib_cache_variablecache.php']);
-}
-
 ?>
\ No newline at end of file
diff --git a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
index a247ff4ec886d5fa78baf429959ef533544d8622..f7771c455927c73596d8404be2cbea56583af390 100644
--- a/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
+++ b/t3lib/cache/frontend/interfaces/interface.t3lib_cache_frontend_frontend.php
@@ -122,7 +122,7 @@ interface t3lib_cache_frontend_Frontend {
 	 *
 	 * @return void
 	 */
-	function flush();
+	public function flush();
 
 	/**
 	 * Removes all cache entries of this cache which are tagged by the specified tag.
@@ -158,8 +158,5 @@ interface t3lib_cache_frontend_Frontend {
 	 * @api
 	 */
 	public function isValidTag($tag);
-
 }
-
-
 ?>
\ No newline at end of file
diff --git a/t3lib/class.t3lib_cache.php b/t3lib/class.t3lib_cache.php
index fa062d45897a07990737b216edacdaf4d12f368a..1d1ab021deb1021c601311d11946811cb8de41bb 100644
--- a/t3lib/class.t3lib_cache.php
+++ b/t3lib/class.t3lib_cache.php
@@ -113,10 +113,4 @@ class t3lib_cache {
 		t3lib_div::logDeprecatedFunction();
 	}
 }
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php'])) {
-	include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_cache.php']);
-}
-
 ?>
\ No newline at end of file