diff --git a/src/ErrorReporter.php b/src/ErrorReporter.php
index 425cccf87..a06f662ac 100644
--- a/src/ErrorReporter.php
+++ b/src/ErrorReporter.php
@@ -3,12 +3,12 @@
 namespace Cite;
 
 use InvalidArgumentException;
-use Language;
 use MediaWiki\Html\Html;
+use MediaWiki\Language\Language;
 use MediaWiki\Message\Message;
 use MediaWiki\Parser\Parser;
+use MediaWiki\Parser\ParserOptions;
 use MediaWiki\Parser\Sanitizer;
-use ParserOptions;
 use StatusValue;
 
 /**
diff --git a/src/Hooks/CiteHooks.php b/src/Hooks/CiteHooks.php
index b3ec36552..5e35a9c61 100644
--- a/src/Hooks/CiteHooks.php
+++ b/src/Hooks/CiteHooks.php
@@ -6,16 +6,16 @@
 
 namespace Cite\Hooks;
 
-use ApiQuerySiteinfo;
 use Cite\ReferencePreviews\ReferencePreviewsContext;
 use Cite\ReferencePreviews\ReferencePreviewsGadgetsIntegration;
-use ExtensionRegistry;
+use MediaWiki\Api\ApiQuerySiteinfo;
 use MediaWiki\Api\Hook\APIQuerySiteInfoGeneralInfoHook;
 use MediaWiki\Config\Config;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Hook\EditPage__showEditForm_initialHook;
 use MediaWiki\Output\Hook\MakeGlobalVariablesScriptHook;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderRegisterModulesHook;
 use MediaWiki\ResourceLoader\ResourceLoader;
diff --git a/src/Hooks/CiteParserHooks.php b/src/Hooks/CiteParserHooks.php
index 306ec204a..fda6b6440 100644
--- a/src/Hooks/CiteParserHooks.php
+++ b/src/Hooks/CiteParserHooks.php
@@ -9,7 +9,7 @@ use MediaWiki\Hook\ParserClearStateHook;
 use MediaWiki\Hook\ParserClonedHook;
 use MediaWiki\Hook\ParserFirstCallInitHook;
 use MediaWiki\Parser\Parser;
-use StripState;
+use MediaWiki\Parser\StripState;
 
 /**
  * @license GPL-2.0-or-later
diff --git a/src/Hooks/CiteParserTagHooks.php b/src/Hooks/CiteParserTagHooks.php
index ec0058d70..1e7fbcde9 100644
--- a/src/Hooks/CiteParserTagHooks.php
+++ b/src/Hooks/CiteParserTagHooks.php
@@ -5,7 +5,7 @@ namespace Cite\Hooks;
 use Cite\Cite;
 use MediaWiki\Config\Config;
 use MediaWiki\Parser\Parser;
-use PPFrame;
+use MediaWiki\Parser\PPFrame;
 
 /**
  * @license GPL-2.0-or-later
diff --git a/src/ReferenceMessageLocalizer.php b/src/ReferenceMessageLocalizer.php
index 5c2cf3c67..3f907d6a1 100644
--- a/src/ReferenceMessageLocalizer.php
+++ b/src/ReferenceMessageLocalizer.php
@@ -2,10 +2,10 @@
 
 namespace Cite;
 
-use Language;
+use MediaWiki\Language\Language;
 use MediaWiki\Message\Message;
 use MessageLocalizer;
-use MessageSpecifier;
+use Wikimedia\Message\MessageSpecifier;
 
 /**
  * Interface abstracts everything a Cite needs to do with languages.
diff --git a/src/ReferenceStack.php b/src/ReferenceStack.php
index c23be07f0..3addbea19 100644
--- a/src/ReferenceStack.php
+++ b/src/ReferenceStack.php
@@ -3,7 +3,7 @@
 namespace Cite;
 
 use LogicException;
-use StripState;
+use MediaWiki\Parser\StripState;
 
 /**
  * Encapsulates most of Cite state during parsing.  This includes metadata about each ref tag,
diff --git a/src/ResourceLoader/OptionalLoader.php b/src/ResourceLoader/OptionalLoader.php
index 5fbd28402..609e9d209 100644
--- a/src/ResourceLoader/OptionalLoader.php
+++ b/src/ResourceLoader/OptionalLoader.php
@@ -2,7 +2,7 @@
 
 namespace Cite\ResourceLoader;
 
-use ExtensionRegistry;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader\FileModule;
 use MediaWiki\ResourceLoader\Module;
 
diff --git a/tests/phpunit/CiteDbTest.php b/tests/phpunit/CiteDbTest.php
index 0c1407b78..85c6f4df5 100644
--- a/tests/phpunit/CiteDbTest.php
+++ b/tests/phpunit/CiteDbTest.php
@@ -2,8 +2,8 @@
 
 namespace Cite\Tests;
 
+use MediaWiki\Parser\ParserOptions;
 use MediaWiki\Title\Title;
-use ParserOptions;
 
 /**
  * @group Database
diff --git a/tests/phpunit/CiteHooksTest.php b/tests/phpunit/CiteHooksTest.php
index 0c127e4ce..5f6bdcac4 100644
--- a/tests/phpunit/CiteHooksTest.php
+++ b/tests/phpunit/CiteHooksTest.php
@@ -2,9 +2,9 @@
 
 namespace Cite\Tests;
 
-use ApiQuerySiteinfo;
 use Cite\Hooks\CiteHooks;
 use Cite\ReferencePreviews\ReferencePreviewsGadgetsIntegration;
+use MediaWiki\Api\ApiQuerySiteinfo;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\User\Options\StaticUserOptionsLookup;
diff --git a/tests/phpunit/CiteIntegrationTest.php b/tests/phpunit/CiteIntegrationTest.php
index 76242d016..b77f91fa7 100644
--- a/tests/phpunit/CiteIntegrationTest.php
+++ b/tests/phpunit/CiteIntegrationTest.php
@@ -6,10 +6,10 @@ use Cite\Cite;
 use Cite\ErrorReporter;
 use Cite\ReferenceListFormatter;
 use Cite\ReferenceStack;
-use Language;
+use MediaWiki\Language\Language;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Parser\Parser;
-use ParserOptions;
+use MediaWiki\Parser\ParserOptions;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/integration/CiteParsoidTest.php b/tests/phpunit/integration/CiteParsoidTest.php
index cfff6d025..16fda5d94 100644
--- a/tests/phpunit/integration/CiteParsoidTest.php
+++ b/tests/phpunit/integration/CiteParsoidTest.php
@@ -4,7 +4,7 @@ declare( strict_types = 1 );
 
 namespace Cite\Tests\Integration;
 
-use ExtensionRegistry;
+use MediaWiki\Registration\ExtensionRegistry;
 use Wikimedia\ObjectFactory\ObjectFactory;
 use Wikimedia\Parsoid\Core\SelserData;
 use Wikimedia\Parsoid\DOM\Element;
diff --git a/tests/phpunit/integration/CiteTest.php b/tests/phpunit/integration/CiteTest.php
index 648e919df..7195cf5a6 100644
--- a/tests/phpunit/integration/CiteTest.php
+++ b/tests/phpunit/integration/CiteTest.php
@@ -8,11 +8,11 @@ use Cite\FootnoteMarkFormatter;
 use Cite\ReferenceListFormatter;
 use Cite\ReferenceStack;
 use Cite\Tests\TestUtils;
-use Language;
 use LogicException;
+use MediaWiki\Language\Language;
 use MediaWiki\Parser\Parser;
-use ParserOptions;
-use StripState;
+use MediaWiki\Parser\ParserOptions;
+use MediaWiki\Parser\StripState;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/CiteParserHooksTest.php b/tests/phpunit/unit/CiteParserHooksTest.php
index f5a3b0240..19a540d18 100644
--- a/tests/phpunit/unit/CiteParserHooksTest.php
+++ b/tests/phpunit/unit/CiteParserHooksTest.php
@@ -6,9 +6,9 @@ use Cite\Cite;
 use Cite\Hooks\CiteParserHooks;
 use MediaWiki\Config\Config;
 use MediaWiki\Parser\Parser;
+use MediaWiki\Parser\ParserOptions;
 use MediaWiki\Parser\ParserOutput;
-use ParserOptions;
-use StripState;
+use MediaWiki\Parser\StripState;
 
 /**
  * @covers \Cite\Hooks\CiteParserHooks
diff --git a/tests/phpunit/unit/CiteParserTagHooksTest.php b/tests/phpunit/unit/CiteParserTagHooksTest.php
index ed4b5437a..4ba3ee85b 100644
--- a/tests/phpunit/unit/CiteParserTagHooksTest.php
+++ b/tests/phpunit/unit/CiteParserTagHooksTest.php
@@ -7,7 +7,7 @@ use Cite\Hooks\CiteParserTagHooks;
 use MediaWiki\Config\Config;
 use MediaWiki\Parser\Parser;
 use MediaWiki\Parser\ParserOutput;
-use PPFrame;
+use MediaWiki\Parser\PPFrame;
 
 /**
  * @covers \Cite\Hooks\CiteParserTagHooks
diff --git a/tests/phpunit/unit/ErrorReporterTest.php b/tests/phpunit/unit/ErrorReporterTest.php
index b1f524fec..22b027faf 100644
--- a/tests/phpunit/unit/ErrorReporterTest.php
+++ b/tests/phpunit/unit/ErrorReporterTest.php
@@ -4,10 +4,10 @@ namespace Cite\Tests\Unit;
 
 use Cite\ErrorReporter;
 use Cite\ReferenceMessageLocalizer;
-use Language;
+use MediaWiki\Language\Language;
 use MediaWiki\Message\Message;
 use MediaWiki\Parser\Parser;
-use ParserOptions;
+use MediaWiki\Parser\ParserOptions;
 
 /**
  * @covers \Cite\ErrorReporter
diff --git a/tests/phpunit/unit/ReferenceMessageLocalizerUnitTest.php b/tests/phpunit/unit/ReferenceMessageLocalizerUnitTest.php
index 7bbd67ff4..f9668d064 100644
--- a/tests/phpunit/unit/ReferenceMessageLocalizerUnitTest.php
+++ b/tests/phpunit/unit/ReferenceMessageLocalizerUnitTest.php
@@ -3,7 +3,7 @@
 namespace Cite\Tests\Unit;
 
 use Cite\ReferenceMessageLocalizer;
-use Language;
+use MediaWiki\Language\Language;
 
 /**
  * @covers \Cite\ReferenceMessageLocalizer
diff --git a/tests/phpunit/unit/ReferenceStackTest.php b/tests/phpunit/unit/ReferenceStackTest.php
index 5d759fbd3..1b4486e04 100644
--- a/tests/phpunit/unit/ReferenceStackTest.php
+++ b/tests/phpunit/unit/ReferenceStackTest.php
@@ -5,7 +5,7 @@ namespace Cite\Tests\Unit;
 use Cite\ReferenceStack;
 use Cite\Tests\TestUtils;
 use LogicException;
-use StripState;
+use MediaWiki\Parser\StripState;
 use Wikimedia\TestingAccessWrapper;
 
 /**