diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
index 773ec38..908f040 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Binary.php
@@ -22,7 +22,7 @@
  *
  * @DataType(
  *   id = "binary",
- *   label = @Translation("Binary"),
+ *   label = @Translation("Binary")
  * )
  */
 class Binary extends PrimitiveBase implements BinaryInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
index d85767c..5c87f6a 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Boolean.php
@@ -20,7 +20,7 @@
  *
  * @DataType(
  *   id = "boolean",
- *   label = @Translation("Boolean"),
+ *   label = @Translation("Boolean")
  * )
  */
 class Boolean extends PrimitiveBase implements BooleanInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
index f1c7f86..59bbe8a 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DateTimeIso8601.php
@@ -19,7 +19,7 @@
  *
  * @DataType(
  *   id = "datetime_iso8601",
- *   label = @Translation("Date"),
+ *   label = @Translation("Date")
  * )
  */
 class DateTimeIso8601 extends String implements DateTimeInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
index 1492a19..8afd4fb 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/DurationIso8601.php
@@ -18,7 +18,7 @@
  *
  * @DataType(
  *   id = "duration",
- *   label = @Translation("Duration"),
+ *   label = @Translation("Duration")
  * )
  */
 class DurationIso8601 extends String implements DurationInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
index 9c26ec6..463e8f0 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Float.php
@@ -20,7 +20,7 @@
  *
  * @DataType(
  *   id = "float",
- *   label = @Translation("Float"),
+ *   label = @Translation("Float")
  * )
  */
 class Float extends PrimitiveBase implements FloatInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
index bf99208..33625ad 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Integer.php
@@ -20,7 +20,7 @@
  *
  * @DataType(
  *   id = "integer",
- *   label = @Translation("Integer"),
+ *   label = @Translation("Integer")
  * )
  */
 class Integer extends PrimitiveBase implements IntegerInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
index 13c7efa..3c060b7 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/String.php
@@ -20,7 +20,7 @@
  *
  * @DataType(
  *   id = "string",
- *   label = @Translation("String"),
+ *   label = @Translation("String")
  * )
  */
 class String extends PrimitiveBase implements StringInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
index 6fc8fd8..b0ec72a 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/TimeSpan.php
@@ -7,6 +7,10 @@
 
 namespace Drupal\Core\TypedData\Plugin\DataType;
 
+use Drupal\Core\TypedData\Annotation\DataType;
+use Drupal\Core\Annotation\Translation;
+use Drupal\Core\TypedData\Type\DurationInterface;
+
 /**
  * The time span data type represents durations as number of seconds.
  *
@@ -18,7 +22,7 @@
  *
  * @DataType(
  *   id = "timespan",
- *   label = @Translation("Time span in seconds"),
+ *   label = @Translation("Time span in seconds")
  * )
  *
  * @see \Drupal\Core\TypedData\Type\DurationIso8601
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
index 400a23e..eba1c6e 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Timestamp.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\Core\TypedData\Type;
 
+use Drupal\Core\TypedData\Annotation\DataType;
+use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\TypedData\Type\DateTimeInterface;
 
@@ -15,7 +17,7 @@
  *
  * @DataType(
  *   id = "timestamp",
- *   label = @Translation("String"),
+ *   label = @Translation("String")
  * )
  */
 class Timestamp extends Integer implements DateTimeInterface {
diff --git a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
index 7015cce..d41fa3c 100644
--- a/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
+++ b/core/lib/Drupal/Core/TypedData/Plugin/DataType/Uri.php
@@ -20,7 +20,7 @@
  *
  * @DataType(
  *   id = "uri",
- *   label = @Translation("URI"),
+ *   label = @Translation("URI")
  * )
  */
 class Uri extends PrimitiveBase implements UriInterface {