diff --git a/includes/Hooks.php b/includes/Hooks.php
index 05559a0..3b664ec 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -12,9 +12,9 @@ use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\Hook\AuthManagerLoginAuthenticateAuditHook;
 use MediaWiki\Auth\Hook\LocalUserCreatedHook;
 use MediaWiki\Hook\RecentChange_saveHook;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use RecentChange;
-use User;
 
 class Hooks implements
 	AuthManagerLoginAuthenticateAuditHook,
diff --git a/includes/LoginNotify.php b/includes/LoginNotify.php
index b71acbe..5d17075 100644
--- a/includes/LoginNotify.php
+++ b/includes/LoginNotify.php
@@ -9,7 +9,6 @@
 namespace LoginNotify;
 
 use BagOStuff;
-use CentralIdLookup;
 use Exception;
 use ExtensionRegistry;
 use IBufferingStatsdDataFactory;
@@ -20,13 +19,14 @@ use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Extension\CentralAuth\User\CentralAuthUser;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Request\WebRequest;
+use MediaWiki\User\CentralId\CentralIdLookup;
+use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
 use MWCryptRand;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use UnexpectedValueException;
-use User;
-use WebRequest;
 use Wikimedia\Assert\Assert;
 use Wikimedia\IPUtils;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/PresentationModel.php b/includes/PresentationModel.php
index 3ac038b..a0c27e4 100644
--- a/includes/PresentationModel.php
+++ b/includes/PresentationModel.php
@@ -4,8 +4,8 @@ namespace LoginNotify;
 
 use MediaWiki\Extension\Notifications\Formatters\EchoEventPresentationModel;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWiki\SpecialPage\SpecialPage;
 use Message;
-use SpecialPage;
 
 class PresentationModel extends EchoEventPresentationModel {
 
diff --git a/maintenance/migratePreferences.php b/maintenance/migratePreferences.php
index 16fa1c3..7d1a2cb 100644
--- a/maintenance/migratePreferences.php
+++ b/maintenance/migratePreferences.php
@@ -5,9 +5,9 @@ namespace LoginNotify\Maintenance;
 use BatchRowIterator;
 use LoggedUpdateMaintenance;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;
 use RecursiveIteratorIterator;
-use User;
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
diff --git a/tests/phpunit/LoginNotifyTest.php b/tests/phpunit/LoginNotifyTest.php
index 67b8224..a48ed57 100644
--- a/tests/phpunit/LoginNotifyTest.php
+++ b/tests/phpunit/LoginNotifyTest.php
@@ -2,9 +2,12 @@
 
 use LoginNotify\LoginNotify;
 use MediaWiki\CheckUser as CU;
+use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\User\CentralId\LocalIdLookup;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use Wikimedia\TestingAccessWrapper;