diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index 1564368e4..680f268cf 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -20,8 +20,8 @@
  */
 namespace Popups;
 
-use ExtensionRegistry;
 use MediaWiki\Config\Config;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;
diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php
index 402506253..f7efef9c4 100644
--- a/includes/PopupsHooks.php
+++ b/includes/PopupsHooks.php
@@ -20,13 +20,13 @@
  */
 namespace Popups;
 
-use ExtensionRegistry;
 use MediaWiki\Config\Config;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Output\Hook\BeforePageDisplayHook;
 use MediaWiki\Output\Hook\MakeGlobalVariablesScriptHook;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Preferences\Hook\GetPreferencesHook;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
 use MediaWiki\User\Options\UserOptionsManager;
 use MediaWiki\User\User;
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index b3ca3844a..2d4c7a577 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -3,6 +3,7 @@
 use MediaWiki\Config\Config;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Registration\ExtensionRegistry;
 use Popups\PopupsContext;
 use Popups\PopupsGadgetsIntegration;
 use Psr\Log\LoggerInterface;
diff --git a/tests/phpunit/PopupsContextTest.php b/tests/phpunit/PopupsContextTest.php
index 47fba5a87..4b4981371 100644
--- a/tests/phpunit/PopupsContextTest.php
+++ b/tests/phpunit/PopupsContextTest.php
@@ -21,6 +21,7 @@
 
 use MediaWiki\Config\GlobalVarConfig;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls;
diff --git a/tests/phpunit/PopupsContextTestWrapper.php b/tests/phpunit/PopupsContextTestWrapper.php
index ca6277415..5878de6cf 100644
--- a/tests/phpunit/PopupsContextTestWrapper.php
+++ b/tests/phpunit/PopupsContextTestWrapper.php
@@ -20,6 +20,7 @@
  */
 
 use MediaWiki\Config\Config;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\User\Options\UserOptionsLookup;
 use Popups\PopupsContext;
 use Popups\PopupsGadgetsIntegration;
diff --git a/tests/phpunit/PopupsGadgetsIntegrationTest.php b/tests/phpunit/PopupsGadgetsIntegrationTest.php
index 1d9698b47..9b83480b3 100644
--- a/tests/phpunit/PopupsGadgetsIntegrationTest.php
+++ b/tests/phpunit/PopupsGadgetsIntegrationTest.php
@@ -22,6 +22,7 @@ use MediaWiki\Config\Config;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Extension\Gadgets\Gadget;
 use MediaWiki\Extension\Gadgets\GadgetRepo;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\User\User;
 use Popups\PopupsGadgetsIntegration;