diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc
--- b/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Functions for installing Drupal.
+ * API functions for installing Drupal.
  */
 
 use Drupal\Component\Utility\UrlHelper;
@@ -34,11 +34,6 @@
 use GuzzleHttp\Exception\RequestException;
 
 /**
- * @file
- * API functions for installing Drupal.
- */
-
-/**
  * Do not run the task during the current installation request.
  *
  * This can be used to skip running an installation task when certain
diff -u b/core/modules/comment/comment.api.php b/core/modules/comment/comment.api.php
--- b/core/modules/comment/comment.api.php
+++ b/core/modules/comment/comment.api.php
@@ -3,16 +3,11 @@
 /**
  * @file
- * Documentation for comment module.
+ * Hooks provided by the Comment module.
  */
 
 use Drupal\comment\CommentInterface;
 use Drupal\Core\Url;
 
 /**
- * @file
- * Hooks provided by the Comment module.
- */
-
-/**
  * @addtogroup hooks
  * @{
diff -u b/core/modules/field/tests/modules/field_test/field_test.module b/core/modules/field/tests/modules/field_test/field_test.module
--- b/core/modules/field/tests/modules/field_test/field_test.module
+++ b/core/modules/field/tests/modules/field_test/field_test.module
@@ -4,11 +4,2 @@
  * @file
- * Test module.
- */
-
-use Drupal\field\FieldStorageConfigInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * @file
  * Helper module for the Field API tests.
@@ -22,6 +13,10 @@
  * test helper functions
  */
 
+use Drupal\field\FieldStorageConfigInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\field\Entity\FieldStorageConfig;
+
 require_once __DIR__ . '/field_test.entity.inc';
 require_once __DIR__ . '/field_test.field.inc';
 
diff -u b/core/modules/node/node.api.php b/core/modules/node/node.api.php
--- b/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Node API documentation.
+ * Hooks specific to the Node module.
  */
 
 use Drupal\node\NodeInterface;
@@ -12,9 +12,4 @@
 
 /**
- * @file
- * Hooks specific to the Node module.
- */
-
-/**
  * @addtogroup hooks
  * @{
diff -u b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
--- b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
+++ b/core/modules/search/tests/modules/search_query_alter/search_query_alter.module
@@ -3,15 +3,10 @@
 /**
  * @file
- * Test module.
+ * Test module that alters search queries.
  */
 
 use Drupal\Core\Database\Query\AlterableInterface;
 
 /**
- * @file
- * Test module that alters search queries.
- */
-
-/**
  * Implements hook_query_TAG_alter(): tag search_$type with $type node_search.
  */
diff -u b/core/modules/update/tests/modules/update_test/update_test.module b/core/modules/update/tests/modules/update_test/update_test.module
--- b/core/modules/update/tests/modules/update_test/update_test.module
+++ b/core/modules/update/tests/modules/update_test/update_test.module
@@ -3,15 +3,10 @@
 /**
  * @file
- * Test module.
+ * Module for testing Update Manager functionality.
  */
 
 use Drupal\Core\Extension\Extension;
 
 /**
- * @file
- * Module for testing Update Manager functionality.
- */
-
-/**
  * Implements hook_system_info_alter().
  *