diff --git a/includes/Api/ApiWebappManifest.php b/includes/Api/ApiWebappManifest.php
index 193de44ad..09db28679 100644
--- a/includes/Api/ApiWebappManifest.php
+++ b/includes/Api/ApiWebappManifest.php
@@ -22,13 +22,13 @@
 
 namespace MediaWiki\Skins\Citizen\Api;
 
-use ApiBase;
-use ApiMain;
 use Exception;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Title\Title;
-use SpecialPage;
 
 /**
  * Based on the MobileFrontend extension
diff --git a/includes/Api/ApiWebappManifestFormatJson.php b/includes/Api/ApiWebappManifestFormatJson.php
index 0780ede53..5bba73919 100644
--- a/includes/Api/ApiWebappManifestFormatJson.php
+++ b/includes/Api/ApiWebappManifestFormatJson.php
@@ -22,7 +22,7 @@
 
 namespace MediaWiki\Skins\Citizen\Api;
 
-use ApiFormatJson;
+use MediaWiki\Api\ApiFormatJson;
 
 /**
  * T282500
diff --git a/includes/Components/CitizenComponentPageSidebar.php b/includes/Components/CitizenComponentPageSidebar.php
index 3a51a619b..56b1cf44b 100644
--- a/includes/Components/CitizenComponentPageSidebar.php
+++ b/includes/Components/CitizenComponentPageSidebar.php
@@ -4,12 +4,12 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use Language;
+use MediaWiki\Language\Language;
+use MediaWiki\Output\OutputPage;
 use MediaWiki\StubObject\StubUserLang;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
-use OutputPage;
 
 /**
  * CitizenComponentPageSidebar component
diff --git a/includes/Components/CitizenComponentPageTools.php b/includes/Components/CitizenComponentPageTools.php
index 4d36ccb96..45678ca56 100644
--- a/includes/Components/CitizenComponentPageTools.php
+++ b/includes/Components/CitizenComponentPageTools.php
@@ -4,9 +4,9 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use Config;
 use Exception;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Config\Config;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
diff --git a/includes/Components/CitizenComponentSearchBox.php b/includes/Components/CitizenComponentSearchBox.php
index 4f687a6f3..29bc66e65 100644
--- a/includes/Components/CitizenComponentSearchBox.php
+++ b/includes/Components/CitizenComponentSearchBox.php
@@ -4,7 +4,7 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use ExtensionRegistry;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Skin\SkinComponentUtils;
 use MessageLocalizer;
 
diff --git a/includes/Components/CitizenComponentSiteStats.php b/includes/Components/CitizenComponentSiteStats.php
index 126f30d1e..d741dd6fd 100644
--- a/includes/Components/CitizenComponentSiteStats.php
+++ b/includes/Components/CitizenComponentSiteStats.php
@@ -4,13 +4,13 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use Config;
 use IntlException;
-use Language;
+use MediaWiki\Config\Config;
+use MediaWiki\Language\Language;
+use MediaWiki\SiteStats\SiteStats;
 use MediaWiki\StubObject\StubUserLang;
 use MessageLocalizer;
 use NumberFormatter;
-use SiteStats;
 
 /**
  * CitizenComponentSiteStats component
diff --git a/includes/Components/CitizenComponentUserInfo.php b/includes/Components/CitizenComponentUserInfo.php
index dd6e711f1..ab0c2be32 100644
--- a/includes/Components/CitizenComponentUserInfo.php
+++ b/includes/Components/CitizenComponentUserInfo.php
@@ -4,8 +4,8 @@
 
 namespace MediaWiki\Skins\Citizen\Components;
 
-use MalformedTitleException;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Title\MalformedTitleException;
 use MediaWiki\Title\Title;
 use MediaWiki\User\UserIdentity;
 use MessageLocalizer;
diff --git a/includes/GetConfigTrait.php b/includes/GetConfigTrait.php
index 274b86fba..2de80d061 100644
--- a/includes/GetConfigTrait.php
+++ b/includes/GetConfigTrait.php
@@ -25,8 +25,8 @@
 
 namespace MediaWiki\Skins\Citizen;
 
-use ConfigException;
-use OutputPage;
+use MediaWiki\Config\ConfigException;
+use MediaWiki\Output\OutputPage;
 
 trait GetConfigTrait {
 
diff --git a/includes/Hooks/ResourceLoaderHooks.php b/includes/Hooks/ResourceLoaderHooks.php
index 05915c90a..a5e436c6e 100644
--- a/includes/Hooks/ResourceLoaderHooks.php
+++ b/includes/Hooks/ResourceLoaderHooks.php
@@ -25,10 +25,10 @@
 
 namespace MediaWiki\Skins\Citizen\Hooks;
 
-use Config;
-use ExtensionRegistry;
 use MediaWiki\MainConfigNames;
 use MediaWiki\ResourceLoader as RL;
+use MediaWiki\Config\Config;
+use MediaWiki\Registration\ExtensionRegistry;
 
 /**
  * Hooks to run relating to the resource loader
diff --git a/includes/Hooks/SkinHooks.php b/includes/Hooks/SkinHooks.php
index d80622459..acc988509 100644
--- a/includes/Hooks/SkinHooks.php
+++ b/includes/Hooks/SkinHooks.php
@@ -25,19 +25,19 @@
 
 namespace MediaWiki\Skins\Citizen\Hooks;
 
-use ExtensionRegistry;
-use Language;
+use MediaWiki\Language\Language;
 use MediaWiki\Hook\BeforePageDisplayHook;
 use MediaWiki\Hook\SidebarBeforeOutputHook;
 use MediaWiki\Hook\SkinBuildSidebarHook;
 use MediaWiki\Hook\SkinEditSectionLinksHook;
 use MediaWiki\Html\Html;
 use MediaWiki\ResourceLoader as RL;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Skin\SkinComponentUtils;
 use MediaWiki\Skins\Citizen\GetConfigTrait;
 use MediaWiki\Skins\Hook\SkinPageReadyConfigHook;
 use MediaWiki\Title\Title;
-use OutputPage;
+use MediaWiki\Output\OutputPage;
 use Skin;
 use SkinTemplate;