diff --git a/includes/CategoryTree.php b/includes/CategoryTree.php
index 48d6f3fe..a73405c0 100644
--- a/includes/CategoryTree.php
+++ b/includes/CategoryTree.php
@@ -25,17 +25,17 @@
 namespace MediaWiki\Extension\CategoryTree;
 
 use ExtensionRegistry;
-use IContextSource;
 use MediaWiki\Category\Category;
 use MediaWiki\Config\Config;
+use MediaWiki\Context\IContextSource;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\Parser;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use Parser;
-use RequestContext;
 use Wikimedia\Rdbms\IConnectionProvider;
 
 /**
diff --git a/includes/CategoryTreePage.php b/includes/CategoryTreePage.php
index ce4e903d..34f5abc1 100644
--- a/includes/CategoryTreePage.php
+++ b/includes/CategoryTreePage.php
@@ -24,8 +24,8 @@
 
 namespace MediaWiki\Extension\CategoryTree;
 
-use HTMLForm;
 use MediaWiki\Html\Html;
+use MediaWiki\HTMLForm\HTMLForm;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use SearchEngineFactory;
diff --git a/includes/Hooks.php b/includes/Hooks.php
index e4f38df7..a984ca08 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -25,6 +25,7 @@
 namespace MediaWiki\Extension\CategoryTree;
 
 use MediaWiki\Config\Config;
+use MediaWiki\Context\RequestContext;
 use MediaWiki\Hook\CategoryViewer__doCategoryQueryHook;
 use MediaWiki\Hook\CategoryViewer__generateLinkHook;
 use MediaWiki\Hook\OutputPageMakeCategoryLinksHook;
@@ -36,13 +37,12 @@ use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\Parser;
 use MediaWiki\Parser\Sanitizer;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use Parser;
 use PPFrame;
-use RequestContext;
 use Skin;
 use Wikimedia\Rdbms\IConnectionProvider;
 use Wikimedia\Rdbms\IResultWrapper;