diff --git a/registry_rebuild.drush.inc b/registry_rebuild.drush.inc
index 853c947..57fb0ce 100644
--- a/registry_rebuild.drush.inc
+++ b/registry_rebuild.drush.inc
@@ -44,21 +44,22 @@ function registry_rebuild_drush_command() {
  */
 function drush_registry_rebuild() {
   define('MAINTENANCE_MODE', 'update');
-  require_once DRUPAL_ROOT . '/includes/registry.inc';
-  require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
-  require_once DRUPAL_ROOT . '/includes/common.inc';
-  require_once DRUPAL_ROOT . '/includes/entity.inc';
-  require_once DRUPAL_ROOT . '/includes/module.inc';
-  require_once DRUPAL_ROOT . '/modules/system/system.module';
+  require_once DRUPAL_ROOT . '/core/includes/registry.inc';
+  require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+  require_once DRUPAL_ROOT . '/core/includes/common.inc';
+  require_once DRUPAL_ROOT . '/core/modules/entity/entity.controller.inc';
+  require_once DRUPAL_ROOT . '/core/modules/entity/entity.query.inc';
+  require_once DRUPAL_ROOT . '/core/includes/module.inc';
+  require_once DRUPAL_ROOT . '/core/modules/system/system.module';
 
-  require_once DRUPAL_ROOT . '/includes/database/query.inc';
-  require_once DRUPAL_ROOT . '/includes/database/select.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database/query.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database/select.inc';
 
   // This section is not functionally important. It's just getting the
   // registry_parsed_files() so that it can report the change.
   $connection_info = Database::getConnectionInfo();
   $driver = $connection_info['default']['driver'];
-  require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/query.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/query.inc';
 
   $parsed_before = registry_get_parsed_files();
 
diff --git a/registry_rebuild.info b/registry_rebuild.info
index 03c4c36..2be6d85 100644
--- a/registry_rebuild.info
+++ b/registry_rebuild.info
@@ -1,3 +1,3 @@
 name = Registry Rebuild
 description = Not really a module. Please see README.txt and run registry_rebuild.php. Visit <a href="http://drupal.org/project/registry_rebuild">the project page</a> for more information.
-core = 7.x
+core = 8.x
diff --git a/registry_rebuild.php b/registry_rebuild.php
index 47b5969..fd558b6 100644
--- a/registry_rebuild.php
+++ b/registry_rebuild.php
@@ -12,13 +12,14 @@ define('MAINTENANCE_MODE', 'update');
 
 global $_SERVER;
 $_SERVER['REMOTE_ADDR'] = 'nothing';
-require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
-require_once DRUPAL_ROOT . '/includes/common.inc';
-require_once DRUPAL_ROOT . '/includes/entity.inc';
-require_once DRUPAL_ROOT . '/modules/system/system.module';
+require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
+require_once DRUPAL_ROOT . '/core/includes/common.inc';
+require_once DRUPAL_ROOT . '/core/modules/entity/entity.controller.inc';
+require_once DRUPAL_ROOT . '/core/modules/entity/entity.query.inc';
+require_once DRUPAL_ROOT . '/core/modules/system/system.module';
 
-require_once DRUPAL_ROOT . '/includes/database/query.inc';
-require_once DRUPAL_ROOT . '/includes/database/select.inc';
+require_once DRUPAL_ROOT . '/core/includes/database/query.inc';
+require_once DRUPAL_ROOT . '/core/includes/database/select.inc';
 
 print "Bootstrapping to DRUPAL_BOOTSTRAP_SESSION<br/>\n";
 drupal_bootstrap(DRUPAL_BOOTSTRAP_SESSION);
@@ -29,13 +30,13 @@ registry_rebuild_rebuild();
  * Before calling this we need to be bootstrapped to DRUPAL_BOOTSTRAP_DATABASE.
  */
 function registry_rebuild_rebuild() {
-  require_once DRUPAL_ROOT . '/includes/registry.inc';
+  require_once DRUPAL_ROOT . '/core/includes/registry.inc';
 
   // This section is not functionally important. It's just getting the
   // registry_parsed_files() so that it can report the change.
   $connection_info = Database::getConnectionInfo();
   $driver = $connection_info['default']['driver'];
-  require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/query.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database/' . $driver . '/query.inc';
 
   $parsed_before = registry_get_parsed_files();