diff --git a/admin/tool/log/classes/plugininfo/logstore.php b/admin/tool/log/classes/plugininfo/logstore.php
index bbbb46d8277..cb7bb647fe0 100644
--- a/admin/tool/log/classes/plugininfo/logstore.php
+++ b/admin/tool/log/classes/plugininfo/logstore.php
@@ -23,9 +23,10 @@
  */
 namespace tool_log\plugininfo;
 
-use core\plugininfo\base, moodle_url, part_of_admin_tree, admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use core\plugininfo\base;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Plugin info class for logging store plugins.
diff --git a/lib/classes/plugininfo/antivirus.php b/lib/classes/plugininfo/antivirus.php
index 50952b6758d..93bdd72fab5 100644
--- a/lib/classes/plugininfo/antivirus.php
+++ b/lib/classes/plugininfo/antivirus.php
@@ -23,10 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
-
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for Antiviruses
diff --git a/lib/classes/plugininfo/auth.php b/lib/classes/plugininfo/auth.php
index 091c797a1f2..1ea8eb10213 100644
--- a/lib/classes/plugininfo/auth.php
+++ b/lib/classes/plugininfo/auth.php
@@ -23,9 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for authentication plugins
diff --git a/lib/classes/plugininfo/availability.php b/lib/classes/plugininfo/availability.php
index b8edd612138..c89ead9af01 100644
--- a/lib/classes/plugininfo/availability.php
+++ b/lib/classes/plugininfo/availability.php
@@ -25,8 +25,6 @@ namespace core\plugininfo;
 
 use admin_settingpage;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class for availability plugins.
  *
diff --git a/lib/classes/plugininfo/block.php b/lib/classes/plugininfo/block.php
index 860699959f1..5f7e1ce1368 100644
--- a/lib/classes/plugininfo/block.php
+++ b/lib/classes/plugininfo/block.php
@@ -23,9 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for page side blocks
diff --git a/lib/classes/plugininfo/contenttype.php b/lib/classes/plugininfo/contenttype.php
index b129f93e80a..ec4a581a33e 100644
--- a/lib/classes/plugininfo/contenttype.php
+++ b/lib/classes/plugininfo/contenttype.php
@@ -23,8 +23,6 @@
  */
 namespace core\plugininfo;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class for contentbank plugins
  *
diff --git a/lib/classes/plugininfo/customfield.php b/lib/classes/plugininfo/customfield.php
index 3b0e5ee63eb..e3a481eb087 100644
--- a/lib/classes/plugininfo/customfield.php
+++ b/lib/classes/plugininfo/customfield.php
@@ -23,10 +23,8 @@
  */
 namespace core\plugininfo;
 
-use moodle_url;
 use admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
