diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index fc57a74204..e8a7b4963f 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -49,7 +49,7 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
 
 chdir($directory);
 
-require_once "boot.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $a = new App(dirname(__DIR__));
 
diff --git a/bin/console.php b/bin/console.php
index 9c25279d37..c39df953f2 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-include_once dirname(__DIR__) . '/boot.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $a = new Friendica\App(dirname(__DIR__));
 \Friendica\BaseObject::setApp($a);
diff --git a/bin/daemon.php b/bin/daemon.php
index de76c99efd..e60e32b19e 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -30,7 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 	chdir($directory);
 }
 
-require_once "boot.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $a = new App(dirname(__DIR__));
 
diff --git a/bin/worker.php b/bin/worker.php
index 9ae2f68b3e..78b6da5857 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -26,7 +26,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 	chdir($directory);
 }
 
-require_once "boot.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 $a = new App(dirname(__DIR__));
 
diff --git a/boot.php b/boot.php
index d44cf24bee..eb8176b83d 100644
--- a/boot.php
+++ b/boot.php
@@ -17,8 +17,6 @@
  * easily as email does today.
  */
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
diff --git a/index.php b/index.php
index 43bfd3800e..a7f5e709c7 100644
--- a/index.php
+++ b/index.php
@@ -4,12 +4,10 @@
  * Friendica
  */
 
-use Friendica\App;
-
-require_once 'boot.php';
+require dirname(__DIR__) . '/vendor/autoload.php';
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in App
-$a = new App(__DIR__, false);
+$a = new Friendica\App(__DIR__, false);
 
 $a->runFrontend();