diff --git a/includes/Hooks.php b/includes/Hooks.php
index dea66057..68ba8967 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -21,19 +21,19 @@
 namespace MediaWiki\Linter;
 
 use ApiQuerySiteinfo;
-use Config;
 use Content;
-use IContextSource;
 use JobQueueError;
 use JobQueueGroup;
 use MediaWiki\Api\Hook\APIQuerySiteInfoGeneralInfoHook;
+use MediaWiki\Config\Config;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferrableUpdate;
 use MediaWiki\Deferred\MWCallableUpdate;
-use MediaWiki\Hook\BeforePageDisplayHook;
 use MediaWiki\Hook\InfoActionHook;
 use MediaWiki\Hook\ParserLogLinterDataHook;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Output\Hook\BeforePageDisplayHook;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Page\Hook\RevisionFromEditCompleteHook;
 use MediaWiki\Page\Hook\WikiPageDeletionUpdatesHook;
diff --git a/includes/LintErrorsPager.php b/includes/LintErrorsPager.php
index d89ec23f..e91c67c2 100644
--- a/includes/LintErrorsPager.php
+++ b/includes/LintErrorsPager.php
@@ -20,9 +20,9 @@
 
 namespace MediaWiki\Linter;
 
-use IContextSource;
 use InvalidArgumentException;
 use MediaWiki\Cache\LinkCache;
+use MediaWiki\Context\IContextSource;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
diff --git a/includes/SchemaHooks.php b/includes/SchemaHooks.php
index 8559f38a..54740553 100644
--- a/includes/SchemaHooks.php
+++ b/includes/SchemaHooks.php
@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Linter;
 
-use DatabaseUpdater;
+use MediaWiki\Installer\DatabaseUpdater;
 use MediaWiki\Installer\Hook\LoadExtensionSchemaUpdatesHook;
 
 class SchemaHooks implements LoadExtensionSchemaUpdatesHook {
diff --git a/includes/SpecialLintErrors.php b/includes/SpecialLintErrors.php
index 2de395d6..da479097 100644
--- a/includes/SpecialLintErrors.php
+++ b/includes/SpecialLintErrors.php
@@ -20,9 +20,9 @@
 
 namespace MediaWiki\Linter;
 
-use HTMLForm;
 use MediaWiki\Cache\LinkCache;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Request\WebRequest;