diff -u b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
--- b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
+++ b/core/lib/Drupal/Core/Field/BaseFieldDefinition.php
@@ -5,7 +5,6 @@
 use Drupal\Core\Cache\UnchangingCacheableDependencyTrait;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\Entity\BaseFieldOverride;
-use Drupal\Core\Field\TypedData\FieldDefinitionOptionsProviderTrait;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinition;
 use Drupal\Core\TypedData\ListDataDefinition;
 
@@ -16,7 +15,6 @@
 
   use UnchangingCacheableDependencyTrait;
   use FieldInputValueNormalizerTrait;
-  use FieldDefinitionOptionsProviderTrait;
 
   /**
    * The field type.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -2,11 +2,15 @@
 
 namespace Drupal\Core\TypedData;
 
+use Drupal\Core\Field\TypedData\FieldDefinitionOptionsProviderTrait;
+
 /**
  * A typed data definition class for defining lists.
  */
 class ListDataDefinition extends DataDefinition implements ListDataDefinitionInterface {
 
+  use FieldDefinitionOptionsProviderTrait;
+
   /**
    * The data definition of a list item.
    *