diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 026f22843..0e21f4bd1 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -237,11 +237,6 @@ EOF;
                         if (!is_dir($dir)) {
                             continue;
                         }
-//                        $whitelist = sprintf(
-//                            '{%s/%s.+$}',
-//                            preg_quote($dir),
-//                            ($psrType === 'psr-0' && strpos($namespace, '_') === false) ? preg_quote(strtr($namespace, '\\', '/')) : ''
-//                        );
 
                         $namespaceFilter = $namespace === '' ? null : $namespace;
                         $classMap = $this->addClassMapCode($filesystem, $basePath, $vendorPath, $dir, $blacklist, $namespaceFilter, $classMap);
@@ -544,13 +539,6 @@ AUTOLOAD;
 
     protected function getAutoloadRealFile($useClassMap, $useIncludePath, $targetDirLoader, $useIncludeFiles, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)
     {
-        // TODO the class ComposerAutoloaderInit should be revert to a closure
-        // when APC has been fixed:
-        // - https://github.com/composer/composer/issues/959
-        // - https://bugs.php.net/bug.php?id=52144
-        // - https://bugs.php.net/bug.php?id=61576
-        // - https://bugs.php.net/bug.php?id=59298
-
         $file = <<<HEADER
 <?php
 
@@ -634,11 +622,11 @@ INCLUDEPATH;
         }
 
         if ($targetDirLoader) {
-            $file .= <<<REGISTER_AUTOLOAD
+            $file .= <<<REGISTER_TARGET_DIR_AUTOLOAD
         spl_autoload_register(array('ComposerAutoloaderInit$suffix', 'autoload'), true, true);
 
 
-REGISTER_AUTOLOAD;
+REGISTER_TARGET_DIR_AUTOLOAD;
         }
 
         $file .= <<<REGISTER_LOADER
@@ -666,7 +654,8 @@ METHOD_FOOTER;
 
         $file .= $targetDirLoader;
 
-        return $file . <<<FOOTER
+        if ($useIncludeFiles) {
+            return $file . <<<FOOTER
 }
 
 function composerRequire$suffix(\$fileIdentifier, \$file)
@@ -678,6 +667,13 @@ function composerRequire$suffix(\$fileIdentifier, \$file)
     }
 }
 
+FOOTER;
+
+        }
+
+        return $file . <<<FOOTER
+}
+
 FOOTER;
     }
 
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php
index 205cd7158..5ba75c7fa 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_functions_with_removed_include_paths_and_autolad_files.php
@@ -43,8 +43,3 @@ class ComposerAutoloaderInitFilesAutoload
         return $loader;
     }
 }
-
-function composerRequireFilesAutoload($file)
-{
-    require $file;
-}
diff --git a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
index e93179572..9450ffa6c 100644
--- a/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
+++ b/tests/Composer/Test/Autoload/Fixtures/autoload_real_include_path.php
@@ -64,16 +64,3 @@ class ComposerAutoloaderInitIncludePath
         }
     }
 }
-
-function composerRequireIncludePath($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['composerRequiredFiles'])) {
-        $GLOBALS['composerRequiredFiles'] = array();
-    }
-
-    if (empty($GLOBALS['composerRequiredFiles'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['composerRequiredFiles'][$fileIdentifier] = true;
-    }
-}