diff --git a/core/modules/layout/layout.module b/core/modules/layout/layout.module
index 17acc6d..2876f48 100644
--- a/core/modules/layout/layout.module
+++ b/core/modules/layout/layout.module
@@ -58,7 +58,7 @@ function layout_permission() {
  *   The layout plugin manager instance.
  */
 function layout_manager() {
-  return drupal_container()->get('plugin.manager.layout');
+  return Drupal::service('plugin.manager.layout');
 }
 
 /**
diff --git a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
index c5d0dde..bb68a7d 100644
--- a/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
+++ b/core/modules/layout/lib/Drupal/layout/Plugin/Derivative/Layout.php
@@ -59,7 +59,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) {
 
     // Add all modules as possible layout providers.
     // @todo Inject the module handler.
-    foreach (drupal_container()->get('module_handler')->getModuleList() as $module => $filename) {
+    foreach (\Drupal::moduleHandler()->get('module_handler')->getModuleList() as $module => $filename) {
       $available_layout_providers[$module] = array(
         'type' => 'module',
         'provider' => $module,
diff --git a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
index f41460c..16199b8 100644
--- a/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
+++ b/core/modules/layout/lib/Drupal/layout/Tests/LayoutDerivativesTest.php
@@ -33,7 +33,7 @@ public static function getInfo() {
    * Tests for module/theme layout derivatives.
    */
   function testDerivatives() {
-    $manager = drupal_container()->get('plugin.manager.layout');
+    $manager = Drupal::service('plugin.manager.layout');
 
     $definitions = $manager->getDefinitions();
     $this->assertTrue(is_array($definitions), 'Definitions found.');