diff --git a/ServiceWiring.php b/ServiceWiring.php
index db92d876..b0c42b93 100644
--- a/ServiceWiring.php
+++ b/ServiceWiring.php
@@ -4,6 +4,8 @@ use MediaWiki\Extension\OATHAuth\OATHAuthModuleRegistry;
 use MediaWiki\Extension\OATHAuth\OATHUserRepository;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Registration\ExtensionRegistry;
+use Wikimedia\ObjectCache\HashBagOStuff;
 
 return [
 	'OATHAuthModuleRegistry' => static function ( MediaWikiServices $services ): OATHAuthModuleRegistry {
diff --git a/maintenance/UpdateForMultipleDevicesSupport.php b/maintenance/UpdateForMultipleDevicesSupport.php
index 3af674f5..df45428e 100644
--- a/maintenance/UpdateForMultipleDevicesSupport.php
+++ b/maintenance/UpdateForMultipleDevicesSupport.php
@@ -20,9 +20,9 @@
 
 namespace MediaWiki\Extension\OATHAuth\Maintenance;
 
-use LoggedUpdateMaintenance;
 use MediaWiki\Extension\OATHAuth\OATHAuthServices;
 use MediaWiki\Json\FormatJson;
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 use MediaWiki\MediaWikiServices;
 
 if ( getenv( 'MW_INSTALL_PATH' ) ) {
diff --git a/maintenance/UpdateTOTPScratchTokensToArray.php b/maintenance/UpdateTOTPScratchTokensToArray.php
index 8dc1da96..f6b7797b 100644
--- a/maintenance/UpdateTOTPScratchTokensToArray.php
+++ b/maintenance/UpdateTOTPScratchTokensToArray.php
@@ -25,8 +25,8 @@
 
 namespace MediaWiki\Extension\OATHAuth\Maintenance;
 
-use LoggedUpdateMaintenance;
 use MediaWiki\Json\FormatJson;
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 use MediaWiki\MediaWikiServices;
 
 if ( getenv( 'MW_INSTALL_PATH' ) ) {
diff --git a/maintenance/disableOATHAuthForUser.php b/maintenance/disableOATHAuthForUser.php
index 3c36d4ee..551675fb 100644
--- a/maintenance/disableOATHAuthForUser.php
+++ b/maintenance/disableOATHAuthForUser.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Extension\OATHAuth\OATHAuthServices;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Session\SessionManager;
 
diff --git a/src/Api/Module/ApiOATHValidate.php b/src/Api/Module/ApiOATHValidate.php
index 1d4b83c6..627fa7ce 100644
--- a/src/Api/Module/ApiOATHValidate.php
+++ b/src/Api/Module/ApiOATHValidate.php
@@ -18,8 +18,8 @@
 
 namespace MediaWiki\Extension\OATHAuth\Api\Module;
 
-use ApiBase;
-use ApiResult;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Extension\OATHAuth\IModule;
 use MediaWiki\Json\FormatJson;
 use MediaWiki\Logger\LoggerFactory;
diff --git a/src/Api/Module/ApiQueryOATH.php b/src/Api/Module/ApiQueryOATH.php
index 39de74a5..286c9e2e 100644
--- a/src/Api/Module/ApiQueryOATH.php
+++ b/src/Api/Module/ApiQueryOATH.php
@@ -18,10 +18,10 @@
 
 namespace MediaWiki\Extension\OATHAuth\Api\Module;
 
-use ApiQuery;
-use ApiQueryBase;
-use ApiResult;
 use ManualLogEntry;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiQueryBase;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Extension\OATHAuth\OATHUserRepository;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\ParamValidator\ParamValidator;
diff --git a/src/Key/TOTPKey.php b/src/Key/TOTPKey.php
index eff8dad6..93c52aba 100644
--- a/src/Key/TOTPKey.php
+++ b/src/Key/TOTPKey.php
@@ -21,7 +21,6 @@ namespace MediaWiki\Extension\OATHAuth\Key;
 
 use Base32\Base32;
 use DomainException;
-use EmptyBagOStuff;
 use Exception;
 use jakobo\HOTP\HOTP;
 use MediaWiki\Extension\OATHAuth\IAuthKey;
@@ -31,6 +30,7 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MWException;
 use Psr\Log\LoggerInterface;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 
 /**
  * Class representing a two-factor key
diff --git a/src/Notifications/Manager.php b/src/Notifications/Manager.php
index 6f488e5f..2da4925e 100644
--- a/src/Notifications/Manager.php
+++ b/src/Notifications/Manager.php
@@ -20,9 +20,9 @@
 
 namespace MediaWiki\Extension\OATHAuth\Notifications;
 
-use ExtensionRegistry;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\OATHAuth\OATHUser;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\SpecialPage\SpecialPage;
 
 /**
diff --git a/src/OATHUserRepository.php b/src/OATHUserRepository.php
index 8f220a38..85ea997e 100644
--- a/src/OATHUserRepository.php
+++ b/src/OATHUserRepository.php
@@ -18,7 +18,6 @@
 
 namespace MediaWiki\Extension\OATHAuth;
 
-use BagOStuff;
 use InvalidArgumentException;
 use MediaWiki\Config\ConfigException;
 use MediaWiki\Context\RequestContext;
@@ -30,6 +29,7 @@ use MWException;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use RuntimeException;
+use Wikimedia\ObjectCache\BagOStuff;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 class OATHUserRepository implements LoggerAwareInterface {
diff --git a/src/Special/DisableOATHForUser.php b/src/Special/DisableOATHForUser.php
index c3c14426..4b700aec 100644
--- a/src/Special/DisableOATHForUser.php
+++ b/src/Special/DisableOATHForUser.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\OATHAuth\Special;
 
-use ExtensionRegistry;
 use ManualLogEntry;
 use MediaWiki\CheckUser\Hooks as CheckUserHooks;
 use MediaWiki\Config\ConfigException;
@@ -10,6 +9,7 @@ use MediaWiki\Extension\OATHAuth\OATHUserRepository;
 use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Message\Message;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\SpecialPage\FormSpecialPage;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
diff --git a/src/Special/VerifyOATHForUser.php b/src/Special/VerifyOATHForUser.php
index 69ac66ae..4d8656ce 100644
--- a/src/Special/VerifyOATHForUser.php
+++ b/src/Special/VerifyOATHForUser.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Extension\OATHAuth\Special;
 
-use ExtensionRegistry;
 use ManualLogEntry;
 use MediaWiki\CheckUser\Hooks as CheckUserHooks;
 use MediaWiki\Config\ConfigException;
 use MediaWiki\Extension\OATHAuth\OATHUserRepository;
 use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\SpecialPage\FormSpecialPage;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
diff --git a/tests/phpunit/integration/OATHUserRepositoryTest.php b/tests/phpunit/integration/OATHUserRepositoryTest.php
index 2ee02969..747af1a3 100644
--- a/tests/phpunit/integration/OATHUserRepositoryTest.php
+++ b/tests/phpunit/integration/OATHUserRepositoryTest.php
@@ -20,7 +20,6 @@
 
 namespace MediaWiki\Extension\OATHAuth\Tests\Integration;
 
-use EmptyBagOStuff;
 use MediaWiki\Extension\OATHAuth\Key\TOTPKey;
 use MediaWiki\Extension\OATHAuth\OATHAuthServices;
 use MediaWiki\Extension\OATHAuth\OATHUserRepository;
@@ -28,6 +27,7 @@ use MediaWiki\User\CentralId\CentralIdLookup;
 use MediaWiki\User\CentralId\CentralIdLookupFactory;
 use MediaWikiIntegrationTestCase;
 use Psr\Log\LoggerInterface;
+use Wikimedia\ObjectCache\EmptyBagOStuff;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\TestingAccessWrapper;