diff --git a/core/includes/file.inc b/core/includes/file.inc
index 3e5eb8c96be..3cd943982cf 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -33,23 +33,6 @@ const FILE_CHMOD_FILE = FileSystem::CHMOD_FILE;
  * @defgroup file File interface
  * @{
  * Common file handling functions.
- *
- * Fields on the file entity:
- * - fid: File ID
- * - uid: The {users}.uid of the user who is associated with the file.
- * - filename: Name of the file with no path components. This may differ from
- *   the basename of the filepath if the file is renamed to avoid overwriting
- *   an existing file.
- * - uri: URI of the file.
- * - filemime: The file's MIME type.
- * - filesize: The size of the file in bytes.
- * - status: A bitmapped field indicating the status of the file. The first 8
- *   bits are reserved for Drupal core. The least significant bit indicates
- *   temporary (0) or permanent (1). Temporary files will be removed during
- *   cron runs if they are older than the configuration value
- *   "system.file.temporary_maximum_age", and if clean-up is enabled. Permanent
- *   files will not be removed.
- * - timestamp: UNIX timestamp for the date the file was added to the database.
  */
 
 /**
diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index da6d7c5c8c5..b82d5a83652 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -13,6 +13,8 @@ use Drupal\user\UserInterface;
 /**
  * Defines the file entity class.
  *
+ * @ingroup file
+ *
  * @ContentEntityType(
  *   id = "file",
  *   label = @Translation("File"),
diff --git a/core/modules/file/src/FileInterface.php b/core/modules/file/src/FileInterface.php
index 5b5a6bbef18..ee7120b03e2 100644
--- a/core/modules/file/src/FileInterface.php
+++ b/core/modules/file/src/FileInterface.php
@@ -8,6 +8,8 @@ use Drupal\Core\Entity\EntityChangedInterface;
 
 /**
  * Defines getter and setter methods for file entity base fields.
+ *
+ * @ingroup file
  */
 interface FileInterface extends ContentEntityInterface, EntityChangedInterface, EntityOwnerInterface {