3 files changed, 3 insertions, 6 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index cbd8399206..c4c1d2979a 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -242,6 +242,5 @@ foreach ($cache->obtain_hooks() as $hook)
 
 if (!$config['use_system_cron'])
 {
-	include($phpbb_root_path . 'includes/cron/cron_manager.' . $phpEx);
 	$cron = new cron_manager();
 }
diff --git a/phpBB/cron.php b/phpBB/cron.php
index 7c9ab23bdb..cad83109dc 100644
--- a/phpBB/cron.php
+++ b/phpBB/cron.php
@@ -15,7 +15,6 @@ 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/cron_lock.' . $phpEx);
 
 // Do not update users last page entry
 $user->session_begin(false);
@@ -64,8 +63,7 @@ if ($config['use_system_cron'])
 {
 	$use_shutdown_function = false;
 
-	include($phpbb_root_path . 'includes/cron/cron_manager.' . $phpEx);
-	$cron = new cron_manager;
+	$cron = new cron_manager();
 }
 else
 {
@@ -75,7 +73,7 @@ else
 	output_image();
 }
 
-$cron_lock = new cron_lock;
+$cron_lock = new cron_lock();
 if ($cron_lock->lock())
 {
 	if ($config['use_system_cron'])
diff --git a/phpBB/includes/cron/manager.php b/phpBB/includes/cron/manager.php
index 170724dc2e..5eb262c4f2 100644
--- a/phpBB/includes/cron/manager.php
+++ b/phpBB/includes/cron/manager.php
@@ -49,7 +49,7 @@ class cron_manager
 	{
 		global $phpbb_root_path, $phpEx;
 
-		$tasks_root_path = $phpbb_root_path . 'includes/cron/tasks';
+		$tasks_root_path = $phpbb_root_path . 'includes/cron/task';
 		$dir = opendir($tasks_root_path);
 		$task_dirs = array();
 		while (($entry = readdir($dir)) !== false)