diff --git a/includes/Api/ApiTemplateData.php b/includes/Api/ApiTemplateData.php
index 12f520f3..b38f4254 100644
--- a/includes/Api/ApiTemplateData.php
+++ b/includes/Api/ApiTemplateData.php
@@ -2,16 +2,16 @@
 
 namespace MediaWiki\Extension\TemplateData\Api;
 
-use ApiBase;
-use ApiContinuationManager;
-use ApiFormatBase;
-use ApiPageSet;
-use ApiResult;
-use ExtensionRegistry;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiContinuationManager;
+use MediaWiki\Api\ApiFormatBase;
+use MediaWiki\Api\ApiPageSet;
+use MediaWiki\Api\ApiResult;
+use MediaWiki\Content\TextContent;
 use MediaWiki\Extension\EventLogging\EventLogging;
 use MediaWiki\Extension\TemplateData\TemplateDataBlob;
 use MediaWiki\MediaWikiServices;
-use TextContent;
+use MediaWiki\Registration\ExtensionRegistry;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 0b021065..5a3f360b 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\TemplateData;
 
-use ExtensionRegistry;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\Config;
 use MediaWiki\Context\RequestContext;
@@ -17,6 +16,8 @@ use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\Hook\OutputPageBeforeHTMLHook;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Parser\Parser;
+use MediaWiki\Parser\PPFrame;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Revision\RenderedRevision;
@@ -26,7 +27,6 @@ use MediaWiki\Status\Status;
 use MediaWiki\Storage\Hook\MultiContentSaveHook;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
-use PPFrame;
 
 /**
  * @license GPL-2.0-or-later
diff --git a/includes/TemplateDataMessageLocalizer.php b/includes/TemplateDataMessageLocalizer.php
index ce347ba8..8a4760b2 100644
--- a/includes/TemplateDataMessageLocalizer.php
+++ b/includes/TemplateDataMessageLocalizer.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\TemplateData;
 
-use Language;
+use MediaWiki\Language\Language;
 use MessageLocalizer;
 
 /**
diff --git a/maintenance/validateTemplateData.php b/maintenance/validateTemplateData.php
index 06556433..fb30bbdd 100644
--- a/maintenance/validateTemplateData.php
+++ b/maintenance/validateTemplateData.php
@@ -7,6 +7,7 @@ if ( $IP === false ) {
 require_once "$IP/maintenance/Maintenance.php";
 
 use MediaWiki\Extension\TemplateData\TemplateDataBlob;
+use MediaWiki\Maintenance\Maintenance;
 use MediaWiki\Title\Title;
 
 /**
diff --git a/tests/phpunit/TemplateDataBlobTest.php b/tests/phpunit/TemplateDataBlobTest.php
index 07a62180..48afa3fe 100644
--- a/tests/phpunit/TemplateDataBlobTest.php
+++ b/tests/phpunit/TemplateDataBlobTest.php
@@ -4,6 +4,7 @@ use MediaWiki\Extension\TemplateData\Api\ApiTemplateData;
 use MediaWiki\Extension\TemplateData\TemplateDataBlob;
 use MediaWiki\Extension\TemplateData\TemplateDataHtmlFormatter;
 use MediaWiki\Extension\TemplateData\TemplateDataValidator;
+use MediaWiki\Json\FormatJson;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Status\Status;