diff --git a/cronjobs/shared.inc.php b/cronjobs/shared.inc.php
index 2fb96531..0368a9c6 100644
--- a/cronjobs/shared.inc.php
+++ b/cronjobs/shared.inc.php
@@ -35,7 +35,7 @@ if (SECHASH_CHECK) {
 
 // MODIFY THIS
 // We need to find our include files so set this properly
-define("BASEPATH", "../public/");
+define("BASEPATH", dirname(__FILE__) . "/");
 
 /*****************************************************
  * No need to change beyond this point               *
@@ -48,14 +48,8 @@ $dStartTime = microtime(true);
 $cron_name = basename($_SERVER['PHP_SELF'], '.php');
 
 // Include our configuration (holding defines for the requires)
-require_once(BASEPATH . 'include/config/global.inc.dist.php');
-require_once(BASEPATH . 'include/config/global.inc.php');
-
-require_once(BASEPATH . 'include/config/security.inc.dist.php');
-@include_once(BASEPATH . 'include/config/security.inc.php');
-
-require_once(BASEPATH . 'include/bootstrap.php');
-require_once(BASEPATH . 'include/version.inc.php');
+require_once(BASEPATH . '../include/bootstrap.php');
+require_once(BASEPATH . '../include/version.inc.php');
 
 // Command line switches
 array_shift($argv);
diff --git a/scripts/shared.inc.php b/scripts/shared.inc.php
index acea1d65..96ad444b 100644
--- a/scripts/shared.inc.php
+++ b/scripts/shared.inc.php
@@ -18,9 +18,8 @@ limitations under the License.
 
  */
 
-// MODIFY THIS
 // We need to find our include files so set this properly
-define("BASEPATH", "../public/");
+define('BASEPATH', dirname(__FILE__) . '/');
 
 /*****************************************************
  * No need to change beyond this point               *
@@ -40,14 +39,8 @@ if (SECHASH_CHECK) {
 }
 
 // Include our configuration (holding defines for the requires)
-require_once(BASEPATH . 'include/config/global.inc.dist.php');
-require_once(BASEPATH . 'include/config/global.inc.php');
-
-require_once(BASEPATH . 'include/config/security.inc.dist.php');
-@include_once(BASEPATH . 'include/config/security.inc.php');
-
-require_once(BASEPATH . 'include/bootstrap.php');
-require_once(BASEPATH . 'include/version.inc.php');
+require_once(BASEPATH . '../include/bootstrap.php');
+require_once(BASEPATH . '../include/version.inc.php');
 
 /**
  * Not used as of yet, may be added later
diff --git a/upgrade/shared.inc.php b/upgrade/shared.inc.php
index 0f0638cb..fbce4bc8 100644
--- a/upgrade/shared.inc.php
+++ b/upgrade/shared.inc.php
@@ -18,9 +18,8 @@ limitations under the License.
 
  */
 
-// MODIFY THIS
 // We need to find our include files so set this properly
-define("BASEPATH", "../public/");
+define('BASEPATH', dirname(__FILE__) . '/');
 
 /*****************************************************
  * No need to change beyond this point               *
@@ -40,12 +39,6 @@ if (SECHASH_CHECK) {
 }
 
 // Include our configuration (holding defines for the requires)
-require_once(BASEPATH . 'include/config/global.inc.dist.php');
-require_once(BASEPATH . 'include/config/global.inc.php');
-
-require_once(BASEPATH . 'include/config/security.inc.dist.php');
-@include_once(BASEPATH . 'include/config/security.inc.php');
-
-require_once(BASEPATH . 'include/bootstrap.php');
-require_once(BASEPATH . 'include/version.inc.php');
+require_once(BASEPATH . '../include/bootstrap.php');
+require_once(BASEPATH . '../include/version.inc.php');
 ?>