diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index bea4084c30..487697e40d 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -10,8 +10,6 @@
  * The custom background class.
  *
  * @since 3.0.0
- * @package WordPress
- * @subpackage Administration
  */
 class Custom_Background {
 
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 85238bf21c..0fb59ef115 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -10,8 +10,6 @@
  * The custom header image class.
  *
  * @since 2.1.0
- * @package WordPress
- * @subpackage Administration
  */
 class Custom_Image_Header {
 
diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php
index 507a482e68..33945520b9 100644
--- a/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -10,7 +10,6 @@
 /**
  * Create HTML list of nav menu input items.
  *
- * @package WordPress
  * @since 3.0.0
  *
  * @see Walker_Nav_Menu
diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index bb37b8f3c5..7af7dcca3d 100644
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -10,9 +10,8 @@
  * WordPress Filesystem Class for direct PHP file and folder manipulation.
  *
  * @since 2.5.0
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
+ *
+ * @see WP_Filesystem_Base
  */
 class WP_Filesystem_Direct extends WP_Filesystem_Base {
 
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index f337c733c8..0919326946 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -10,9 +10,8 @@
  * WordPress Filesystem Class for implementing FTP.
  *
  * @since 2.5.0
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
+ *
+ * @see WP_Filesystem_Base
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	public $link;
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 95e075c25d..e1efe27485 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -10,9 +10,8 @@
  * WordPress Filesystem Class for implementing FTP Sockets.
  *
  * @since 2.5.0
- * @package WordPress
- * @subpackage Filesystem
- * @uses WP_Filesystem_Base Extends class
+ *
+ * @see WP_Filesystem_Base
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 	/**
diff --git a/wp-includes/class-wp-error.php b/wp-includes/class-wp-error.php
index 22273f89b2..8be6f33c25 100644
--- a/wp-includes/class-wp-error.php
+++ b/wp-includes/class-wp-error.php
@@ -15,7 +15,6 @@
  * core WordPress functions pass this class in the event of an error and
  * if not handled properly will result in code errors.
  *
- * @package WordPress
  * @since 2.1.0
  */
 class WP_Error {
diff --git a/wp-includes/class-wp-http-requests-hooks.php b/wp-includes/class-wp-http-requests-hooks.php
index 6650d5869c..0e46fa378b 100644
--- a/wp-includes/class-wp-http-requests-hooks.php
+++ b/wp-includes/class-wp-http-requests-hooks.php
@@ -10,9 +10,9 @@
 /**
  * Bridge to connect Requests internal hooks to WordPress actions.
  *
- * @package WordPress
- * @subpackage HTTP
  * @since 4.7.0
+ *
+ * @see Requests_Hooks
  */
 class WP_HTTP_Requests_Hooks extends Requests_Hooks {
 	/**
diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index d7823ebbcf..5f32172dba 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -10,9 +10,8 @@
  * WordPress Image Editor Class for Image Manipulation through GD
  *
  * @since 3.5.0
- * @package WordPress
- * @subpackage Image_Editor
- * @uses WP_Image_Editor Extends class
+ *
+ * @see WP_Image_Editor
  */
 class WP_Image_Editor_GD extends WP_Image_Editor {
 	/**
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 3589cc22a1..f327d882d1 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -10,9 +10,8 @@
  * WordPress Image Editor Class for Image Manipulation through Imagick PHP Module
  *
  * @since 3.5.0
- * @package WordPress
- * @subpackage Image_Editor
- * @uses WP_Image_Editor Extends class
+ *
+ * @see WP_Image_Editor
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	/**
diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
index 4019912019..be3fcf143e 100644
--- a/wp-includes/class-wp-meta-query.php
+++ b/wp-includes/class-wp-meta-query.php
@@ -18,8 +18,6 @@
  * to the primary SQL query string.
  *
  * @since 3.2.0
- * @package WordPress
- * @subpackage Meta
  */
 class WP_Meta_Query {
 	/**
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index a71ddfd44a..ffeb102d27 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -16,9 +16,9 @@
  * As of WordPress 3.5.0, XML-RPC is enabled by default. It can be disabled
  * via the {@see 'xmlrpc_enabled'} filter found in wp_xmlrpc_server::login().
  *
- * @package WordPress
- * @subpackage Publishing
  * @since 1.5.0
+ *
+ * @see IXR_Server
  */
 class wp_xmlrpc_server extends IXR_Server {
 	/**
diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
index 13ff04fa5a..53ee8ebe85 100644
--- a/wp-includes/class.wp-dependencies.php
+++ b/wp-includes/class.wp-dependencies.php
@@ -11,9 +11,9 @@
 /**
  * Core base class extended to register items.
  *
- * @package WordPress
  * @since 2.6.0
- * @uses _WP_Dependency
+ *
+ * @see _WP_Dependency
  */
 class WP_Dependencies {
 	/**
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index b3e0b8abeb..4394e1fe37 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -11,9 +11,9 @@
 /**
  * Core class used to register scripts.
  *
- * @package WordPress
- * @uses WP_Dependencies
  * @since 2.1.0
+ *
+ * @see WP_Dependencies
  */
 class WP_Scripts extends WP_Dependencies {
 	/**
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 0b6c011d10..e076712d3f 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -11,9 +11,9 @@
 /**
  * Core class used to register styles.
  *
- * @package WordPress
- * @uses WP_Dependencies
  * @since 2.6.0
+ *
+ * @see WP_Dependencies
  */
 class WP_Styles extends WP_Dependencies {
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1e0f2b3634..c507aaed30 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40987';
+$wp_version = '4.9-alpha-40988';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.