diff --git a/phpBB/common.php b/phpBB/common.php
index 3586031c36..e2300f0bd5 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -242,6 +242,6 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	require($phpbb_root_path . 'includes/cron.' . $phpEx);
+	include($phpbb_root_path . 'includes/cron/cron_manager.' . $phpEx);
 	$cron = new cron();
 }
diff --git a/phpBB/cron.php b/phpBB/cron.php
index 2d9e6afe5d..0621d7651b 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -15,7 +15,7 @@ define('IN_CRON', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
-include($phpbb_root_path . 'includes/cron_lock.' . $phpEx);
+include($phpbb_root_path . 'includes/cron/cron_lock.' . $phpEx);
 
 // Do not update users last page entry
 $user->session_begin(false);