diff --git a/autoload.php b/autoload.php
index 015b8244f5b..ae54c8dfbd1 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1541,6 +1541,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Page\\PageIdentity' => __DIR__ . '/includes/page/PageIdentity.php',
 	'MediaWiki\\Page\\PageIdentityValue' => __DIR__ . '/includes/page/PageIdentityValue.php',
 	'MediaWiki\\Page\\PageLookup' => __DIR__ . '/includes/page/PageLookup.php',
+	'MediaWiki\\Page\\PageProps' => __DIR__ . '/includes/page/PageProps.php',
 	'MediaWiki\\Page\\PageRecord' => __DIR__ . '/includes/page/PageRecord.php',
 	'MediaWiki\\Page\\PageReference' => __DIR__ . '/includes/page/PageReference.php',
 	'MediaWiki\\Page\\PageReferenceValue' => __DIR__ . '/includes/page/PageReferenceValue.php',
@@ -2101,7 +2102,7 @@ $wgAutoloadLocalClasses = [
 	'PageDataRequestHandler' => __DIR__ . '/includes/linkeddata/PageDataRequestHandler.php',
 	'PageExists' => __DIR__ . '/maintenance/pageExists.php',
 	'PageLangLogFormatter' => __DIR__ . '/includes/logging/PageLangLogFormatter.php',
-	'PageProps' => __DIR__ . '/includes/PageProps.php',
+	'PageProps' => __DIR__ . '/includes/page/PageProps.php',
 	'PageQueryPage' => __DIR__ . '/includes/specialpage/PageQueryPage.php',
 	'Pager' => __DIR__ . '/includes/pager/Pager.php',
 	'PaginatingSearchEngine' => __DIR__ . '/includes/search/PaginatingSearchEngine.php',
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index e1c67f98024..a410bccfba2 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -90,6 +90,7 @@ use MediaWiki\Page\ContentModelChangeFactory;
 use MediaWiki\Page\DeletePageFactory;
 use MediaWiki\Page\MergeHistoryFactory;
 use MediaWiki\Page\MovePageFactory;
+use MediaWiki\Page\PageProps;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Page\PageStoreFactory;
 use MediaWiki\Page\ParserOutputAccess;
@@ -160,7 +161,6 @@ use MWLBFactory;
 use NamespaceInfo;
 use ObjectCache;
 use OldRevisionImporter;
-use PageProps;
 use Parser;
 use ParserCache;
 use ParserFactory;
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index b842aff3b8b..4521c5b43f4 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -106,6 +106,7 @@ use MediaWiki\Page\DeletePageFactory;
 use MediaWiki\Page\MergeHistoryFactory;
 use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Page\PageCommandFactory;
+use MediaWiki\Page\PageProps;
 use MediaWiki\Page\PageStore;
 use MediaWiki\Page\PageStoreFactory;
 use MediaWiki\Page\ParserOutputAccess;
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index c0d212b71b3..d25e02ae11e 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -30,6 +30,7 @@ use MediaWiki\Linker\LinksMigration;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\PageIdentity;
+use MediaWiki\Page\PageProps;
 use MediaWiki\Page\RedirectLookup;
 use MediaWiki\Permissions\RestrictionStore;
 use MediaWiki\Revision\RevisionLookup;
diff --git a/includes/api/ApiQueryPageProps.php b/includes/api/ApiQueryPageProps.php
index 12ae50f9809..6f6410b5ee6 100644
--- a/includes/api/ApiQueryPageProps.php
+++ b/includes/api/ApiQueryPageProps.php
@@ -20,6 +20,7 @@
  * @file
  */
 
+use MediaWiki\Page\PageProps;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**
diff --git a/includes/PageProps.php b/includes/page/PageProps.php
similarity index 98%
rename from includes/PageProps.php
rename to includes/page/PageProps.php
index 485adc99b37..2706fb38230 100644
--- a/includes/PageProps.php
+++ b/includes/page/PageProps.php
@@ -20,9 +20,12 @@
  * @file
  */
 
+namespace MediaWiki\Page;
+
+use MapCacheLRU;
 use MediaWiki\Cache\LinkBatchFactory;
-use MediaWiki\Page\PageIdentity;
 use MediaWiki\Title\TitleArray;
+use Title;
 use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
@@ -281,3 +284,5 @@ class PageProps {
 		$this->cache->setField( 0, $pageID, $pageProperties );
 	}
 }
+
+class_alias( PageProps::class, 'PageProps' );
diff --git a/tests/phpunit/includes/changes/RecentChangeTest.php b/tests/phpunit/includes/changes/RecentChangeTest.php
index 650798f5b63..e9c9f472ef9 100644
--- a/tests/phpunit/includes/changes/RecentChangeTest.php
+++ b/tests/phpunit/includes/changes/RecentChangeTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
+use MediaWiki\Page\PageProps;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Permissions\PermissionStatus;
diff --git a/tests/phpunit/includes/PagePropsTest.php b/tests/phpunit/includes/page/PagePropsTest.php
similarity index 100%
rename from tests/phpunit/includes/PagePropsTest.php
rename to tests/phpunit/includes/page/PagePropsTest.php
diff --git a/tests/phpunit/includes/page/WikiCategoryPageTest.php b/tests/phpunit/includes/page/WikiCategoryPageTest.php
index 7f024bc446f..dc55af9e68d 100644
--- a/tests/phpunit/includes/page/WikiCategoryPageTest.php
+++ b/tests/phpunit/includes/page/WikiCategoryPageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Page\PageProps;
+
 class WikiCategoryPageTest extends MediaWikiLangTestCase {
 
 	/**