diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 7b66911..cc7eabb 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1639,8 +1639,7 @@ function install_import_translations(&$install_state) {
   if (count($languages) > 1 || !isset($languages['en'])) {
     $operations[] = array('_install_prepare_import', array(array_keys($languages), $install_state['server_pattern']));
 
-    // Set up a batch to import translations for drupal core. Translation import
-    // for contrib modules happens in install_import_translations_remaining.
+    // Set up a batch to import translations for drupal core.
     foreach ($languages as $language) {
       if (locale_translation_use_remote_source()) {
         $operations[] = array('locale_translation_batch_fetch_download', array('drupal', $language->getId()));
@@ -1648,7 +1647,7 @@ function install_import_translations(&$install_state) {
       $operations[] = array('locale_translation_batch_fetch_import', array('drupal', $language->getId(), array()));
     }
 
-    module_load_include('fetch.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'fetch.inc');
     $batch = array(
       'operations' => $operations,
       'title' => t('Updating translations.'),
@@ -1697,7 +1696,7 @@ function _install_prepare_import($langcodes, $server_pattern) {
             'status' => 1,
           );
           \Drupal::service('locale.project')->set($data['name'], $data);
-          module_load_include('compare.inc', 'locale');
+          \Drupal::moduleHandler()->loadInclude('locale', 'compare.inc');
           locale_translation_check_projects_local(array('drupal'), array($langcode));
         }
       }
diff --git a/core/includes/module.inc b/core/includes/module.inc
index bc50d2c..5bb1e16 100644
--- a/core/includes/module.inc
+++ b/core/includes/module.inc
@@ -90,7 +90,7 @@ function module_load_install($module) {
   // Make sure the installation API is available
   include_once __DIR__ . '/install.inc';
 
-  return module_load_include('install', $module);
+  return \Drupal::moduleHandler()->loadInclude($module, 'install');
 }
 
 /**
@@ -117,9 +117,12 @@ function module_load_install($module) {
  *   (optional) The base file name (without the $type extension). If omitted,
  *   $module is used; i.e., resulting in "$module.$type" by default.
  *
- * @return
+ * @return string|bool
  *   The name of the included file, if successful; FALSE otherwise.
  *
+ * @deprecated in Drupal 8.x, will be removed before Drupal 9.0.
+ *   Use \Drupal::moduleHandler()->loadInclude('module', 'type');
+ *
  * @todo The module_handler service has a loadInclude() method which performs
  *   this same task but only for enabled modules. Figure out a way to move this
  *   functionality entirely into the module_handler while keeping the ability to
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 68401a9..a318f1d 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -235,7 +235,7 @@ function update_invoke_post_update($function, &$context) {
   }
 
   list($module, $name) = explode('_post_update_', $function, 2);
-  module_load_include('php', $module, $module . '.post_update');
+  \Drupal::moduleHandler()->loadInclude($module, '/' . $module . '.post_update.php');
   if (function_exists($function)) {
     try {
       $ret['results']['query'] = $function($context['sandbox']);
diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index a71e342..5fcd6ad 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -47,12 +47,11 @@ class FormState implements FormStateInterface {
    *     of a function to call instead.
    *   - args: A list of arguments to pass to the form constructor.
    *   - files: An optional array defining include files that need to be loaded
-   *     for building the form. Each array entry may be the path to a file or
-   *     another array containing values for the parameters 'type', 'module' and
-   *     'name' as needed by module_load_include(). The files listed here are
-   *     automatically loaded by \Drupal::formBuilder()->getCache(). By default
-   *     the current menu router item's 'file' definition is added, if any. Use
-   *     self::loadInclude() to add include files from a form constructor.
+   *     for building the form. Each array entry may be the path to a file. The
+   *     files listed here are automatically loaded by
+   *     \Drupal::formBuilder()->getCache(). By default the current menu router
+   *     item's 'file' definition is added, if any. Use self::loadInclude() to
+   *     add include files from a form constructor.
    *   - form_id: Identification of the primary form being constructed and
    *     processed.
    *   - base_form_id: Identification for a base form, as declared in the form
diff --git a/core/lib/Drupal/Core/Updater/Module.php b/core/lib/Drupal/Core/Updater/Module.php
index a7a1863..1ba600a 100644
--- a/core/lib/Drupal/Core/Updater/Module.php
+++ b/core/lib/Drupal/Core/Updater/Module.php
@@ -91,7 +91,7 @@ public function getSchemaUpdates() {
     if (!self::canUpdate($this->name)) {
       return array();
     }
-    module_load_include('install', $this->name);
+    module_load_install($this->name);
 
     if (!$updates = drupal_get_schema_versions($this->name)) {
       return array();
diff --git a/core/modules/content_translation/content_translation.module b/core/modules/content_translation/content_translation.module
index 6e7bb70..a2019a8 100644
--- a/core/modules/content_translation/content_translation.module
+++ b/core/modules/content_translation/content_translation.module
@@ -386,7 +386,7 @@ function content_translation_form_field_config_edit_form_alter(array &$form, For
   }
 
   if ($field->isTranslatable()) {
-    module_load_include('inc', 'content_translation', 'content_translation.admin');
+    \Drupal::moduleHandler()->loadInclude('content_translation', 'admin.inc');
     $element = content_translation_field_sync_widget($field);
     if ($element) {
       $form['third_party_settings']['content_translation']['translation_sync'] = $element;
@@ -533,7 +533,7 @@ function content_translation_language_configuration_element_submit(array $form,
  * Implements hook_form_FORM_ID_alter() for language_content_settings_form().
  */
 function content_translation_form_language_content_settings_form_alter(array &$form, FormStateInterface $form_state) {
-  module_load_include('inc', 'content_translation', 'content_translation.admin');
+  \Drupal::moduleHandler()->loadInclude('content_translation', 'admin.inc');
   _content_translation_form_language_content_settings_form_alter($form, $form_state);
 }
 
@@ -541,7 +541,7 @@ function content_translation_form_language_content_settings_form_alter(array &$f
  * Implements hook_preprocess_HOOK() for language-content-settings-table.html.twig.
  */
 function content_translation_preprocess_language_content_settings_table(&$variables) {
-  module_load_include('inc', 'content_translation', 'content_translation.admin');
+  \Drupal::moduleHandler()->loadInclude('content_translation', 'admin.inc');
   _content_translation_preprocess_language_content_settings_table($variables);
 }
 
diff --git a/core/modules/locale/locale.batch.inc b/core/modules/locale/locale.batch.inc
index a5ef423..36fece8 100644
--- a/core/modules/locale/locale.batch.inc
+++ b/core/modules/locale/locale.batch.inc
@@ -179,7 +179,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
     if (isset($source->type)) {
       if ($source->type == LOCALE_TRANSLATION_REMOTE || $source->type == LOCALE_TRANSLATION_LOCAL) {
         $file = $source->files[LOCALE_TRANSLATION_LOCAL];
-        module_load_include('bulk.inc', 'locale');
+        \Drupal::moduleHandler()->loadInclude('locale', 'locale.bulk.inc');
         $options += array(
           'message' => t('Importing translation for %project.', array('%project' => $source->project)),
         );
@@ -214,7 +214,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
  *   Batch results.
  */
 function locale_translation_batch_fetch_finished($success, $results) {
-  module_load_include('bulk.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.bulk.inc');
   if ($success) {
     \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
   }
diff --git a/core/modules/locale/locale.bulk.inc b/core/modules/locale/locale.bulk.inc
index de43c85..5f3f2af 100644
--- a/core/modules/locale/locale.bulk.inc
+++ b/core/modules/locale/locale.bulk.inc
@@ -85,7 +85,7 @@ function locale_translate_batch_import_files(array $options, $force = FALSE) {
  *   An array of interface translation files keyed by their URI.
  */
 function locale_translate_get_interface_translation_files(array $projects = array(), array $langcodes = array()) {
-  module_load_include('compare.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
   $files = array();
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
diff --git a/core/modules/locale/locale.fetch.inc b/core/modules/locale/locale.fetch.inc
index 32796a2..ccc1051 100644
--- a/core/modules/locale/locale.fetch.inc
+++ b/core/modules/locale/locale.fetch.inc
@@ -27,7 +27,7 @@
  *   Batch definition array.
  */
 function locale_translation_batch_update_build($projects = array(), $langcodes = array(), $options = array()) {
-  module_load_include('compare.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
   $status_options = $options;
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 74b76ec..a58f665 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -226,7 +226,7 @@ function locale_configurable_language_delete(ConfigurableLanguageInterface $lang
   \Drupal::service('locale.storage')->deleteTranslations(array('language' => $language->id()));
 
   // Remove interface translation files.
-  module_load_include('inc', 'locale', 'locale.bulk');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.bulk.inc');
   locale_translate_delete_translation_files(array(), array($language->id()));
 
   // Remove translated configuration objects.
@@ -355,7 +355,7 @@ function locale_cron() {
   // and a translatable language was set.
   // Update tasks are added to the queue here but processed by Drupal's cron.
   if ($frequency = \Drupal::config('locale.settings')->get('translation.update_interval_days') && locale_translatable_language_list()) {
-    module_load_include('translation.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.translation.inc');
     locale_cron_fill_queue();
   }
 }
@@ -407,14 +407,14 @@ function locale_system_update(array $components) {
   // built-in support for translation imports in the installer.
   if (!drupal_installation_attempted() && locale_translatable_language_list()) {
     if (\Drupal::config('locale.settings')->get('translation.import_enabled')) {
-      module_load_include('compare.inc', 'locale');
+      \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
 
       // Update the list of translatable projects and start the import batch.
       // Only when new projects are added the update batch will be triggered.
       // Not each enabled module will introduce a new project. E.g. sub modules.
       $projects = array_keys(locale_translation_build_projects());
       if ($list = array_intersect($list, $projects)) {
-        module_load_include('fetch.inc', 'locale');
+        \Drupal::moduleHandler()->loadInclude('locale', 'locale.fetch.inc');
         // Get translation status of the projects, download and update
         // translations.
         $options = _locale_translation_default_update_options();
@@ -449,7 +449,7 @@ function locale_system_remove($components) {
   $components += array('module' => array(), 'theme' => array());
   $list = array_merge($components['module'], $components['theme']);
   if ($language_list = locale_translatable_language_list()) {
-    module_load_include('compare.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');;
     \Drupal::moduleHandler()->loadInclude('locale', 'bulk.inc');
 
     // Only when projects are removed, the translation files and records will be
@@ -882,7 +882,7 @@ function locale_translation_file_history_delete($projects = array(), $langcodes
 function locale_translation_get_status($projects = NULL, $langcodes = NULL) {
   $result = array();
   $status = \Drupal::state()->get('locale.translation_status');
-  module_load_include('translation.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.translation.inc');
   $projects = $projects ? $projects : array_keys(locale_translation_get_projects());
   $langcodes = $langcodes ? $langcodes : array_keys(locale_translatable_language_list());
 
@@ -922,7 +922,7 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
   // improve performance for large sites.
 
   // Load the translation status or build it if not already available.
-  module_load_include('translation.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.translation.inc');
   $status = locale_translation_get_status();
   if (empty($status)) {
     $projects = locale_translation_get_projects(array($project));
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index d4776d5..9140854 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -17,7 +17,7 @@
  * @see locale_menu()
  */
 function locale_translation_manual_status() {
-  module_load_include('compare.inc', 'locale');
+  \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
 
   // Check the translation status of all translatable projects in all languages.
   // First we clear the cached list of projects. Although not strictly
diff --git a/core/modules/locale/locale.translation.inc b/core/modules/locale/locale.translation.inc
index 0383aaf..9d7e251b 100644
--- a/core/modules/locale/locale.translation.inc
+++ b/core/modules/locale/locale.translation.inc
@@ -61,7 +61,7 @@ function locale_translation_get_projects(array $project_names = array()) {
     // https://www.drupal.org/node/1777106 is a follow-up issue to make the
     // check for possible out-of-date project information more robust.
     if ($row_count == 0) {
-      module_load_include('compare.inc', 'locale');
+      \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
       // At least the core project should be in the database, so we build the
       // data if none are found.
       locale_translation_build_projects();
@@ -352,7 +352,7 @@ function locale_cron_fill_queue() {
   // For each project+language combination a number of tasks are added to
   // the queue.
   if ($updates) {
-    module_load_include('fetch.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.fetch.inc');
     $options = _locale_translation_default_update_options();
     $queue = \Drupal::queue('locale_translation', TRUE);
 
diff --git a/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php b/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
index 09ab884..23fa387 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateDevelopmentReleaseTest.php
@@ -20,7 +20,7 @@ class LocaleUpdateDevelopmentReleaseTest extends WebTestBase {
 
   protected function setUp() {
     parent::setUp();
-    module_load_include('compare.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
     $admin_user = $this->drupalCreateUser(array('administer modules', 'administer languages', 'access administration pages', 'translate interface'));
     $this->drupalLogin($admin_user);
     $this->drupalPostForm('admin/config/regional/language/add', array('predefined_langcode' => 'hu'), t('Add language'));
diff --git a/core/modules/locale/src/Tests/LocaleUpdateTest.php b/core/modules/locale/src/Tests/LocaleUpdateTest.php
index 494c433..65b1a34 100644
--- a/core/modules/locale/src/Tests/LocaleUpdateTest.php
+++ b/core/modules/locale/src/Tests/LocaleUpdateTest.php
@@ -21,8 +21,8 @@ class LocaleUpdateTest extends LocaleUpdateBase {
    */
   protected function setUp() {
     parent::setUp();
-    module_load_include('compare.inc', 'locale');
-    module_load_include('fetch.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.fetch.inc');
     $admin_user = $this->drupalCreateUser(array('administer modules', 'administer site configuration', 'administer languages', 'access administration pages', 'translate interface'));
     $this->drupalLogin($admin_user);
     // We use German as test language. This language must match the translation
@@ -35,7 +35,7 @@ protected function setUp() {
    * Checks if a list of translatable projects gets build.
    */
   public function testUpdateProjects() {
-    module_load_include('compare.inc', 'locale');
+    \Drupal::moduleHandler()->loadInclude('locale', 'locale.compare.inc');
 
     // Make the test modules look like a normal custom module. i.e. make the
     // modules not hidden. locale_test_system_info_alter() modifies the project
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 91d27e8..3e19722 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -690,13 +690,13 @@ function node_user_cancel($edit, $account, $method) {
       $nids = \Drupal::entityQuery('node')
         ->condition('uid', $account->id())
         ->execute();
-      module_load_include('inc', 'node', 'node.admin');
+      \Drupal::moduleHandler()->loadInclude('node', 'node.admin.inc');
       node_mass_update($nids, array('status' => 0), NULL, TRUE);
       break;
 
     case 'user_cancel_reassign':
       // Anonymize all of the nodes for this old account.
-      module_load_include('inc', 'node', 'node.admin');
+      \Drupal::moduleHandler()->loadInclude('node', 'node.admin.inc');
       $vids = \Drupal::entityManager()->getStorage('node')->userRevisionIds($account);
       node_mass_update($vids, array(
         'uid' => 0,
diff --git a/core/modules/system/src/Tests/Update/DbUpdatesTrait.php b/core/modules/system/src/Tests/Update/DbUpdatesTrait.php
index e92d5b1..743c26e 100644
--- a/core/modules/system/src/Tests/Update/DbUpdatesTrait.php
+++ b/core/modules/system/src/Tests/Update/DbUpdatesTrait.php
@@ -53,7 +53,7 @@ protected function applyUpdates() {
    */
   public static function includeUpdates($module, $group) {
     if ($index = \Drupal::state()->get($module . '.db_updates.' . $group)) {
-      module_load_include('inc', $module, 'update/' . $group . '_' . $index);
+      \Drupal::moduleHandler()->loadInclude($module, '/update/' . $group . '_' . $index . '.inc');
     }
   }
 
diff --git a/core/modules/tracker/src/Controller/TrackerPage.php b/core/modules/tracker/src/Controller/TrackerPage.php
index a9d667a..a62cfb7 100644
--- a/core/modules/tracker/src/Controller/TrackerPage.php
+++ b/core/modules/tracker/src/Controller/TrackerPage.php
@@ -18,7 +18,7 @@ class TrackerPage extends ControllerBase {
    * Content callback for the tracker.page route.
    */
   public function getContent() {
-    module_load_include('inc', 'tracker', 'tracker.pages');
+    \Drupal::moduleHandler()->loadInclude('tracker', 'tracker.pages.inc');
     return tracker_page();
   }
 }
diff --git a/core/modules/tracker/src/Controller/TrackerUserRecent.php b/core/modules/tracker/src/Controller/TrackerUserRecent.php
index 4b644ae..44024e1 100644
--- a/core/modules/tracker/src/Controller/TrackerUserRecent.php
+++ b/core/modules/tracker/src/Controller/TrackerUserRecent.php
@@ -19,7 +19,7 @@ class TrackerUserRecent extends ControllerBase {
    * Content callback for the tracker.users_recent_content route.
    */
   public function getContent(UserInterface $user) {
-    module_load_include('inc', 'tracker', 'tracker.pages');
+    \Drupal::moduleHandler()->loadInclude('tracker', 'tracker.pages.inc');
     return tracker_page($user);
   }
 }
diff --git a/core/modules/tracker/src/Controller/TrackerUserTab.php b/core/modules/tracker/src/Controller/TrackerUserTab.php
index 3aca4c0..34382c4 100644
--- a/core/modules/tracker/src/Controller/TrackerUserTab.php
+++ b/core/modules/tracker/src/Controller/TrackerUserTab.php
@@ -19,7 +19,7 @@ class TrackerUserTab extends ControllerBase {
    * Content callback for the tracker.user_tab route.
    */
   public function getContent(UserInterface $user) {
-    module_load_include('inc', 'tracker', 'tracker.pages');
+    \Drupal::moduleHandler()->loadInclude('tracker', 'tracker.pages.inc');
     return tracker_page($user);
   }
 
diff --git a/core/modules/update/src/Tests/UpdateContribTest.php b/core/modules/update/src/Tests/UpdateContribTest.php
index 786c6ac..3989f66 100644
--- a/core/modules/update/src/Tests/UpdateContribTest.php
+++ b/core/modules/update/src/Tests/UpdateContribTest.php
@@ -297,7 +297,7 @@ function testUpdateShowDisabledThemes() {
    * Tests updates with a hidden base theme.
    */
   function testUpdateHiddenBaseTheme() {
-    module_load_include('compare.inc', 'update');
+    \Drupal::moduleHandler()->loadInclude('update', 'update.compare.inc');
 
     // Install the subtheme.
     \Drupal::service('theme_handler')->install(array('update_test_subtheme'));
diff --git a/core/modules/update/update.install b/core/modules/update/update.install
index b2223f1..175cc13 100644
--- a/core/modules/update/update.install
+++ b/core/modules/update/update.install
@@ -31,7 +31,7 @@ function update_requirements($phase) {
   $requirements = array();
   if ($phase == 'runtime') {
     if ($available = update_get_available(FALSE)) {
-      module_load_include('inc', 'update', 'update.compare');
+      \Drupal::moduleHandler()->loadInclude('update', 'update.compare.inc');
       $data = update_calculate_project_data($available);
       // First, populate the requirements for core:
       $requirements['update_core'] = _update_requirement_check($data['drupal'], 'core');
diff --git a/core/modules/update/update.module b/core/modules/update/update.module
index 98f7569..383bf6d 100644
--- a/core/modules/update/update.module
+++ b/core/modules/update/update.module
@@ -230,7 +230,7 @@ function update_cron() {
   if ((REQUEST_TIME - $last_email_notice) > $interval) {
     // If configured time between notifications elapsed, send email about
     // updates possibly available.
-    module_load_include('inc', 'update', 'update.fetch');
+    \Drupal::moduleHandler()->loadInclude('update', 'update.fetch.inc');
     _update_cron_notify();
   }
 
@@ -313,7 +313,7 @@ function _update_no_data() {
  * @see \Drupal\Update\UpdateManager::getProjects()
  */
 function update_get_available($refresh = FALSE) {
-  module_load_include('inc', 'update', 'update.compare');
+  \Drupal::moduleHandler()->loadInclude('update', 'update.compare.inc');
   $needs_refresh = FALSE;
 
   // Grab whatever data we currently have.
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index d0716c9..c8f686a 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -40,7 +40,7 @@ function hook_user_cancel($edit, $account, $method) {
   switch ($method) {
     case 'user_cancel_block_unpublish':
       // Unpublish nodes (current revisions).
-      module_load_include('inc', 'node', 'node.admin');
+      \Drupal::moduleHandler()->loadInclude('node', 'node.admin.inc');
       $nodes = \Drupal::entityQuery('node')
         ->condition('uid', $account->id())
         ->execute();
@@ -49,7 +49,7 @@ function hook_user_cancel($edit, $account, $method) {
 
     case 'user_cancel_reassign':
       // Anonymize nodes (current revisions).
-      module_load_include('inc', 'node', 'node.admin');
+      \Drupal::moduleHandler()->loadInclude('node', 'node.admin.inc');
       $nodes = \Drupal::entityQuery('node')
         ->condition('uid', $account->id())
         ->execute();
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 95acc95..32a4dce 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -588,7 +588,7 @@ protected function rowStyleOptions() {
    * available).
    */
   protected function buildFilters(&$form, FormStateInterface $form_state) {
-    module_load_include('inc', 'views_ui', 'admin');
+      \Drupal::moduleHandler()->loadInclude('views_ui', 'admin.inc');
 
     $bundles = entity_get_bundles($this->entityTypeId);
     // If the current base table support bundles and has more than one (like user).
@@ -893,7 +893,7 @@ protected function defaultDisplayFiltersUser(array $form, FormStateInterface $fo
       // Figure out the table where $bundle_key lives. It may not be the same as
       // the base table for the view; the taxonomy vocabulary machine_name, for
       // example, is stored in taxonomy_vocabulary, not taxonomy_term_data.
-      module_load_include('inc', 'views_ui', 'admin');
+      \Drupal::moduleHandler()->loadInclude('views_ui', 'admin.inc');
       $fields = Views::viewsDataHelper()->fetchFields($this->base_table, 'filter');
       if (isset($fields[$this->base_table . '.' . $bundle_key])) {
         $table = $this->base_table;
diff --git a/core/scripts/generate-d6-content.sh b/core/scripts/generate-d6-content.sh
index fc4c68f..24d8d51 100644
--- a/core/scripts/generate-d6-content.sh
+++ b/core/scripts/generate-d6-content.sh
@@ -96,7 +96,7 @@
 
 $node_id = 0;
 $revision_id = 0;
-module_load_include('inc', 'node', 'node.pages');
+\Drupal::moduleHandler()->loadInclude('node', 'node.pages.inc');
 for ($i = 0; $i < 24; $i++) {
   $uid = intval($i / 8) + 3;
   $user = user_load($uid);
diff --git a/core/scripts/generate-d7-content.sh b/core/scripts/generate-d7-content.sh
index 8b591f4..ab1a9ae 100644
--- a/core/scripts/generate-d7-content.sh
+++ b/core/scripts/generate-d7-content.sh
@@ -158,7 +158,7 @@
 }
 $node_id = 0;
 $revision_id = 0;
-module_load_include('inc', 'node', 'node.pages');
+\Drupal::moduleHandler()->loadInclude('node', 'node.pages.inc');
 for ($i = 0; $i < 36; $i++) {
   $uid = intval($i / 8) + 3;
   $user = user_load($uid);