diff --git a/includes/FontRepoCompiler.php b/includes/FontRepoCompiler.php
index f7b7e678..01a80107 100644
--- a/includes/FontRepoCompiler.php
+++ b/includes/FontRepoCompiler.php
@@ -2,7 +2,7 @@
 
 namespace UniversalLanguageSelector;
 
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 
 /**
  * This class parses font specification ini files to a central list.
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 6ca033e3..b5dd69df 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -20,27 +20,27 @@
 
 namespace UniversalLanguageSelector;
 
-use Config;
 use ExtensionRegistry;
 use IBufferingStatsdDataFactory;
 use IContextSource;
 use LanguageCode;
 use MediaWiki\Babel\Babel;
+use MediaWiki\Config\Config;
 use MediaWiki\Extension\BetaFeatures\BetaFeatures;
 use MediaWiki\Hook\BeforePageDisplayHook;
 use MediaWiki\Hook\MakeGlobalVariablesScriptHook;
 use MediaWiki\Hook\UserGetLanguageObjectHook;
 use MediaWiki\Html\Html;
 use MediaWiki\Languages\LanguageNameUtils;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\Preferences\Hook\GetPreferencesHook;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
 use MediaWiki\Skins\Hook\SkinAfterPortletHook;
+use MediaWiki\User\User;
 use MediaWiki\User\UserOptionsLookup;
-use OutputPage;
 use RequestContext;
 use Skin;
 use SkinTemplate;
-use User;
 
 /**
  * @phpcs:disable MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName