diff --git a/core/lib/Drupal/Core/Layout/LayoutDefinition.php b/core/lib/Drupal/Core/Layout/LayoutDefinition.php
index a0a2e499ee3f414e42c0b17bcd7a507e21611e25..afbce7e1c5e7e1a4e0eee7bc963c51fbf13979e8 100644
--- a/core/lib/Drupal/Core/Layout/LayoutDefinition.php
+++ b/core/lib/Drupal/Core/Layout/LayoutDefinition.php
@@ -2,11 +2,11 @@
 
 namespace Drupal\Core\Layout;
 
-use Drupal\Component\Plugin\Definition\DependentPluginDefinitionInterface;
-use Drupal\Component\Plugin\Definition\DependentPluginDefinitionTrait;
 use Drupal\Component\Plugin\Definition\DerivablePluginDefinitionInterface;
 use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\Definition\PluginDefinition;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionTrait;
 
 /**
  * Provides an implementation of a layout definition and its metadata.
diff --git a/core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionInterface.php b/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php
similarity index 93%
rename from core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionInterface.php
rename to core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php
index c190c279c1d72f576ddadb3857cdb49969b0b8f5..ca89113f4a21546be6d270108625ec37cf02a0de 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Component\Plugin\Definition;
+namespace Drupal\Core\Plugin\Definition;
 
 /**
  * Provides an interface for a plugin definition that has dependencies.
diff --git a/core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionTrait.php b/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php
similarity index 92%
rename from core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionTrait.php
rename to core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php
index f56a0d19d3bd9b18d9086e347821dca61e4e15cf..632bf0cd10e4c744a37d422fd8fcfce0912bdec1 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/DependentPluginDefinitionTrait.php
+++ b/core/lib/Drupal/Core/Plugin/Definition/DependentPluginDefinitionTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Component\Plugin\Definition;
+namespace Drupal\Core\Plugin\Definition;
 
 /**
  * Provides a trait for a plugin definition that has dependencies.
diff --git a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
index dd14e5ff80d5e009355f0f12de258927d21a82c5..b9dd9e659d61ffa2e917b82400e317d75e4c9e74 100644
--- a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
+++ b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
@@ -2,11 +2,11 @@
 
 namespace Drupal\Core\Plugin;
 
-use Drupal\Component\Plugin\Definition\DependentPluginDefinitionInterface;
 use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Entity\DependencyTrait;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
 
 /**
  * Provides a trait for calculating the dependencies of a plugin.
diff --git a/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php b/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
index f1363a14c1a6298c859e18782992df611a62cf9e..844c8152d366d0c1183f7f72d29950c5c70ddab4 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/PluginDependencyTraitTest.php
@@ -2,10 +2,10 @@
 
 namespace Drupal\Tests\Core\Plugin;
 
-use Drupal\Component\Plugin\Definition\DependentPluginDefinitionInterface;
 use Drupal\Component\Plugin\Definition\PluginDefinitionInterface;
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Component\Plugin\PluginInspectionInterface;
+use Drupal\Core\Plugin\Definition\DependentPluginDefinitionInterface;
 use Drupal\Core\Plugin\PluginDependencyTrait;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\Prophecy\ProphecyInterface;