diff --git a/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
index 02e5def..4d47afa 100644
--- a/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Core\Block;
 
-use Drupal\block\BlockInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContextAwarePluginAssignmentTrait;
@@ -87,7 +86,7 @@ protected function baseConfigurationDefaults() {
       'id' => $this->getPluginId(),
       'label' => '',
       'provider' => $this->pluginDefinition['provider'],
-      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      'label_display' => static::BLOCK_LABEL_VISIBLE,
     );
   }
 
@@ -172,8 +171,8 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form['label_display'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Display title'),
-      '#default_value' => ($this->configuration['label_display'] === BlockInterface::BLOCK_LABEL_VISIBLE),
-      '#return_value' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      '#default_value' => ($this->configuration['label_display'] === static::BLOCK_LABEL_VISIBLE),
+      '#return_value' => static::BLOCK_LABEL_VISIBLE,
     );
 
     // Add context mapping UI form elements.
diff --git a/core/lib/Drupal/Core/Block/BlockPluginInterface.php b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
index 66ef836..8026b7f 100644
--- a/core/lib/Drupal/Core/Block/BlockPluginInterface.php
+++ b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
@@ -23,6 +23,11 @@
 interface BlockPluginInterface extends ConfigurablePluginInterface, PluginFormInterface, PluginInspectionInterface, CacheableDependencyInterface, DerivativeInspectionInterface {
 
   /**
+   * Indicates the block label (title) should be displayed to end users.
+   */
+  const BLOCK_LABEL_VISIBLE = 'visible';
+
+  /**
    * Returns the user-facing block label.
    *
    * @todo Provide other specific label-related methods in
diff --git a/core/modules/block/src/BlockInterface.php b/core/modules/block/src/BlockInterface.php
index 0056523..85e5b06 100644
--- a/core/modules/block/src/BlockInterface.php
+++ b/core/modules/block/src/BlockInterface.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\block;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
 /**
@@ -11,8 +12,11 @@
 
   /**
    * Indicates the block label (title) should be displayed to end users.
+   *
+   * @deprecated in Drupal 8.3.x, will be removed before Drupal 9.0.0.
+   *   Use \Drupal\Core\Block\BlockPluginInterface::BLOCK_LABEL_VISIBLE.
    */
-  const BLOCK_LABEL_VISIBLE = 'visible';
+  const BLOCK_LABEL_VISIBLE = BlockPluginInterface::BLOCK_LABEL_VISIBLE;
 
   /**
    * Denotes that a block is not enabled in any region and should not be shown.
diff --git a/core/modules/block/src/Plugin/migrate/process/BlockSettings.php b/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
index 134bf28..9f11be8 100644
--- a/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
+++ b/core/modules/block/src/Plugin/migrate/process/BlockSettings.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\block\Plugin\migrate\process;
 
-use Drupal\block\BlockInterface;
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
@@ -24,7 +24,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
     $settings = array();
     $settings['label'] = $title;
     if ($title) {
-      $settings['label_display'] = BlockInterface::BLOCK_LABEL_VISIBLE;
+      $settings['label_display'] = BlockPluginInterface::BLOCK_LABEL_VISIBLE;
     }
     else {
       $settings['label_display'] = '0';
diff --git a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
index 9216d49..5959c0d 100644
--- a/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\block\Kernel;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Form\FormState;
-use Drupal\block\BlockInterface;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -38,7 +38,7 @@ public function testBlockInterface() {
       'id' => 'test_block_instantiation',
       'label' => 'Custom Display Message',
       'provider' => 'block_test',
-      'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+      'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE,
       'display_message' => 'no message set',
     );
     // Initial configuration of the block at construction time.
diff --git a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index 5704476..d31c92c 100644
--- a/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\block\Kernel;
 
+use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Config\Entity\ConfigEntityStorage;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\block_test\Plugin\Block\TestHtmlBlock;
 use Drupal\Component\Plugin\Exception\PluginException;
 use Drupal\block\Entity\Block;
-use Drupal\block\BlockInterface;
 
 /**
  * Tests the storage of blocks.
@@ -95,7 +95,7 @@ protected function createTests() {
         'id' => 'test_html',
         'label' => '',
         'provider' => 'block_test',
-        'label_display' => BlockInterface::BLOCK_LABEL_VISIBLE,
+        'label_display' => BlockPluginInterface::BLOCK_LABEL_VISIBLE,
       ),
       'visibility' => array(),
     );
diff --git a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
index bf4b122..ef67a71 100644
--- a/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
+++ b/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
@@ -6,11 +6,6 @@
 use Drupal\Tests\UnitTestCase;
 use Drupal\views\Plugin\Block\ViewsBlock;
 
-// @todo Remove this once the constant got converted.
-if (!defined('BLOCK_LABEL_VISIBLE')) {
-  define('BLOCK_LABEL_VISIBLE', 'visible');
-}
-
 /**
  * @coversDefaultClass \Drupal\views\Plugin\block\ViewsBlock
  * @group views