diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index aba311e..ff0b4cb 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -3,11 +3,6 @@
 /**
  * @file
  * Batch processing API for processes to run in multiple HTTP requests.
- */
-
-use \Symfony\Component\HttpFoundation\JsonResponse;
-
- /**
  *
  * Note that batches are usually invoked by form submissions, which is
  * why the core interaction functions of the batch processing API live in
@@ -19,6 +14,8 @@
  * @see batch_get()
  */
 
+use \Symfony\Component\HttpFoundation\JsonResponse;
+
 /**
  * Loads a batch from the database.
  *
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index a544403..dfb61e1 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -1,25 +1,24 @@
 <?php
 
-/**
- * @file
- * Functions that need to be loaded on every Drupal request.
- */
-
-use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Database\Database;
 use Symfony\Component\ClassLoader\UniversalClassLoader;
+use Symfony\Component\ClassLoader\ApcUniversalClassLoader;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException as DependencyInjectionRuntimeException;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException as DependencyInjectionRuntimeException;
 use Symfony\Component\HttpFoundation\Request;
-
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Database\Database;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Lock\DatabaseLockBackend;
 use Drupal\Core\Lock\LockBackendInterface;
 
 /**
+ * @file
+ * Functions that need to be loaded on every Drupal request.
+ */
+
+/**
  * The current system version.
  */
 const VERSION = '8.0-dev';
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 250a7da..47e9f95 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1,13 +1,5 @@
 <?php
 
-/**
- * @file
- * Common functions that many Drupal modules will need to reference.
- *
- * The functions that are critical and need to be available even when serving
- * a cached page are instead located in bootstrap.inc.
- */
-
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -17,6 +9,14 @@
 use Drupal\Core\Template\Attribute;
 
 /**
+ * @file
+ * Common functions that many Drupal modules will need to reference.
+ *
+ * The functions that are critical and need to be available even when serving
+ * a cached page are instead located in bootstrap.inc.
+ */
+
+/**
  * @defgroup php_wrappers PHP wrapper functions
  * @{
  * Functions that are wrappers or custom implementations of PHP functions.
diff --git a/core/includes/config.inc b/core/includes/config.inc
index 702f77a..5e07c54 100644
--- a/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -1,16 +1,16 @@
 <?php
 
-/**
- * @file
- * This is the API for configuration storage.
- */
-
 use Drupal\Core\Config\Config;
 use Drupal\Core\Config\FileStorage;
 use Drupal\Core\Config\NullStorage;
 use Drupal\Core\Config\StorageInterface;
 
 /**
+ * @file
+ * This is the API for configuration storage.
+ */
+
+/**
  * Installs the default configuration of a given extension.
  *
  * @param string $type
diff --git a/core/includes/database.inc b/core/includes/database.inc
index 4aeba6b..fc76b6f 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -1,5 +1,8 @@
 <?php
 
+use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Condition;
+
 /**
  * @file
  * Core systems for the database layer.
@@ -9,9 +12,6 @@
  * file only, as they cannot auto-load the way classes can.
  */
 
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\Query\Condition;
-
 /**
  * @defgroup database Database abstraction layer
  * @{
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 57b02a7..3968682 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1,13 +1,8 @@
 <?php
 
-/**
- * @file
- * API functions for installing Drupal.
- */
-
+use Drupal\Core\DrupalKernel;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\Install\TaskException;
-use Drupal\Core\DrupalKernel;
 use Drupal\Core\Language\Language;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -16,6 +11,11 @@
 use Symfony\Component\HttpFoundation\Response;
 
 /**
+ * @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 --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc
index bd84614..818b61d 100644
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -1,5 +1,9 @@
 <?php
 
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Query\SelectExtender;
+use Drupal\Core\Database\Query\SelectInterface;
+
 /**
  * @file
  * Functions to aid in the creation of sortable tables.
@@ -8,10 +12,6 @@
  * column headers that the user can click on to sort the table by that column.
  */
 
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Database\Query\SelectExtender;
-use Drupal\Core\Database\Query\SelectInterface;
-
 /**
  * Initialize the table sort context.
  */
diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc
index 0f590d0..a2ff76b 100644
--- a/core/includes/unicode.inc
+++ b/core/includes/unicode.inc
@@ -1,11 +1,6 @@
 <?php
 
 /**
- * @file
- * Unicode API handling functions.
- */
-
-/**
  * Matches Unicode characters that are word boundaries.
  *
  * @see http://unicode.org/glossary
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index a75c485..39aabee 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -276,8 +276,6 @@ function node_filter_form_submit($form, &$form_state) {
  * @param array $updates
  *   Array of key/value pairs with node field names and the value to update that
  *   field to.
- *
- * @ingroup batch
  */
 function node_mass_update($nodes, $updates) {
   // We use batch processing to prevent timeout when updating a large number
diff --git a/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php b/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php
index 0cd8f48..0ab941e 100644
--- a/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php
+++ b/core/modules/search/lib/Drupal/search/Tests/SearchBlockTest.php
@@ -32,9 +32,6 @@ function setUp() {
     $this->drupalLogin($admin_user);
   }
 
-  /**
-   * Tests the availability of the syndicate block.
-   */
   function testSearchFormBlock() {
     // Set block title to confirm that the interface is available.
     $this->drupalPost('admin/structure/block/manage/search/form/configure', array('title' => $this->randomName(8)), t('Save block'));