diff --git a/.upgradenotes/MDL-82183-2024061304200941.yml b/.upgradenotes/MDL-82183-2024061304200941.yml
index 85b6df698dd..b5a1efe8f97 100644
--- a/.upgradenotes/MDL-82183-2024061304200941.yml
+++ b/.upgradenotes/MDL-82183-2024061304200941.yml
@@ -31,6 +31,8 @@ notes:
 
         | `\context_header` | `\core\output\context_header` |
 
+        | `\core\output\local\action_menu\subpanel` | `\core\output\action_menu\subpanel` |
+
         | `\core_renderer_ajax` | `\core\output\core_renderer_ajax` |
 
         | `\core_renderer_cli` | `\core\output\core_renderer_cli` |
diff --git a/lib/classes/output/action_menu.php b/lib/classes/output/action_menu.php
index 588753e652e..261054f1f96 100644
--- a/lib/classes/output/action_menu.php
+++ b/lib/classes/output/action_menu.php
@@ -17,10 +17,10 @@
 namespace core\output;
 
 use core\exception\coding_exception;
+use core\lang_string;
 use core\output\local\action_menu\subpanel;
 use core\output\action_menu\link as action_menu_link;
 use core\output\action_menu\filler as action_menu_filler;
-use lang_string;
 use moodle_page;
 use stdClass;
 
diff --git a/lib/classes/output/requirements/fragment_requirements_manager.php b/lib/classes/output/requirements/fragment_requirements_manager.php
index 5240c34ca49..1a4446d64f0 100644
--- a/lib/classes/output/requirements/fragment_requirements_manager.php
+++ b/lib/classes/output/requirements/fragment_requirements_manager.php
@@ -16,8 +16,8 @@
 
 namespace core\output\requirements;
 
-use html_writer;
-use js_writer;
+use core\output\html_writer;
+use core\output\js_writer;
 
 /**
  * This requirements manager captures the appropriate html for creating a fragment to
diff --git a/lib/classes/output/theme_config.php b/lib/classes/output/theme_config.php
index 3a056592ac0..ae937078c93 100644
--- a/lib/classes/output/theme_config.php
+++ b/lib/classes/output/theme_config.php
@@ -16,6 +16,7 @@
 
 namespace core\output;
 
+use block_manager;
 use cache;
 use cache_store;
 use core_component;
@@ -27,6 +28,7 @@ use core_scss;
 use core_useragent;
 use core\context\system as context_system;
 use core\exception\coding_exception;
+use core\output\renderer_factory\renderer_factory_interface as renderer_factory;
 use core\output\renderer_factory\standard_renderer_factory;
 use dml_exception;
 use moodle_page;