diff --git a/includes/PresentationModel.php b/includes/PresentationModel.php
index a0c27e4..483a9da 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\Message\Message;
 use MediaWiki\SpecialPage\SpecialPage;
-use Message;
 
 class PresentationModel extends EchoEventPresentationModel {
 
diff --git a/includes/SchemaHooks.php b/includes/SchemaHooks.php
index d87f808..7440be6 100644
--- a/includes/SchemaHooks.php
+++ b/includes/SchemaHooks.php
@@ -2,7 +2,7 @@
 
 namespace LoginNotify;
 
-use DatabaseUpdater;
+use MediaWiki\Installer\DatabaseUpdater;
 use MediaWiki\Installer\Hook\LoadExtensionSchemaUpdatesHook;
 
 class SchemaHooks implements LoadExtensionSchemaUpdatesHook {
diff --git a/tests/phpunit/LoginNotifyTest.php b/tests/phpunit/LoginNotifyTest.php
index 0bf7ef8..08161c7 100644
--- a/tests/phpunit/LoginNotifyTest.php
+++ b/tests/phpunit/LoginNotifyTest.php
@@ -4,6 +4,7 @@ use LoginNotify\LoginNotify;
 use MediaWiki\CheckUser as CU;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\User\CentralId\LocalIdLookup;