diff --git a/blocks/activity_modules/classes/privacy/provider.php b/blocks/activity_modules/classes/privacy/provider.php
index cf4c01dad05..02acf761df5 100644
--- a/blocks/activity_modules/classes/privacy/provider.php
+++ b/blocks/activity_modules/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/activity_results/classes/privacy/provider.php b/blocks/activity_results/classes/privacy/provider.php
index ef48fc7fe40..bfaca021251 100644
--- a/blocks/activity_results/classes/privacy/provider.php
+++ b/blocks/activity_results/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/admin_bookmarks/classes/privacy/provider.php b/blocks/admin_bookmarks/classes/privacy/provider.php
index c6ffebb9d01..1a6d4c5417c 100644
--- a/blocks/admin_bookmarks/classes/privacy/provider.php
+++ b/blocks/admin_bookmarks/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/badges/classes/privacy/provider.php b/blocks/badges/classes/privacy/provider.php
index a61187ed6c6..b35d83677e6 100644
--- a/blocks/badges/classes/privacy/provider.php
+++ b/blocks/badges/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/blog_menu/classes/privacy/provider.php b/blocks/blog_menu/classes/privacy/provider.php
index 4ca19d9c33a..0599844d0df 100644
--- a/blocks/blog_menu/classes/privacy/provider.php
+++ b/blocks/blog_menu/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/blog_recent/classes/privacy/provider.php b/blocks/blog_recent/classes/privacy/provider.php
index f9a8616e4ed..61e9c5edec8 100644
--- a/blocks/blog_recent/classes/privacy/provider.php
+++ b/blocks/blog_recent/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/blog_tags/classes/privacy/provider.php b/blocks/blog_tags/classes/privacy/provider.php
index 5d7166eb589..5733b6cc14b 100644
--- a/blocks/blog_tags/classes/privacy/provider.php
+++ b/blocks/blog_tags/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/calendar_month/classes/privacy/provider.php b/blocks/calendar_month/classes/privacy/provider.php
index 80a0d5660ba..b42aa51ddf3 100644
--- a/blocks/calendar_month/classes/privacy/provider.php
+++ b/blocks/calendar_month/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/calendar_upcoming/classes/privacy/provider.php b/blocks/calendar_upcoming/classes/privacy/provider.php
index 6dd5b52fab2..303ea6154d1 100644
--- a/blocks/calendar_upcoming/classes/privacy/provider.php
+++ b/blocks/calendar_upcoming/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/completionstatus/classes/privacy/provider.php b/blocks/completionstatus/classes/privacy/provider.php
index 1de53b3a076..7309c6e2434 100644
--- a/blocks/completionstatus/classes/privacy/provider.php
+++ b/blocks/completionstatus/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/course_list/classes/privacy/provider.php b/blocks/course_list/classes/privacy/provider.php
index 0475b790ea4..db069b6231b 100644
--- a/blocks/course_list/classes/privacy/provider.php
+++ b/blocks/course_list/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/course_summary/classes/privacy/provider.php b/blocks/course_summary/classes/privacy/provider.php
index 2fa5fed1e75..6fdb8328524 100644
--- a/blocks/course_summary/classes/privacy/provider.php
+++ b/blocks/course_summary/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/feedback/classes/privacy/provider.php b/blocks/feedback/classes/privacy/provider.php
index d0f2c4dd35c..43013097e9d 100644
--- a/blocks/feedback/classes/privacy/provider.php
+++ b/blocks/feedback/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/globalsearch/classes/privacy/provider.php b/blocks/globalsearch/classes/privacy/provider.php
index 2748c7fdca4..ce7d56264da 100644
--- a/blocks/globalsearch/classes/privacy/provider.php
+++ b/blocks/globalsearch/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/glossary_random/classes/privacy/provider.php b/blocks/glossary_random/classes/privacy/provider.php
index d3782c2c421..c4d79a6a64e 100644
--- a/blocks/glossary_random/classes/privacy/provider.php
+++ b/blocks/glossary_random/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/login/classes/privacy/provider.php b/blocks/login/classes/privacy/provider.php
index 860f9e90408..331e741eabe 100644
--- a/blocks/login/classes/privacy/provider.php
+++ b/blocks/login/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/lp/classes/privacy/provider.php b/blocks/lp/classes/privacy/provider.php
index 19227b46d67..0db61de9da8 100644
--- a/blocks/lp/classes/privacy/provider.php
+++ b/blocks/lp/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/mentees/classes/privacy/provider.php b/blocks/mentees/classes/privacy/provider.php
index 06cf8340034..e8b4ca7ae11 100644
--- a/blocks/mentees/classes/privacy/provider.php
+++ b/blocks/mentees/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/messages/classes/privacy/provider.php b/blocks/messages/classes/privacy/provider.php
new file mode 100644
index 00000000000..c8c219e52ef
--- /dev/null
+++ b/blocks/messages/classes/privacy/provider.php
@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Privacy Subsystem implementation for block_messages.
+ *
+ * @package    block_messages
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace block_messages\privacy;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Privacy Subsystem for block_messages implementing null_provider.
+ *
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements \core_privacy\local\metadata\null_provider {
+
+    /**
+     * Get the language string identifier with the component's language
+     * file to explain why this plugin stores no data.
+     *
+     * @return  string
+     */
+    public static function get_reason() {
+        return 'privacy:metadata';
+    }
+}
diff --git a/blocks/messages/lang/en/block_messages.php b/blocks/messages/lang/en/block_messages.php
index c41e51c1f23..082be693d9a 100644
--- a/blocks/messages/lang/en/block_messages.php
+++ b/blocks/messages/lang/en/block_messages.php
@@ -25,3 +25,4 @@
 $string['messages:addinstance'] = 'Add a new messages block';
 $string['messages:myaddinstance'] = 'Add a new messages block to Dashboard';
 $string['pluginname'] = 'Messages';
