diff --git a/core/modules/breakpoint/breakpoint.install b/core/modules/breakpoint/breakpoint.install
index cba7b1b..bb81fe5 100644
--- a/core/modules/breakpoint/breakpoint.install
+++ b/core/modules/breakpoint/breakpoint.install
@@ -1,5 +1,7 @@
 <?php
 
+use \Drupal;
+
 /**
  * @file
  * Enable, install, update and uninstall functions for the breakpoint module.
@@ -18,5 +20,5 @@ function breakpoint_enable() {
   _breakpoint_theme_enabled(array_keys($themes));
 
   // Import breakpoints from modules.
-  _breakpoint_modules_enabled(array_keys(drupal_container()->get('module_handler')->getModuleList()));
+  _breakpoint_modules_enabled(array_keys(Drupal::service('module_handler')->getModuleList()));
 }
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index b467011..2963a17 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -5,6 +5,7 @@
  * Manage breakpoints and breakpoint groups for responsive designs.
  */
 
+use \Drupal;
 use Drupal\breakpoint\Plugin\Core\Entity\Breakpoint;
 use Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup;
 use Drupal\Core\Config\Entity\ConfigStorageController;
@@ -202,7 +203,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
       $breakpoint_group->delete();
 
       // Get all breakpoints defined by this theme/module.
-      $breakpoint_ids = drupal_container()->get('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
+      $breakpoint_ids = Drupal::service('config.storage')->listAll('breakpoint.breakpoint.' . $source_type . '.' . $breakpoint_group->id() . '.');
       $entity_info = entity_get_info('breakpoint');
 
       // Remove the breakpoint.breakpoint part of the breakpoint identifier.