diff -u b/core/includes/config.inc b/core/includes/config.inc
--- b/core/includes/config.inc
+++ b/core/includes/config.inc
@@ -8,7 +8,8 @@
 /**
  * Gets configuration object names starting with a given prefix.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::configFactory()->listAll() instead.
+ * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
+ *   Use \Drupal::configFactory()->listAll() instead.
  */
 function config_get_storage_names_with_prefix($prefix = '') {
   return \Drupal::configFactory()->listAll($prefix);
@@ -21,7 +22,8 @@
  * @code \Drupal::config('book.admin') @endcode will return a configuration
  * object in which the book module can store its administrative settings.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::config() instead.
+ * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
+ *   Use \Drupal::config() instead.
  *
  * @param string $name
  *   The name of the configuration object to retrieve. The name corresponds to
@@ -41,7 +43,8 @@
  *
  * Use the typed data manager service for creating typed configuration objects.
  *
- * @deprecated as of Drupal 8.0. Use \Drupal::service('config.typed') instead.
+ * @deprecated Deprecated since Drupal 8.x-dev, to be removed in Drupal 8.0.
+ *   Use \Drupal::service('config.typed') instead.
  *
  * @see \Drupal\Core\TypedData\TypedDataManager::create()
  *
diff -u b/core/lib/Drupal/Core/Config/ConfigManager.php b/core/lib/Drupal/Core/Config/ConfigManager.php
--- b/core/lib/Drupal/Core/Config/ConfigManager.php
+++ b/core/lib/Drupal/Core/Config/ConfigManager.php
@@ -79,6 +79,8 @@
    * {@inheritdoc}
    */
   public function diff(StorageInterface $source_storage, StorageInterface $target_storage, $name) {
+    // @todo Replace with code that can be autoloaded.
+    //   https://drupal.org/node/2188595
     require_once DRUPAL_ROOT . '/core/lib/Drupal/Component/Diff/DiffEngine.php';
 
     // The output should show configuration object differences formatted as YAML.