diff --git a/core/includes/batch.inc b/core/includes/batch.inc
index 153a7de..97db6a7 100644
--- a/core/includes/batch.inc
+++ b/core/includes/batch.inc
@@ -453,7 +453,7 @@ function _batch_finished() {
 
     // If no redirection happened, redirect to the originating page. In case the
     // form needs to be rebuilt, save the final $form_state for
-    // drupal_build_form().
+    // \Drupal\Core\Form\FormBuilderInterface::buildForm().
     if (!empty($_batch['form_state']['rebuild'])) {
       $_SESSION['batch_form_state'] = $_batch['form_state'];
     }
diff --git a/core/lib/Drupal/Core/Form/FormBuilderInterface.php b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
index bf00f50..463a7a2 100644
--- a/core/lib/Drupal/Core/Form/FormBuilderInterface.php
+++ b/core/lib/Drupal/Core/Form/FormBuilderInterface.php
@@ -48,7 +48,7 @@ public function getFormId($form_arg, &$form_state);
    * @return array
    *   The form array.
    *
-   * @see drupal_build_form()
+   * @see \Drupal\Core\Form\FormBuilderInterface::buildForm()
    */
   public function getForm($form_arg);
 
diff --git a/core/modules/views/includes/ajax.inc b/core/modules/views/includes/ajax.inc
index 0bcb723..7f6fc89 100644
--- a/core/modules/views/includes/ajax.inc
+++ b/core/modules/views/includes/ajax.inc
@@ -10,7 +10,8 @@
 use Drupal\Core\Ajax\AjaxResponse;
 
 /**
- * Wrapper around drupal_build_form to handle some AJAX stuff automatically.
+ * Wrapper around \Drupal\Core\Form\FormBuilderInterface::buildForm() to handle
+ * some AJAX stuff automatically.
  * This makes some assumptions about the client.
  */
 function views_ajax_form_wrapper($form_id, &$form_state) {
@@ -24,7 +25,7 @@ function views_ajax_form_wrapper($form_id, &$form_state) {
     ),
   );
 
-  $form = drupal_build_form($form_id, $form_state);
+  $form = \Drupal::formBuilder()->buildForm($form_id, $form_state);
   $output = drupal_render($form);
 
   // These forms have the title built in, so set the title here: