diff --git a/composer.json b/composer.json
index c75586ee10..0cace89979 100644
--- a/composer.json
+++ b/composer.json
@@ -4,6 +4,9 @@
         "optimize-autoloader": true
     },
     "autoload" : {
+        "psr-0": {
+            "": "lib/private/legacy"
+        },
         "psr-4": {
             "OC\\": "lib/private",
             "OC\\Core\\": "core/",
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 5f26f0c356..d1ce7c3f10 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1193,4 +1193,20 @@ return array(
     'OC\\User\\NoUserException' => $baseDir . '/lib/private/User/NoUserException.php',
     'OC\\User\\Session' => $baseDir . '/lib/private/User/Session.php',
     'OC\\User\\User' => $baseDir . '/lib/private/User/User.php',
+    'OC_API' => $baseDir . '/lib/private/legacy/api.php',
+    'OC_App' => $baseDir . '/lib/private/legacy/app.php',
+    'OC_DB' => $baseDir . '/lib/private/legacy/db.php',
+    'OC_DB_StatementWrapper' => $baseDir . '/lib/private/legacy/db/statementwrapper.php',
+    'OC_Defaults' => $baseDir . '/lib/private/legacy/defaults.php',
+    'OC_EventSource' => $baseDir . '/lib/private/legacy/eventsource.php',
+    'OC_FileChunking' => $baseDir . '/lib/private/legacy/filechunking.php',
+    'OC_Files' => $baseDir . '/lib/private/legacy/files.php',
+    'OC_Helper' => $baseDir . '/lib/private/legacy/helper.php',
+    'OC_Hook' => $baseDir . '/lib/private/legacy/hook.php',
+    'OC_Image' => $baseDir . '/lib/private/legacy/image.php',
+    'OC_JSON' => $baseDir . '/lib/private/legacy/json.php',
+    'OC_Response' => $baseDir . '/lib/private/legacy/response.php',
+    'OC_Template' => $baseDir . '/lib/private/legacy/template.php',
+    'OC_User' => $baseDir . '/lib/private/legacy/user.php',
+    'OC_Util' => $baseDir . '/lib/private/legacy/util.php',
 );
diff --git a/lib/composer/composer/autoload_namespaces.php b/lib/composer/composer/autoload_namespaces.php
index 4a9c20beed..ca3a13a84f 100644
--- a/lib/composer/composer/autoload_namespaces.php
+++ b/lib/composer/composer/autoload_namespaces.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname(dirname($vendorDir));
 
 return array(
+    '' => array($baseDir . '/lib/private/legacy'),
 );
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2c01484d66..c217aba162 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -35,6 +35,10 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         ),
     );
 
+    public static $fallbackDirsPsr0 = array (
+        0 => __DIR__ . '/../../..' . '/lib/private/legacy',
+    );
+
     public static $classMap = array (
         'OCP\\API' => __DIR__ . '/../../..' . '/lib/public/API.php',
         'OCP\\Accounts\\IAccount' => __DIR__ . '/../../..' . '/lib/public/Accounts/IAccount.php',
@@ -1223,6 +1227,22 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\User\\NoUserException' => __DIR__ . '/../../..' . '/lib/private/User/NoUserException.php',
         'OC\\User\\Session' => __DIR__ . '/../../..' . '/lib/private/User/Session.php',
         'OC\\User\\User' => __DIR__ . '/../../..' . '/lib/private/User/User.php',
+        'OC_API' => __DIR__ . '/../../..' . '/lib/private/legacy/api.php',
+        'OC_App' => __DIR__ . '/../../..' . '/lib/private/legacy/app.php',
+        'OC_DB' => __DIR__ . '/../../..' . '/lib/private/legacy/db.php',
+        'OC_DB_StatementWrapper' => __DIR__ . '/../../..' . '/lib/private/legacy/db/statementwrapper.php',
+        'OC_Defaults' => __DIR__ . '/../../..' . '/lib/private/legacy/defaults.php',
+        'OC_EventSource' => __DIR__ . '/../../..' . '/lib/private/legacy/eventsource.php',
+        'OC_FileChunking' => __DIR__ . '/../../..' . '/lib/private/legacy/filechunking.php',
+        'OC_Files' => __DIR__ . '/../../..' . '/lib/private/legacy/files.php',
+        'OC_Helper' => __DIR__ . '/../../..' . '/lib/private/legacy/helper.php',
+        'OC_Hook' => __DIR__ . '/../../..' . '/lib/private/legacy/hook.php',
+        'OC_Image' => __DIR__ . '/../../..' . '/lib/private/legacy/image.php',
+        'OC_JSON' => __DIR__ . '/../../..' . '/lib/private/legacy/json.php',
+        'OC_Response' => __DIR__ . '/../../..' . '/lib/private/legacy/response.php',
+        'OC_Template' => __DIR__ . '/../../..' . '/lib/private/legacy/template.php',
+        'OC_User' => __DIR__ . '/../../..' . '/lib/private/legacy/user.php',
+        'OC_Util' => __DIR__ . '/../../..' . '/lib/private/legacy/util.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
@@ -1230,6 +1250,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$prefixDirsPsr4;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$fallbackDirsPsr0;
             $loader->classMap = ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c::$classMap;
 
         }, null, ClassLoader::class);