+$string['privacy:metadata'] = 'The Messages block only shows data stored in other locations.';
diff --git a/blocks/mnet_hosts/classes/privacy/provider.php b/blocks/mnet_hosts/classes/privacy/provider.php
index 74aa156af83..a60c5e25646 100644
--- a/blocks/mnet_hosts/classes/privacy/provider.php
+++ b/blocks/mnet_hosts/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/myoverview/classes/privacy/provider.php b/blocks/myoverview/classes/privacy/provider.php
index 9a24451844f..925b66a2b41 100644
--- a/blocks/myoverview/classes/privacy/provider.php
+++ b/blocks/myoverview/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/myprofile/classes/privacy/provider.php b/blocks/myprofile/classes/privacy/provider.php
index 82070f4443b..7652de0efd2 100644
--- a/blocks/myprofile/classes/privacy/provider.php
+++ b/blocks/myprofile/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/navigation/classes/privacy/provider.php b/blocks/navigation/classes/privacy/provider.php
index e23478d6ecf..70d10376437 100644
--- a/blocks/navigation/classes/privacy/provider.php
+++ b/blocks/navigation/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/news_items/classes/privacy/provider.php b/blocks/news_items/classes/privacy/provider.php
index 8dc48e2fd78..bd20ef94be8 100644
--- a/blocks/news_items/classes/privacy/provider.php
+++ b/blocks/news_items/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/online_users/classes/privacy/provider.php b/blocks/online_users/classes/privacy/provider.php
index df5e8c9fcf7..0d6304acbcd 100644
--- a/blocks/online_users/classes/privacy/provider.php
+++ b/blocks/online_users/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/participants/classes/privacy/provider.php b/blocks/participants/classes/privacy/provider.php
index 9e052a008c2..ff57d5c23ef 100644
--- a/blocks/participants/classes/privacy/provider.php
+++ b/blocks/participants/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/private_files/classes/privacy/provider.php b/blocks/private_files/classes/privacy/provider.php
index 34cdb40b117..23931f08150 100644
--- a/blocks/private_files/classes/privacy/provider.php
+++ b/blocks/private_files/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/quiz_results/classes/privacy/provider.php b/blocks/quiz_results/classes/privacy/provider.php
index 2bae2256347..6f3fbb60e4b 100644
--- a/blocks/quiz_results/classes/privacy/provider.php
+++ b/blocks/quiz_results/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/search_forums/classes/privacy/provider.php b/blocks/search_forums/classes/privacy/provider.php
index 684e4ff3142..81809202108 100644
--- a/blocks/search_forums/classes/privacy/provider.php
+++ b/blocks/search_forums/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/section_links/classes/privacy/provider.php b/blocks/section_links/classes/privacy/provider.php
index 22e99ee3539..e102a0003fb 100644
--- a/blocks/section_links/classes/privacy/provider.php
+++ b/blocks/section_links/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/selfcompletion/classes/privacy/provider.php b/blocks/selfcompletion/classes/privacy/provider.php
index 68d11a429d8..104c8ba2166 100644
--- a/blocks/selfcompletion/classes/privacy/provider.php
+++ b/blocks/selfcompletion/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/settings/classes/privacy/provider.php b/blocks/settings/classes/privacy/provider.php
index a21cf05a6fa..1491cab4af8 100644
--- a/blocks/settings/classes/privacy/provider.php
+++ b/blocks/settings/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/site_main_menu/classes/privacy/provider.php b/blocks/site_main_menu/classes/privacy/provider.php
index cae61f25f0c..6480e7f0b9d 100644
--- a/blocks/site_main_menu/classes/privacy/provider.php
+++ b/blocks/site_main_menu/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/social_activities/classes/privacy/provider.php b/blocks/social_activities/classes/privacy/provider.php
index d6aa601e61e..ce4868ad078 100644
--- a/blocks/social_activities/classes/privacy/provider.php
+++ b/blocks/social_activities/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/tag_flickr/classes/privacy/provider.php b/blocks/tag_flickr/classes/privacy/provider.php
index 28a004d43a0..2e1736be6f2 100644
--- a/blocks/tag_flickr/classes/privacy/provider.php
+++ b/blocks/tag_flickr/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/tag_youtube/classes/privacy/provider.php b/blocks/tag_youtube/classes/privacy/provider.php
index 6076e3bddd0..f0ef08cc8e6 100644
--- a/blocks/tag_youtube/classes/privacy/provider.php
+++ b/blocks/tag_youtube/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language
diff --git a/blocks/tags/classes/privacy/provider.php b/blocks/tags/classes/privacy/provider.php
index d0425dfe4ad..043b4760fb4 100644
--- a/blocks/tags/classes/privacy/provider.php
+++ b/blocks/tags/classes/privacy/provider.php
@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class provider implements \core_privacy\metadata\null_provider {
+class provider implements \core_privacy\local\metadata\null_provider {
 
     /**
      * Get the language string identifier with the component's language