diff --git a/includes/Hooks.php b/includes/Hooks.php
index d7e34ecf..5e4db76e 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -9,15 +9,16 @@ use Article;
 use DatabaseLogEntry;
 use DifferenceEngine;
 use ExtensionRegistry;
-use GenderCache;
-use IContextSource;
 use LogEventsList;
 use LogPage;
 use MediaWiki\Api\Hook\ApiMain__moduleManagerHook;
 use MediaWiki\Auth\Hook\LocalUserCreatedHook;
 use MediaWiki\Block\Hook\GetAllBlockActionsHook;
+use MediaWiki\Cache\GenderCache;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Diff\Hook\DifferenceEngineViewHeaderHook;
 use MediaWiki\Diff\Hook\DiffToolsHook;
 use MediaWiki\Extension\Thanks\Api\ApiFlowThank;
@@ -38,7 +39,6 @@ use MediaWiki\User\Options\UserOptionsManager;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
-use RequestContext;
 use Skin;
 
 /**
diff --git a/includes/SpecialThanks.php b/includes/SpecialThanks.php
index 1d4a3ab6..addbce06 100644
--- a/includes/SpecialThanks.php
+++ b/includes/SpecialThanks.php
@@ -4,7 +4,7 @@ namespace MediaWiki\Extension\Thanks;
 
 use ApiMain;
 use ApiUsageException;
-use HTMLForm;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\Linker\Linker;
 use MediaWiki\Request\DerivativeRequest;
 use MediaWiki\SpecialPage\FormSpecialPage;
diff --git a/tests/phpunit/ApiCoreThankIntegrationTest.php b/tests/phpunit/ApiCoreThankIntegrationTest.php
index f6c8f897..59d612da 100644
--- a/tests/phpunit/ApiCoreThankIntegrationTest.php
+++ b/tests/phpunit/ApiCoreThankIntegrationTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Deferred\DeferredUpdates;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\User\User;
 
 /**
diff --git a/tests/phpunit/ApiCoreThankUnitTest.php b/tests/phpunit/ApiCoreThankUnitTest.php
index edbd8955..12195245 100644
--- a/tests/phpunit/ApiCoreThankUnitTest.php
+++ b/tests/phpunit/ApiCoreThankUnitTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Extension\Thanks\Api\ApiCoreThank;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentityValue;
 
diff --git a/tests/phpunit/ApiFlowThankIntegrationTest.php b/tests/phpunit/ApiFlowThankIntegrationTest.php
index 341842d9..0fcce69e 100644
--- a/tests/phpunit/ApiFlowThankIntegrationTest.php
+++ b/tests/phpunit/ApiFlowThankIntegrationTest.php
@@ -5,6 +5,7 @@ use Flow\Model\PostRevision;
 use Flow\Model\UUID;
 use Flow\Model\Workflow;
 use MediaWiki\Deferred\DeferredUpdates;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\WikiMap\WikiMap;