diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index 475e3e10c..0f1e7a742 100644
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -4,12 +4,12 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\Console;
 use Friendica\App;
+use Friendica\App\BaseURL;
 use Friendica\Core\Config;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Util\BasePath;
-use Friendica\Util\BaseURL;
 use Friendica\Util\ConfigFileLoader;
 use RuntimeException;
 
diff --git a/src/Core/Authentication.php b/src/Core/Authentication.php
index d68a3e683..59061c04c 100644
--- a/src/Core/Authentication.php
+++ b/src/Core/Authentication.php
@@ -8,7 +8,6 @@ namespace Friendica\Core;
 use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Network\HTTPException\ForbiddenException;
-use Friendica\Util\BaseURL;
 
 /**
 * Handle Authentification, Session and Cookies
diff --git a/src/Factory/CacheFactory.php b/src/Factory/CacheFactory.php
index 7b30c553e..39b0b94ff 100644
--- a/src/Factory/CacheFactory.php
+++ b/src/Factory/CacheFactory.php
@@ -2,11 +2,11 @@
 
 namespace Friendica\Factory;
 
+use Friendica\App\BaseURL;
 use Friendica\Core\Cache;
 use Friendica\Core\Cache\ICache;
 use Friendica\Core\Config\Configuration;
 use Friendica\Database\Database;
-use Friendica\Util\BaseURL;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;