diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5fb1581c..132ad1dc 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -5,6 +5,7 @@ namespace MediaWiki\Extension\TemplateData;
 use ExtensionRegistry;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Extension\EventLogging\EventLogging;
 use MediaWiki\Hook\EditPage__showEditForm_fieldsHook;
@@ -15,6 +16,7 @@ use MediaWiki\Hook\ParserFirstCallInitHook;
 use MediaWiki\Html\Html;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\Parser;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Revision\RenderedRevision;
@@ -24,9 +26,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Storage\Hook\MultiContentSaveHook;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
-use Parser;
 use PPFrame;
-use RequestContext;
 
 /**
  * @license GPL-2.0-or-later
diff --git a/includes/TemplateDataCompressedBlob.php b/includes/TemplateDataCompressedBlob.php
index 7b27c72d..b8f6e3e9 100644
--- a/includes/TemplateDataCompressedBlob.php
+++ b/includes/TemplateDataCompressedBlob.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Extension\TemplateData;
 
-use Message;
+use MediaWiki\Message\Message;
 
 /**
  * Represents the information about a template,