diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListBooleanItem.php b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListBooleanItem.php
index d77cfd6..5f26d57 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListBooleanItem.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListBooleanItem.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\Annotation\FieldType;
 use Drupal\Core\Annotation\Translation;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\FieldInterface;
 
 /**
  * Plugin implementation of the 'list_boolean' field type.
@@ -39,7 +39,7 @@ class ListBooleanItem extends ListItemBase {
   /**
    * {@inheritdoc}
    */
-  public static function schema(Field $field) {
+  public static function schema(FieldInterface $field) {
     return parent::schema($field) + array(
      'columns' => array(
        'value' => array(
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListFloatItem.php b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListFloatItem.php
index e5f6a75..5107d51 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListFloatItem.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListFloatItem.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\Annotation\FieldType;
 use Drupal\Core\Annotation\Translation;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\FieldInterface;
 
 /**
  * Plugin implementation of the 'list_float' field type.
@@ -39,7 +39,7 @@ class ListFloatItem extends ListItemBase {
   /**
    * {@inheritdoc}
    */
-  public static function schema(Field $field) {
+  public static function schema(FieldInterface $field) {
     return parent::schema($field) + array(
      'columns' => array(
        'value' => array(
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListIntegerItem.php b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListIntegerItem.php
index dbc1d51..8b4248b 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListIntegerItem.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListIntegerItem.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\Annotation\FieldType;
 use Drupal\Core\Annotation\Translation;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\FieldInterface;
 
 /**
  * Plugin implementation of the 'list_integer' field type.
@@ -39,7 +39,7 @@ class ListIntegerItem extends ListItemBase {
   /**
    * {@inheritdoc}
    */
-  public static function schema(Field $field) {
+  public static function schema(FieldInterface $field) {
     return parent::schema($field) + array(
      'columns' => array(
        'value' => array(
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListItemBase.php b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListItemBase.php
index da35e2c..bc2a19b 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListItemBase.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListItemBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\options\Plugin\field\field_type;
 
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\FieldInterface;
 use Drupal\field\Plugin\Type\FieldType\ConfigFieldItemBase;
 
 /**
@@ -18,7 +18,7 @@
   /**
    * {@inheritdoc}
    */
-  public static function schema(Field $field) {
+  public static function schema(FieldInterface $field) {
     return array(
      'indexes' => array(
        'value' => array('value'),
@@ -29,7 +29,7 @@ public static function schema(Field $field) {
   /**
    * {@inheritdoc}
    */
-  public function settingsForm(array $form, array &$form_state) {
+  public function settingsForm(array $form, array &$form_state, $has_data) {
     $instance = $this->getInstance();
     $field = $instance->getField();
     $settings = $field->getFieldSettings();
diff --git a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListTextItem.php b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListTextItem.php
index 0672bb6..25575f7 100644
--- a/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListTextItem.php
+++ b/core/modules/options/lib/Drupal/options/Plugin/field/field_type/ListTextItem.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\Annotation\FieldType;
 use Drupal\Core\Annotation\Translation;
-use Drupal\field\Plugin\Core\Entity\Field;
+use Drupal\field\FieldInterface;
 
 /**
  * Plugin implementation of the 'list_text' field type.
@@ -39,7 +39,7 @@ class ListTextItem extends ListItemBase {
   /**
    * {@inheritdoc}
    */
-  public static function schema(Field $field) {
+  public static function schema(FieldInterface $field) {
     return parent::schema($field) + array(
      'columns' => array(
        'value' => array(