diff --git a/reportbuilder/classes/output/audience_heading_editable.php b/reportbuilder/classes/output/audience_heading_editable.php
index c2e0b122dd0..99ade059ea8 100644
--- a/reportbuilder/classes/output/audience_heading_editable.php
+++ b/reportbuilder/classes/output/audience_heading_editable.php
@@ -18,17 +18,12 @@ declare(strict_types=1);
 
 namespace core_reportbuilder\output;
 
-use core_external;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\audiences\base;
 use core_reportbuilder\local\models\audience;
 
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once("{$CFG->libdir}/external/externallib.php");
-
 /**
  * Audience heading editable component
  *
@@ -77,7 +72,7 @@ class audience_heading_editable extends inplace_editable {
 
         $report = $audience->get_report();
 
-        core_external::validate_context($report->get_context());
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = clean_param($value, PARAM_TEXT);
diff --git a/reportbuilder/classes/output/column_aggregation_editable.php b/reportbuilder/classes/output/column_aggregation_editable.php
index 7de8314d00b..1b42f83c287 100644
--- a/reportbuilder/classes/output/column_aggregation_editable.php
+++ b/reportbuilder/classes/output/column_aggregation_editable.php
@@ -18,18 +18,13 @@ declare(strict_types=1);
 
 namespace core_reportbuilder\output;
 
-use core_external;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\manager;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\helpers\aggregation;
 use core_reportbuilder\local\models\column;
 
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once("{$CFG->libdir}/external/externallib.php");
-
 /**
  * Column aggregation editable component
  *
@@ -81,7 +76,7 @@ class column_aggregation_editable extends inplace_editable {
 
         $report = $column->get_report();
 
-        core_external::validate_context($report->get_context());
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = clean_param($value, PARAM_TEXT);
diff --git a/reportbuilder/classes/output/column_heading_editable.php b/reportbuilder/classes/output/column_heading_editable.php
index e892890b760..6bf7c30fecd 100644
--- a/reportbuilder/classes/output/column_heading_editable.php
+++ b/reportbuilder/classes/output/column_heading_editable.php
@@ -18,17 +18,12 @@ declare(strict_types=1);
 
 namespace core_reportbuilder\output;
 
-use core_external;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\manager;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\models\column;
 
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once("{$CFG->libdir}/external/externallib.php");
-
 /**
  * Column heading editable component
  *
@@ -78,7 +73,7 @@ class column_heading_editable extends inplace_editable {
 
         $report = $column->get_report();
 
-        core_external::validate_context($report->get_context());
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = clean_param($value, PARAM_TEXT);
diff --git a/reportbuilder/classes/output/filter_heading_editable.php b/reportbuilder/classes/output/filter_heading_editable.php
index 9114c2e6a47..56bd72a05de 100644
--- a/reportbuilder/classes/output/filter_heading_editable.php
+++ b/reportbuilder/classes/output/filter_heading_editable.php
@@ -18,17 +18,12 @@ declare(strict_types=1);
 
 namespace core_reportbuilder\output;
 
-use core_external;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\manager;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\models\filter;
 
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once("{$CFG->libdir}/external/externallib.php");
-
 /**
  * Filter heading editable component
  *
@@ -77,7 +72,8 @@ class filter_heading_editable extends inplace_editable {
         $filter = new filter($filterid);
 
         $report = $filter->get_report();
-        core_external::validate_context($report->get_context());
+
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = clean_param($value, PARAM_TEXT);
diff --git a/reportbuilder/classes/output/report_name_editable.php b/reportbuilder/classes/output/report_name_editable.php
index 03eca76d407..f1dfd2e4a73 100644
--- a/reportbuilder/classes/output/report_name_editable.php
+++ b/reportbuilder/classes/output/report_name_editable.php
@@ -21,6 +21,7 @@ namespace core_reportbuilder\output;
 use html_writer;
 use moodle_url;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\models\report;
 
@@ -67,7 +68,7 @@ class report_name_editable extends inplace_editable {
     public static function update(int $reportid, string $value): self {
         $report = new report($reportid);
 
-        \core_external\external_api::validate_context($report->get_context());
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = trim(clean_param($value, PARAM_TEXT));
diff --git a/reportbuilder/classes/output/schedule_name_editable.php b/reportbuilder/classes/output/schedule_name_editable.php
index 88e80d53ef4..ac1791dda35 100644
--- a/reportbuilder/classes/output/schedule_name_editable.php
+++ b/reportbuilder/classes/output/schedule_name_editable.php
@@ -18,16 +18,11 @@ declare(strict_types=1);
 
 namespace core_reportbuilder\output;
 
-use core_external;
 use core\output\inplace_editable;
+use core_external\external_api;
 use core_reportbuilder\permission;
 use core_reportbuilder\local\models\schedule;
 
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once("{$CFG->libdir}/external/externallib.php");
-
 /**
  * Schedule name editable component
  *
@@ -69,7 +64,7 @@ class schedule_name_editable extends inplace_editable {
 
         $report = $schedule->get_report();
 
-        core_external::validate_context($report->get_context());
+        external_api::validate_context($report->get_context());
         permission::require_can_edit_report($report);
 
         $value = trim(clean_param($value, PARAM_TEXT));