diff --git a/autoload.php b/autoload.php
index c7315faf805..c3e988c12a0 100644
--- a/autoload.php
+++ b/autoload.php
@@ -717,8 +717,7 @@ $wgAutoloadLocalClasses = [
 	'LocalRepo' => __DIR__ . '/includes/filerepo/LocalRepo.php',
 	'LocalSettingsGenerator' => __DIR__ . '/includes/installer/LocalSettingsGenerator.php',
 	'LocalisationCache' => __DIR__ . '/includes/cache/localisation/LocalisationCache.php',
-	'LocalisationCacheBulkLoad' => __DIR__ .
-		'/includes/cache/localisation/LocalisationCacheBulkLoad.php',
+	'LocalisationCacheBulkLoad' => __DIR__ . '/includes/cache/localisation/LocalisationCacheBulkLoad.php',
 	'LockManager' => __DIR__ . '/includes/filebackend/lockmanager/LockManager.php',
 	'LockManagerGroup' => __DIR__ . '/includes/filebackend/lockmanager/LockManagerGroup.php',
 	'LogEntry' => __DIR__ . '/includes/logging/LogEntry.php',
@@ -778,7 +777,6 @@ $wgAutoloadLocalClasses = [
 	'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php',
 	'MediaWikiTitleCodec' => __DIR__ . '/includes/title/MediaWikiTitleCodec.php',
 	'MediaWikiVersionFetcher' => __DIR__ . '/includes/MediaWikiVersionFetcher.php',
-	'MediaWiki\\MediaWikiServices' => __DIR__ . '/includes/MediaWikiServices.php',
 	'MediaWiki\\Languages\\Data\\Names' => __DIR__ . '/languages/data/Names.php',
 	'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . '/languages/data/ZhConversion.php',
 	'MediaWiki\\Logger\\LegacyLogger' => __DIR__ . '/includes/debug/logger/LegacyLogger.php',
@@ -795,6 +793,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Logger\\Monolog\\WikiProcessor' => __DIR__ . '/includes/debug/logger/monolog/WikiProcessor.php',
 	'MediaWiki\\Logger\\NullSpi' => __DIR__ . '/includes/debug/logger/NullSpi.php',
 	'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
+	'MediaWiki\\MediaWikiServices' => __DIR__ . '/includes/MediaWikiServices.php',
 	'MediaWiki\\Services\\ServiceContainer' => __DIR__ . '/includes/Services/ServiceContainer.php',
 	'MediaWiki\\Session\\BotPasswordSessionProvider' => __DIR__ . '/includes/session/BotPasswordSessionProvider.php',
 	'MediaWiki\\Session\\CookieSessionProvider' => __DIR__ . '/includes/session/CookieSessionProvider.php',
@@ -1267,8 +1266,8 @@ $wgAutoloadLocalClasses = [
 	'SquidPurgeClientPool' => __DIR__ . '/includes/clientpool/SquidPurgeClientPool.php',
 	'SquidUpdate' => __DIR__ . '/includes/deferred/CdnCacheUpdate.php',
 	'SrConverter' => __DIR__ . '/languages/classes/LanguageSr.php',
-	'StatsdAwareInterface' => __DIR__ . '/includes/libs/stats/StatsdAwareInterface.php',
 	'StatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
+	'StatsdAwareInterface' => __DIR__ . '/includes/libs/stats/StatsdAwareInterface.php',
 	'Status' => __DIR__ . '/includes/Status.php',
 	'StatusValue' => __DIR__ . '/includes/libs/StatusValue.php',
 	'StorageTypeStats' => __DIR__ . '/maintenance/storage/storageTypeStats.php',