diff --git a/includes/ApiQueryLintErrors.php b/includes/ApiQueryLintErrors.php
index 8cc4a47b..e36b653b 100644
--- a/includes/ApiQueryLintErrors.php
+++ b/includes/ApiQueryLintErrors.php
@@ -20,10 +20,10 @@
 
 namespace MediaWiki\Linter;
 
-use ApiBase;
-use ApiQuery;
-use ApiQueryBase;
-use ApiResult;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiQueryBase;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Title\Title;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
diff --git a/includes/ApiQueryLinterStats.php b/includes/ApiQueryLinterStats.php
index 011fdb59..68497a02 100644
--- a/includes/ApiQueryLinterStats.php
+++ b/includes/ApiQueryLinterStats.php
@@ -19,9 +19,9 @@
  */
 namespace MediaWiki\Linter;
 
-use ApiQuery;
-use ApiQueryBase;
-use ApiResult;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiQueryBase;
+use MediaWiki\Api\ApiResult;
 
 class ApiQueryLinterStats extends ApiQueryBase {
 
diff --git a/includes/Database.php b/includes/Database.php
index fed8c2eb..2106098e 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -20,8 +20,8 @@
 
 namespace MediaWiki\Linter;
 
-use FormatJson;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Logger\LoggerFactory;
 use stdClass;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/includes/Hooks.php b/includes/Hooks.php
index e375fb32..101358fb 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -20,12 +20,12 @@
 
 namespace MediaWiki\Linter;
 
-use ApiQuerySiteinfo;
-use Content;
 use JobQueueError;
 use JobQueueGroup;
+use MediaWiki\Api\ApiQuerySiteinfo;
 use MediaWiki\Api\Hook\APIQuerySiteInfoGeneralInfoHook;
 use MediaWiki\Config\Config;
+use MediaWiki\Content\Content;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Deferred\DeferrableUpdate;
 use MediaWiki\Deferred\MWCallableUpdate;
diff --git a/includes/LintError.php b/includes/LintError.php
index 76388ed3..ba15e7ae 100644
--- a/includes/LintError.php
+++ b/includes/LintError.php
@@ -20,7 +20,7 @@
 
 namespace MediaWiki\Linter;
 
-use FormatJson;
+use MediaWiki\Json\FormatJson;
 
 /**
  * Model to represent a LintError
diff --git a/includes/TotalsLookup.php b/includes/TotalsLookup.php
index fc21513c..837b3309 100644
--- a/includes/TotalsLookup.php
+++ b/includes/TotalsLookup.php
@@ -20,11 +20,11 @@
 
 namespace MediaWiki\Linter;
 
-use IBufferingStatsdDataFactory;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\WikiMap\WikiMap;
-use WANObjectCache;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\Database as MWDatabase;
+use Wikimedia\Stats\IBufferingStatsdDataFactory;
 
 /**
  * Lookup to find and cache the total amount of
diff --git a/maintenance/migrateNamespace.php b/maintenance/migrateNamespace.php
index 2fac85f2..473ac30e 100644
--- a/maintenance/migrateNamespace.php
+++ b/maintenance/migrateNamespace.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Linter\Maintenance;
 
-use LoggedUpdateMaintenance;
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 
 /**
  * Maintenance script that migrates the page table page_namespace field values
diff --git a/maintenance/migrateTagTemplate.php b/maintenance/migrateTagTemplate.php
index 9b9e9d8e..532cf76a 100644
--- a/maintenance/migrateTagTemplate.php
+++ b/maintenance/migrateTagTemplate.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Linter\Maintenance;
 
-use LoggedUpdateMaintenance;
+use MediaWiki\Maintenance\LoggedUpdateMaintenance;
 
 /**
  * Maintenance script that migrates the linter_params field value to the new tag and template fields
diff --git a/tests/phpunit/LintUpdateTest.php b/tests/phpunit/LintUpdateTest.php
index 3105d4a2..5fdbf53c 100644
--- a/tests/phpunit/LintUpdateTest.php
+++ b/tests/phpunit/LintUpdateTest.php
@@ -22,6 +22,7 @@ namespace MediaWiki\Linter\Test;
 
 use MediaWiki\Content\JavaScriptContent;
 use MediaWiki\Content\JavaScriptContentHandler;
+use MediaWiki\Content\WikitextContent;
 use MediaWiki\Content\WikitextContentHandler;
 use MediaWiki\Linter\LintUpdate;
 use MediaWiki\MainConfigNames;
@@ -33,7 +34,6 @@ use MediaWiki\Revision\SlotRecord;
 use MediaWikiIntegrationTestCase;
 use RefreshLinksJob;
 use WikiPage;
-use WikitextContent;
 
 /**
  * @group Database
diff --git a/tests/phpunit/SpecialLintErrorsTest.php b/tests/phpunit/SpecialLintErrorsTest.php
index 88a9e88f..6f6cd250 100644
--- a/tests/phpunit/SpecialLintErrorsTest.php
+++ b/tests/phpunit/SpecialLintErrorsTest.php
@@ -20,8 +20,8 @@
 
 namespace MediaWiki\Linter\Test;
 
-use ContentHandler;
 use Exception;
+use MediaWiki\Content\ContentHandler;
 use MediaWiki\Linter\RecordLintJob;
 use MediaWiki\Linter\SpecialLintErrors;
 use MediaWiki\Page\PageReference;