diff --git a/includes/ApiCategoryTree.php b/includes/ApiCategoryTree.php
index 66d6e762..3c4042c1 100644
--- a/includes/ApiCategoryTree.php
+++ b/includes/ApiCategoryTree.php
@@ -4,9 +4,9 @@ namespace MediaWiki\Extension\CategoryTree;
 
 use ApiBase;
 use ApiMain;
-use Config;
-use ConfigFactory;
 use FormatJson;
+use MediaWiki\Config\Config;
+use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\Title\Title;
 use WANObjectCache;
diff --git a/includes/CategoryTree.php b/includes/CategoryTree.php
index 71e4c839..e6b6215d 100644
--- a/includes/CategoryTree.php
+++ b/includes/CategoryTree.php
@@ -27,16 +27,16 @@ namespace MediaWiki\Extension\CategoryTree;
 use Exception;
 use ExtensionRegistry;
 use FormatJson;
-use Html;
 use IContextSource;
 use MediaWiki\Category\Category;
+use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Output\OutputPage;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 use Parser;
 use RequestContext;
-use SpecialPage;
 
 /**
  * Core functions for the CategoryTree extension, an AJAX based gadget
diff --git a/includes/CategoryTreePage.php b/includes/CategoryTreePage.php
index 1a6764d6..d9792d32 100644
--- a/includes/CategoryTreePage.php
+++ b/includes/CategoryTreePage.php
@@ -24,11 +24,11 @@
 
 namespace MediaWiki\Extension\CategoryTree;
 
-use Html;
 use HTMLForm;
+use MediaWiki\Html\Html;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
 use SearchEngineFactory;
-use SpecialPage;
 
 /**
  * Special page for the CategoryTree extension, an AJAX based gadget
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 1f39c34e..5ce9b701 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -24,8 +24,7 @@
 
 namespace MediaWiki\Extension\CategoryTree;
 
-use Config;
-use Html;
+use MediaWiki\Config\Config;
 use MediaWiki\Hook\CategoryViewer__doCategoryQueryHook;
 use MediaWiki\Hook\CategoryViewer__generateLinkHook;
 use MediaWiki\Hook\OutputPageMakeCategoryLinksHook;
@@ -33,15 +32,16 @@ use MediaWiki\Hook\ParserFirstCallInitHook;
 use MediaWiki\Hook\SkinBuildSidebarHook;
 use MediaWiki\Hook\SpecialTrackingCategories__generateCatLinkHook;
 use MediaWiki\Hook\SpecialTrackingCategories__preprocessHook;
+use MediaWiki\Html\Html;
 use MediaWiki\Linker\LinkTarget;
+use MediaWiki\Output\OutputPage;
+use MediaWiki\Parser\Sanitizer;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use OutputPage;
 use Parser;
 use PPFrame;
 use RequestContext;
-use Sanitizer;
 use Skin;
-use SpecialPage;
 use Wikimedia\Rdbms\IResultWrapper;
 
 /**
diff --git a/tests/phpunit/CategoryCacheTest.php b/tests/phpunit/CategoryCacheTest.php
index b2bd6440..9cf9e5b0 100644
--- a/tests/phpunit/CategoryCacheTest.php
+++ b/tests/phpunit/CategoryCacheTest.php
@@ -22,8 +22,8 @@ namespace MediaWiki\Extension\CategoryTree\Tests;
 
 use MediaWiki\Category\Category;
 use MediaWiki\Extension\CategoryTree\CategoryCache;
+use MediaWiki\Title\TitleValue;
 use MediaWikiIntegrationTestCase;
-use TitleValue;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;