+use moodle_url;
 
 /**
  * Class for admin tool plugins
diff --git a/lib/classes/plugininfo/dataformat.php b/lib/classes/plugininfo/dataformat.php
index 4ac86909b93..9b605d13b8b 100644
--- a/lib/classes/plugininfo/dataformat.php
+++ b/lib/classes/plugininfo/dataformat.php
@@ -23,9 +23,10 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, admin_externalpage, core_plugin_manager;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use core_plugin_manager;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for dataformats
diff --git a/lib/classes/plugininfo/enrol.php b/lib/classes/plugininfo/enrol.php
index 4e3fa121db5..311b8dc9fd0 100644
--- a/lib/classes/plugininfo/enrol.php
+++ b/lib/classes/plugininfo/enrol.php
@@ -23,15 +23,16 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for enrolment plugins
  */
 class enrol extends base {
     /**
+     *
      * Finds all enabled plugins, the result may include missing plugins.
      * @return array|null of enabled plugins $pluginname=>$pluginname, null means unknown
      */
diff --git a/lib/classes/plugininfo/fileconverter.php b/lib/classes/plugininfo/fileconverter.php
index 8534d7867f9..5b1c20a3143 100644
--- a/lib/classes/plugininfo/fileconverter.php
+++ b/lib/classes/plugininfo/fileconverter.php
@@ -23,8 +23,6 @@
  */
 namespace core\plugininfo;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class for document converter plugins
  *
diff --git a/lib/classes/plugininfo/filter.php b/lib/classes/plugininfo/filter.php
index 0f3b7419e84..d3e39a25043 100644
--- a/lib/classes/plugininfo/filter.php
+++ b/lib/classes/plugininfo/filter.php
@@ -23,9 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for text filters
diff --git a/lib/classes/plugininfo/media.php b/lib/classes/plugininfo/media.php
index c2b0f72c7fe..bc3a8a10be2 100644
--- a/lib/classes/plugininfo/media.php
+++ b/lib/classes/plugininfo/media.php
@@ -23,8 +23,6 @@
  */
 namespace core\plugininfo;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class for media plugins
  *
diff --git a/lib/classes/plugininfo/message.php b/lib/classes/plugininfo/message.php
index bcb4c336231..add8c12bb94 100644
--- a/lib/classes/plugininfo/message.php
+++ b/lib/classes/plugininfo/message.php
@@ -23,9 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for messaging processors
diff --git a/lib/classes/plugininfo/mod.php b/lib/classes/plugininfo/mod.php
index 58bcc54f8f5..4756f6da6be 100644
--- a/lib/classes/plugininfo/mod.php
+++ b/lib/classes/plugininfo/mod.php
@@ -23,9 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for activity modules
diff --git a/lib/classes/plugininfo/paygw.php b/lib/classes/plugininfo/paygw.php
index 1b89d5aff2e..83c63cc9c4a 100644
--- a/lib/classes/plugininfo/paygw.php
+++ b/lib/classes/plugininfo/paygw.php
@@ -24,8 +24,6 @@
 
 namespace core\plugininfo;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Payment gateway subplugin info class.
  *
diff --git a/lib/classes/plugininfo/portfolio.php b/lib/classes/plugininfo/portfolio.php
index c6e45751873..4ae4f3da0ce 100644
--- a/lib/classes/plugininfo/portfolio.php
+++ b/lib/classes/plugininfo/portfolio.php
@@ -23,9 +23,7 @@
  */
 namespace core\plugininfo;
 
-use core_component, core_plugin_manager, moodle_url, coding_exception;
-
-defined('MOODLE_INTERNAL') || die();
+use moodle_url;
 
 /**
  * Class for portfolios
diff --git a/lib/classes/plugininfo/qbank.php b/lib/classes/plugininfo/qbank.php
index 92bcfa85dc1..9a7556b5cb4 100644
--- a/lib/classes/plugininfo/qbank.php
+++ b/lib/classes/plugininfo/qbank.php
@@ -25,8 +25,6 @@
 
 namespace core\plugininfo;
 
-use qbank_columnsortorder\column_manager;
-
 /**
  * Base class for qbank plugins.
  *
diff --git a/lib/classes/plugininfo/qbehaviour.php b/lib/classes/plugininfo/qbehaviour.php
index 01220dcbb9d..00f08bf144a 100644
--- a/lib/classes/plugininfo/qbehaviour.php
+++ b/lib/classes/plugininfo/qbehaviour.php
@@ -23,9 +23,8 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, core_plugin_manager;
-
-defined('MOODLE_INTERNAL') || die();
+use core_plugin_manager;
+use moodle_url;
 
 /**
  * Class for question behaviours.
diff --git a/lib/classes/plugininfo/qtype.php b/lib/classes/plugininfo/qtype.php
index f03490609cf..4f42e09a4d9 100644
--- a/lib/classes/plugininfo/qtype.php
+++ b/lib/classes/plugininfo/qtype.php
@@ -23,9 +23,10 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_settingpage, core_plugin_manager;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use core_plugin_manager;
+use moodle_url;
+use part_of_admin_tree;
 
 /**
  * Class for question types
diff --git a/lib/classes/plugininfo/repository.php b/lib/classes/plugininfo/repository.php
index ce77bf2b0fd..58ef3a624b2 100644
--- a/lib/classes/plugininfo/repository.php
+++ b/lib/classes/plugininfo/repository.php
@@ -23,7 +23,9 @@
  */
 namespace core\plugininfo;
 
-use moodle_url, part_of_admin_tree, admin_externalpage;
+use admin_externalpage;
+use moodle_url;
+use part_of_admin_tree;
 
 defined('MOODLE_INTERNAL') || die();
 require_once($CFG->dirroot . '/repository/lib.php');
diff --git a/lib/classes/plugininfo/webservice.php b/lib/classes/plugininfo/webservice.php
index 1c859cbbb28..8eb60a243e2 100644
--- a/lib/classes/plugininfo/webservice.php
+++ b/lib/classes/plugininfo/webservice.php
@@ -23,9 +23,8 @@
  */
 namespace core\plugininfo;
 
-use part_of_admin_tree, admin_settingpage;
-
-defined('MOODLE_INTERNAL') || die();
+use admin_settingpage;
+use part_of_admin_tree;
 
 /**
  * Class for webservice protocols
diff --git a/mod/assign/classes/plugininfo/assignfeedback.php b/mod/assign/classes/plugininfo/assignfeedback.php
index 61cf6df0615..6fad64e9793 100644
--- a/mod/assign/classes/plugininfo/assignfeedback.php
+++ b/mod/assign/classes/plugininfo/assignfeedback.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace mod_assign\plugininfo;
+
+use core\plugininfo\base;
+use core_plugin_manager;
+use moodle_url;
+
 /**
  * Assign feedback subplugin info class.
  *
@@ -21,14 +27,9 @@
  * @copyright 2013 Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace mod_assign\plugininfo;
-
-use core\plugininfo\base, core_plugin_manager, moodle_url;
-
-defined('MOODLE_INTERNAL') || die();
-
-
 class assignfeedback extends base {
+
+
     /**
      * Finds all enabled plugins, the result may include missing plugins.
      * @return array|null of enabled plugins $pluginname=>$pluginname, null means unknown
diff --git a/mod/assign/classes/plugininfo/assignsubmission.php b/mod/assign/classes/plugininfo/assignsubmission.php
index 4a0fec33b0e..4a31be0bb73 100644
--- a/mod/assign/classes/plugininfo/assignsubmission.php
+++ b/mod/assign/classes/plugininfo/assignsubmission.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace mod_assign\plugininfo;
+
+use core\plugininfo\base;
+use core_plugin_manager;
+use moodle_url;
+
 /**
  * Assign submission subplugin info class.
  *
@@ -21,14 +27,9 @@
  * @copyright 2013 Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-namespace mod_assign\plugininfo;
-
-use core\plugininfo\base, core_plugin_manager, moodle_url;
-
-defined('MOODLE_INTERNAL') || die();
-
-
 class assignsubmission extends base {
+
+
     /**
      * Finds all enabled plugins, the result may include missing plugins.
      * @return array|null of enabled plugins $pluginname=>$pluginname, null means unknown