diff --git a/account_manage_columns_page.php b/account_manage_columns_page.php
index 8298b3b745..257aaca95d 100644
--- a/account_manage_columns_page.php
+++ b/account_manage_columns_page.php
@@ -25,12 +25,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'authentication_api.php' );
-	require_once( $t_core_path . 'columns_api.php' );
-	require_once( $t_core_path . 'custom_field_api.php' );
-	require_once( $t_core_path . 'helper_api.php' );
+	require_once( 'authentication_api.php' );
+	require_once( 'columns_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'helper_api.php' );
 
 	html_page_top( lang_get( 'manage_columns_config' ) );
 
diff --git a/account_page.php b/account_page.php
index 1b11e3b6a3..55cc81adff 100644
--- a/account_page.php
+++ b/account_page.php
@@ -47,9 +47,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	#============ Parameters ============
 	# (none)
diff --git a/account_prefs_inc.php b/account_prefs_inc.php
index 91f65100f7..16bb5606e6 100644
--- a/account_prefs_inc.php
+++ b/account_prefs_inc.php
@@ -23,9 +23,8 @@
 	 /**
 	  * MantisBT Core API's
 	  */
-	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path.'user_pref_api.php' );
+	require_once( 'user_pref_api.php' );
 
 	function edit_account_prefs($p_user_id = null, $p_error_if_protected = true, $p_accounts_menu = true, $p_redirect_url = '') {
 		if ( null === $p_user_id ) {
diff --git a/account_prefs_page.php b/account_prefs_page.php
index ccd3468573..e34a495693 100644
--- a/account_prefs_page.php
+++ b/account_prefs_page.php
@@ -44,9 +44,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	#============ Parameters ============
 	# (none)
diff --git a/account_prefs_reset.php b/account_prefs_reset.php
index ace51a267f..83cb324cf1 100644
--- a/account_prefs_reset.php
+++ b/account_prefs_reset.php
@@ -40,9 +40,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'user_pref_api.php' );
+	require_once( 'user_pref_api.php' );
 
 	#============ Parameters ============
 	$f_user_id = gpc_get_int( 'user_id' );
diff --git a/account_prefs_update.php b/account_prefs_update.php
index 2fa1c23f30..9e08c2f0aa 100644
--- a/account_prefs_update.php
+++ b/account_prefs_update.php
@@ -26,9 +26,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'user_pref_api.php' );
+	require_once( 'user_pref_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/account_prof_edit_page.php b/account_prof_edit_page.php
index c8cadfde68..3670bfcad6 100644
--- a/account_prof_edit_page.php
+++ b/account_prof_edit_page.php
@@ -28,10 +28,8 @@
 	 */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'profile_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'profile_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/account_prof_menu_page.php b/account_prof_menu_page.php
index 86a439c7e0..7c9b9de2a8 100644
--- a/account_prof_menu_page.php
+++ b/account_prof_menu_page.php
@@ -30,15 +30,13 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	if ( isset( $g_global_profiles ) ) {
 		$g_global_profiles = true;
 	} else {
 		$g_global_profiles = false;
 	}
 
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/account_prof_update.php b/account_prof_update.php
index 1b44780fc7..8d6fb5ca4c 100644
--- a/account_prof_update.php
+++ b/account_prof_update.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'profile_api.php' );
+	require_once( 'profile_api.php' );
 
 	form_security_validate('profile_update');
 
diff --git a/account_sponsor_page.php b/account_sponsor_page.php
index 4844820716..89ecd64bfe 100644
--- a/account_sponsor_page.php
+++ b/account_sponsor_page.php
@@ -42,9 +42,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	if ( config_get( 'enable_sponsorship' ) == OFF ) {
 		trigger_error( ERROR_SPONSORSHIP_NOT_ENABLED, ERROR );
diff --git a/account_sponsor_update.php b/account_sponsor_update.php
index 966235f9da..c9b0e2abb7 100644
--- a/account_sponsor_update.php
+++ b/account_sponsor_update.php
@@ -29,9 +29,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/account_update.php b/account_update.php
index 06a03a1795..f19907d590 100644
--- a/account_update.php
+++ b/account_update.php
@@ -29,9 +29,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	form_security_validate('account_update');
 
diff --git a/adm_config_report.php b/adm_config_report.php
index 92eca90c12..8c5b99ae39 100644
--- a/adm_config_report.php
+++ b/adm_config_report.php
@@ -27,8 +27,6 @@
 
 	access_ensure_project_level( config_get( 'view_configuration_threshold' ) );
 
-	$t_core_path = config_get( 'core_path' );
-
 	html_page_top( lang_get( 'configuration_report' ) );
 
 	print_manage_menu( 'adm_config_report.php' );
diff --git a/adm_config_set.php b/adm_config_set.php
index ea15335a3c..76f5734ef9 100644
--- a/adm_config_set.php
+++ b/adm_config_set.php
@@ -27,8 +27,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	# helper_ensure_post();
 
 	$f_user_id = gpc_get_int( 'user_id' );
diff --git a/adm_permissions_report.php b/adm_permissions_report.php
index 98fa327af6..9d640358c9 100644
--- a/adm_permissions_report.php
+++ b/adm_permissions_report.php
@@ -28,8 +28,6 @@
 
 	access_ensure_project_level( config_get( 'view_configuration_threshold' ) );
 
-	$t_core_path = config_get( 'core_path' );
-
 	html_page_top( lang_get( 'permissions_summary_report' ) );
 
 	print_manage_menu( 'adm_permissions_report.php' );
diff --git a/admin/check.php b/admin/check.php
index c0258043d1..5c9a59ddc1 100644
--- a/admin/check.php
+++ b/admin/check.php
@@ -30,10 +30,8 @@
  */
 require_once( dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'core.php' );
 
-$t_core_path = config_get_global( 'core_path' );
-
-require_once( $t_core_path . 'email_api.php' );
-require_once( $t_core_path . 'database_api.php' );
+require_once( 'email_api.php' );
+require_once( 'database_api.php' );
 
 define( 'BAD', 0 );
 define( 'GOOD', 1 );
@@ -238,7 +236,7 @@ function test_database_utf8() {
 }
 
 
-	require_once( $t_core_path . 'obsolete.php' );
+	require_once( 'obsolete.php' );
 
 	html_page_top( 'MantisBT Administration - Check Installation' );
 
diff --git a/admin/test_email.php b/admin/test_email.php
index d84d464e17..4c6de4bd0f 100644
--- a/admin/test_email.php
+++ b/admin/test_email.php
@@ -27,8 +27,6 @@
 
 access_ensure_global_level( ADMINISTRATOR );
 
-$t_core_path = config_get( 'core_path' );
-
 $f_mail_test = gpc_get_bool( 'mail_test' );
 
 html_page_top();
diff --git a/admin/test_icons.php b/admin/test_icons.php
index b4099c0a7f..49fe4a7d4c 100644
--- a/admin/test_icons.php
+++ b/admin/test_icons.php
@@ -27,8 +27,6 @@
 
 access_ensure_global_level( ADMINISTRATOR );
 
-$t_core_path = config_get( 'core_path' );
-
 html_page_top();
 
 foreach( $g_file_type_icons as $t_ext => $t_filename ) {
diff --git a/billing_inc.php b/billing_inc.php
index 80b943b8ee..f14a463b43 100644
--- a/billing_inc.php
+++ b/billing_inc.php
@@ -24,12 +24,10 @@
  * @link http://www.mantisbt.org
  */
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * Requires bugnote API
  */
-require_once( $t_core_path.'bugnote_api.php' );
+require_once( 'bugnote_api.php' );
 
 if ( !config_get('time_tracking_enabled') )
 	return;
diff --git a/billing_page.php b/billing_page.php
index 2ac2cc3526..f65425d0e8 100644
--- a/billing_page.php
+++ b/billing_page.php
@@ -25,7 +25,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
 	access_ensure_global_level( config_get( 'time_tracking_reporting_threshold' ) );
 
 	html_page_top( lang_get( 'time_tracking_billing_link' )  );
diff --git a/bug_actiongroup.php b/bug_actiongroup.php
index 4604dd8079..76bde1fbe5 100644
--- a/bug_actiongroup.php
+++ b/bug_actiongroup.php
@@ -26,9 +26,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	auth_ensure_user_authenticated();
 	helper_begin_long_process();
diff --git a/bug_actiongroup_attach_tags_inc.php b/bug_actiongroup_attach_tags_inc.php
index c4cddea313..5caae4069b 100644
--- a/bug_actiongroup_attach_tags_inc.php
+++ b/bug_actiongroup_attach_tags_inc.php
@@ -21,12 +21,10 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * Requires Tag API
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	/**
 	 * Prints the title for the custom action page.
diff --git a/bug_actiongroup_ext.php b/bug_actiongroup_ext.php
index b6d601a987..4aa9520999 100644
--- a/bug_actiongroup_ext.php
+++ b/bug_actiongroup_ext.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'bug_api.php' );
-	require_once( $t_core_path . 'bug_group_action_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bug_group_action_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/bug_actiongroup_ext_page.php b/bug_actiongroup_ext_page.php
index 826e778d5a..3d05afff13 100644
--- a/bug_actiongroup_ext_page.php
+++ b/bug_actiongroup_ext_page.php
@@ -25,7 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	require_once( $t_core_path.'bug_group_action_api.php' );
+	require_once( 'bug_group_action_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/bug_actiongroup_page.php b/bug_actiongroup_page.php
index baf02552ef..0a54edfdda 100644
--- a/bug_actiongroup_page.php
+++ b/bug_actiongroup_page.php
@@ -27,7 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	require_once( $t_core_path.'bug_group_action_api.php' );
+	require_once( 'bug_group_action_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/bug_assign.php b/bug_assign.php
index 2a2878a0c7..2f1efe4d5f 100644
--- a/bug_assign.php
+++ b/bug_assign.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_assign_reporter.php b/bug_assign_reporter.php
index f4825a3767..2fbf7635ef 100644
--- a/bug_assign_reporter.php
+++ b/bug_assign_reporter.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_change_status_page.php b/bug_change_status_page.php
index e8e689971f..a61c5566d9 100644
--- a/bug_change_status_page.php
+++ b/bug_change_status_page.php
@@ -27,12 +27,10 @@
 	$g_allow_browser_cache = 1;
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
 
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-
-	require_once( $t_core_path.'relationship_api.php' );
+	require_once( 'relationship_api.php' );
 ?>
 <?php
 	$f_bug_id = gpc_get_int( 'bug_id' );
diff --git a/bug_file_add.php b/bug_file_add.php
index bc35852dd0..e7a50be2f8 100644
--- a/bug_file_add.php
+++ b/bug_file_add.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_file_delete.php b/bug_file_delete.php
index caca1695cf..9cf54d7e60 100644
--- a/bug_file_delete.php
+++ b/bug_file_delete.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_file_upload_inc.php b/bug_file_upload_inc.php
index 9bd36e3984..7c27432f98 100644
--- a/bug_file_upload_inc.php
+++ b/bug_file_upload_inc.php
@@ -23,8 +23,7 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# check if we can allow the upload... bail out if we can't
 	if ( !file_allow_bug_upload( $f_bug_id ) ) {
diff --git a/bug_graph_bycategory.php b/bug_graph_bycategory.php
index 831af29faf..deefa36ba7 100644
--- a/bug_graph_bycategory.php
+++ b/bug_graph_bycategory.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'class.period.php' );
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'class.period.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/bug_graph_bystatus.php b/bug_graph_bystatus.php
index d42e6a0b4a..eedac06587 100644
--- a/bug_graph_bystatus.php
+++ b/bug_graph_bystatus.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'class.period.php' );
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'class.period.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/bug_graph_page.php b/bug_graph_page.php
index 2531d7bb1a..9a740517f1 100644
--- a/bug_graph_page.php
+++ b/bug_graph_page.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'class.period.php' );
+	require_once( 'class.period.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/bug_monitor.php b/bug_monitor.php
index 49d467a75e..2025fa165d 100644
--- a/bug_monitor.php
+++ b/bug_monitor.php
@@ -27,9 +27,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_relationship_add.php b/bug_relationship_add.php
index b727dcdd49..423a0b144a 100644
--- a/bug_relationship_add.php
+++ b/bug_relationship_add.php
@@ -25,8 +25,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path . 'relationship_api.php' );
+
+	require_once( 'relationship_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_relationship_delete.php b/bug_relationship_delete.php
index b5d26cf691..3f9f9ade8d 100644
--- a/bug_relationship_delete.php
+++ b/bug_relationship_delete.php
@@ -31,8 +31,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path . 'relationship_api.php' );
+	require_once( 'relationship_api.php' );
 
 	$f_rel_id = gpc_get_int( 'rel_id' );
 	$f_bug_id = gpc_get_int( 'bug_id' );
diff --git a/bug_relationship_graph.php b/bug_relationship_graph.php
index b0a11f2d4c..bb5cac05ba 100644
--- a/bug_relationship_graph.php
+++ b/bug_relationship_graph.php
@@ -25,12 +25,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'relationship_graph_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'relationship_graph_api.php' );
 
 	# If relationship graphs were made disabled, we disallow any access to
 	# this script.
diff --git a/bug_relationship_graph_img.php b/bug_relationship_graph_img.php
index a927b9e9b2..de92a39873 100644
--- a/bug_relationship_graph_img.php
+++ b/bug_relationship_graph_img.php
@@ -25,12 +25,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'relationship_graph_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'relationship_graph_api.php' );
 
 	# If relationship graphs were made disabled, we disallow any access to
 	# this script.
diff --git a/bug_reminder.php b/bug_reminder.php
index 6e07896baa..58c4b89577 100644
--- a/bug_reminder.php
+++ b/bug_reminder.php
@@ -27,11 +27,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'email_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'email_api.php' );
+	require_once( 'bugnote_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_reminder_page.php b/bug_reminder_page.php
index f61e691aac..ec05956e75 100644
--- a/bug_reminder_page.php
+++ b/bug_reminder_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
diff --git a/bug_report.php b/bug_report.php
index 59938cdebf..747af4f522 100644
--- a/bug_report.php
+++ b/bug_report.php
@@ -27,12 +27,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'file_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'file_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate( 'bug_report' );
 
diff --git a/bug_report_advanced_page.php b/bug_report_advanced_page.php
index 3ff4a2f112..9e1f1cbe44 100644
--- a/bug_report_advanced_page.php
+++ b/bug_report_advanced_page.php
@@ -30,13 +30,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
-	require_once( $t_core_path.'projax_api.php' );
-	require_once( $t_core_path.'collapse_api.php' );
+	require_once( 'file_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'last_visited_api.php' );
+	require_once( 'projax_api.php' );
+	require_once( 'collapse_api.php' );
 
 	$f_master_bug_id = gpc_get_int( 'm_id', 0 );
 
diff --git a/bug_report_page.php b/bug_report_page.php
index 836141ebb5..0cc322383c 100644
--- a/bug_report_page.php
+++ b/bug_report_page.php
@@ -29,11 +29,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
+	require_once( 'file_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'last_visited_api.php' );
 
 	$f_master_bug_id = gpc_get_int( 'm_id', 0 );
 
diff --git a/bug_set_sponsorship.php b/bug_set_sponsorship.php
index 860001ff2e..26e6f59310 100644
--- a/bug_set_sponsorship.php
+++ b/bug_set_sponsorship.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'sponsorship_api.php' );
+	require_once( 'sponsorship_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bug_sponsorship_list_view_inc.php b/bug_sponsorship_list_view_inc.php
index e53295c843..bdf13a58f5 100644
--- a/bug_sponsorship_list_view_inc.php
+++ b/bug_sponsorship_list_view_inc.php
@@ -24,10 +24,8 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'sponsorship_api.php' );
-	require_once( $t_core_path . 'collapse_api.php' );
+	require_once( 'sponsorship_api.php' );
+	require_once( 'collapse_api.php' );
 
 	#
 	# Determine whether the sponsorship section should be shown.
diff --git a/bug_update.php b/bug_update.php
index eb1ad5194e..b8561b507b 100644
--- a/bug_update.php
+++ b/bug_update.php
@@ -27,11 +27,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate( 'bug_update' );
 
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 742b9c6525..fdaa99ccf1 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -27,14 +27,12 @@
 	$g_allow_browser_cache = 1;
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'ajax_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
-	require_once( $t_core_path.'projax_api.php' );
+	require_once( 'ajax_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'last_visited_api.php' );
+	require_once( 'projax_api.php' );
 
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
diff --git a/bug_update_page.php b/bug_update_page.php
index 2453c3da5d..b4fb7bd8cc 100644
--- a/bug_update_page.php
+++ b/bug_update_page.php
@@ -27,13 +27,11 @@
 	$g_allow_browser_cache = 1;
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'ajax_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
+	require_once( 'ajax_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'last_visited_api.php' );
 
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
diff --git a/bug_view_advanced_page.php b/bug_view_advanced_page.php
index 460e6a5754..6ccde0323f 100644
--- a/bug_view_advanced_page.php
+++ b/bug_view_advanced_page.php
@@ -25,16 +25,14 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'file_api.php' );
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'relationship_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
-	require_once( $t_core_path.'tag_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'file_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'relationship_api.php' );
+	require_once( 'last_visited_api.php' );
+	require_once( 'tag_api.php' );
 
 	$f_bug_id		= gpc_get_int( 'bug_id' );
 	$f_history		= gpc_get_bool( 'history', config_get( 'history_default_visible' ) );
diff --git a/bug_view_inc.php b/bug_view_inc.php
index d2597475d3..fe15a32dd8 100644
--- a/bug_view_inc.php
+++ b/bug_view_inc.php
@@ -24,10 +24,8 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'date_api.php' );
 
 	$t_bug = bug_prepare_display( bug_get( $f_bug_id, true ) );
 ?>
diff --git a/bug_view_page.php b/bug_view_page.php
index ecb753faee..944a551fb9 100644
--- a/bug_view_page.php
+++ b/bug_view_page.php
@@ -25,17 +25,15 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'file_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'relationship_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
-	require_once( $t_core_path.'tag_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'file_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'relationship_api.php' );
+	require_once( 'last_visited_api.php' );
+	require_once( 'tag_api.php' );
 
 	$f_bug_id	= gpc_get_int( 'bug_id' );
 	$f_history	= gpc_get_bool( 'history', config_get( 'history_default_visible' ) );
diff --git a/bugnote_add.php b/bugnote_add.php
index 4d35e5eacd..f6bc1523e9 100644
--- a/bugnote_add.php
+++ b/bugnote_add.php
@@ -27,10 +27,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bugnote_delete.php b/bugnote_delete.php
index e0aabd2672..466c27c287 100644
--- a/bugnote_delete.php
+++ b/bugnote_delete.php
@@ -27,11 +27,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
+	require_once( 'current_user_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bugnote_edit_page.php b/bugnote_edit_page.php
index 8405c6723c..2fa99eefd7 100644
--- a/bugnote_edit_page.php
+++ b/bugnote_edit_page.php
@@ -36,12 +36,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'current_user_api.php' );
 ?>
 <?php
 	$f_bugnote_id = gpc_get_int( 'bugnote_id' );
diff --git a/bugnote_set_view_state.php b/bugnote_set_view_state.php
index 02f87002a9..e703103c6e 100644
--- a/bugnote_set_view_state.php
+++ b/bugnote_set_view_state.php
@@ -27,10 +27,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/bugnote_stats_inc.php b/bugnote_stats_inc.php
index 06fce2b0da..952c517640 100644
--- a/bugnote_stats_inc.php
+++ b/bugnote_stats_inc.php
@@ -24,12 +24,10 @@
  * @link http://www.mantisbt.org
  */
 
-$t_core_path = config_get( 'core_path' );
-
  /**
   * MantisBT BugNote API
   */
-require_once( $t_core_path.'bugnote_api.php' );
+require_once( 'bugnote_api.php' );
 
 if ( ON != config_get('time_tracking_enabled') ) {
 	return;
diff --git a/bugnote_update.php b/bugnote_update.php
index 0ced145568..3377f95c5e 100644
--- a/bugnote_update.php
+++ b/bugnote_update.php
@@ -27,11 +27,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'bugnote_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'bugnote_api.php' );
+	require_once( 'current_user_api.php' );
 
 	$f_bugnote_id	 = gpc_get_int( 'bugnote_id' );
 	$f_bugnote_text	 = gpc_get_string( 'bugnote_text', '' );
diff --git a/bugnote_view_inc.php b/bugnote_view_inc.php
index c4a1867ddb..84d66d19bb 100644
--- a/bugnote_view_inc.php
+++ b/bugnote_view_inc.php
@@ -24,12 +24,10 @@
  * @link http://www.mantisbt.org
  */
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * Requires bugnote API
  */
-require_once( $t_core_path.'current_user_api.php' );
+require_once( 'current_user_api.php' );
 
 # grab the user id currently logged in
 $t_user_id = auth_get_current_user_id();
diff --git a/changelog_page.php b/changelog_page.php
index 636c439d9e..ea3f21fda3 100644
--- a/changelog_page.php
+++ b/changelog_page.php
@@ -25,12 +25,10 @@
   */
 require_once( 'core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * requires bug_api
  */
-require_once( $t_core_path.'bug_api.php' );
+require_once( 'bug_api.php' );
 
 /**
  * Print header for the specified project version.
diff --git a/core.php b/core.php
index 64d8d210bf..da20511b3d 100644
--- a/core.php
+++ b/core.php
@@ -126,7 +126,7 @@ function __autoload( $className ) {
 	die;
 }
 
-require_once( $t_core_path.'compress_api.php' );
+require_once( 'compress_api.php' );
 
 # Before doing anything else, start output buffering so we don't prevent
 #  headers from being sent if there's a blank line in an included file
@@ -153,59 +153,59 @@ function __autoload( $className ) {
 
 # Load rest of core in separate directory.
 
-require_once( $t_core_path.'config_api.php' );
-require_once( $t_core_path.'logging_api.php' );
+require_once( 'config_api.php' );
+require_once( 'logging_api.php' );
 
 # load utility functions used by everything else
-require_once( $t_core_path.'utility_api.php' );
+require_once( 'utility_api.php' );
 
 # Load internationalization functions (needed before database_api, in case database connection fails)
-require_once( $t_core_path.'lang_api.php' );
+require_once( 'lang_api.php' );
 
 # error functions should be loaded to allow database to print errors
-require_once( $t_core_path.'error_api.php' );
-require_once( $t_core_path.'helper_api.php' );
+require_once( 'error_api.php' );
+require_once( 'helper_api.php' );
 
 # DATABASE WILL BE OPENED HERE!!  THE DATABASE SHOULDN'T BE EXPLICITLY
 # OPENED ANYWHERE ELSE.
-require_once( $t_core_path.'database_api.php' );
+require_once( 'database_api.php' );
 
 # PHP Sessions
-require_once( $t_core_path.'session_api.php' );
+require_once( 'session_api.php' );
 
 # Initialize Event System
-require_once( $t_core_path.'event_api.php' );
-require_once( $t_core_path.'events_inc.php' );
+require_once( 'event_api.php' );
+require_once( 'events_inc.php' );
 
 # Plugin initialization
-require_once( $t_core_path.'plugin_api.php' );
+require_once( 'plugin_api.php' );
 if ( !defined( 'PLUGINS_DISABLED' ) ) {
 	plugin_init_installed();
 }
 
 # Authentication and user setup
-require_once( $t_core_path.'authentication_api.php' );
-require_once( $t_core_path.'project_api.php' );
-require_once( $t_core_path.'project_hierarchy_api.php' );
-require_once( $t_core_path.'user_api.php' );
-require_once( $t_core_path.'access_api.php' );
+require_once( 'authentication_api.php' );
+require_once( 'project_api.php' );
+require_once( 'project_hierarchy_api.php' );
+require_once( 'user_api.php' );
+require_once( 'access_api.php' );
 
 # Wiki Integration
-require_once( $t_core_path.'wiki_api.php' );
+require_once( 'wiki_api.php' );
 
 # Display API's
-require_once( $t_core_path.'html_api.php' );
-require_once( $t_core_path.'gpc_api.php' );
-require_once( $t_core_path.'form_api.php' );
-require_once( $t_core_path.'print_api.php' );
-require_once( $t_core_path.'collapse_api.php' );
+require_once( 'html_api.php' );
+require_once( 'gpc_api.php' );
+require_once( 'form_api.php' );
+require_once( 'print_api.php' );
+require_once( 'collapse_api.php' );
 if ( !defined( 'MANTIS_INSTALLER' ) ) {
 	collapse_cache_token();
 }
 
 // custom functions (in main directory)
 /** @todo Move all such files to core/ */
-require_once( $t_core_path . 'custom_function_api.php' );
+require_once( 'custom_function_api.php' );
 $t_overrides = dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'custom_functions_inc.php';
 if ( file_exists( $t_overrides ) ) {
 	require_once( $t_overrides );
diff --git a/core/json_api.php b/core/json_api.php
index 394be105d9..a71ada40c5 100644
--- a/core/json_api.php
+++ b/core/json_api.php
@@ -26,7 +26,7 @@
 /**
  * requires url_api
  */
-require_once( config_get( 'core_path' ) . 'url_api.php' );
+require_once( 'url_api.php' );
 
 /**
  * Get a chunk of JSON from a given URL.
diff --git a/core/my_view_inc.php b/core/my_view_inc.php
index a4b802079d..4d7a2ab0ec 100644
--- a/core/my_view_inc.php
+++ b/core/my_view_inc.php
@@ -20,28 +20,26 @@
  * @link http://www.mantisbt.org
  */
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * requires current_user_api
  */
-require_once( $t_core_path . 'current_user_api.php' );
+require_once( 'current_user_api.php' );
 /**
  * requires bug_api
  */
- require_once( $t_core_path . 'bug_api.php' );
+ require_once( 'bug_api.php' );
 /**
  * requires string_api
  */
-require_once( $t_core_path . 'string_api.php' );
+require_once( 'string_api.php' );
 /**
  * requires date_api
  */
-require_once( $t_core_path . 'date_api.php' );
+require_once( 'date_api.php' );
 /**
  * requires icon_api
  */
-require_once( $t_core_path . 'icon_api.php' );
+require_once( 'icon_api.php' );
 
 $t_filter = current_user_get_bug_filter();
 
diff --git a/core/news_api.php b/core/news_api.php
index f069e52d6e..6fb8c2452e 100644
--- a/core/news_api.php
+++ b/core/news_api.php
@@ -24,16 +24,14 @@
  * @link http://www.mantisbt.org
  */
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * requires current_user_api
  */
-require_once( $t_core_path . 'current_user_api.php' );
+require_once( 'current_user_api.php' );
 /**
  * requires twitter_api
  */
-require_once( $t_core_path . 'twitter_api.php' );
+require_once( 'twitter_api.php' );
 
 # --------------------
 # Add a news item
diff --git a/csv_export.php b/csv_export.php
index 73dfe82600..930f759602 100644
--- a/csv_export.php
+++ b/csv_export.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'filter_api.php' );
-	require_once( $t_core_path . 'csv_api.php' );
-	require_once( $t_core_path . 'columns_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'csv_api.php' );
+	require_once( 'columns_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/excel_xml_export.php b/excel_xml_export.php
index 51e5ce03c2..42ab7b2e09 100644
--- a/excel_xml_export.php
+++ b/excel_xml_export.php
@@ -27,13 +27,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'current_user_api.php' );
-	require_once( $t_core_path . 'bug_api.php' );
-	require_once( $t_core_path . 'string_api.php' );
-	require_once( $t_core_path . 'columns_api.php' );
-	require_once( $t_core_path . 'excel_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'columns_api.php' );
+	require_once( 'excel_api.php' );
 
 	require( 'print_all_bug_options_inc.php' );
 
diff --git a/file_download.php b/file_download.php
index 9b64589541..58cdf36484 100644
--- a/file_download.php
+++ b/file_download.php
@@ -28,9 +28,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 ?>
 <?php auth_ensure_user_authenticated() ?>
 <?php
diff --git a/graphs/graph_assigned_to_me.php b/graphs/graph_assigned_to_me.php
index 8de53f4684..45017a180a 100644
--- a/graphs/graph_assigned_to_me.php
+++ b/graphs/graph_assigned_to_me.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_by_category.php b/graphs/graph_by_category.php
index fc80b0fe06..fea12374ec 100644
--- a/graphs/graph_by_category.php
+++ b/graphs/graph_by_category.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_by_cumulative.php b/graphs/graph_by_cumulative.php
index e18ddcca41..2e6ebcd680 100644
--- a/graphs/graph_by_cumulative.php
+++ b/graphs/graph_by_cumulative.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_by_daily_delta.php b/graphs/graph_by_daily_delta.php
index b88ff37368..e965a95940 100644
--- a/graphs/graph_by_daily_delta.php
+++ b/graphs/graph_by_daily_delta.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_by_release_delta.php b/graphs/graph_by_release_delta.php
index b2c25679e7..3892aa5a15 100644
--- a/graphs/graph_by_release_delta.php
+++ b/graphs/graph_by_release_delta.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 $data_category_arr = array();
 $data_count_arr = array();
diff --git a/graphs/graph_by_severity.php b/graphs/graph_by_severity.php
index 5f15d90caa..dcda153238 100644
--- a/graphs/graph_by_severity.php
+++ b/graphs/graph_by_severity.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_by_severity_status.php b/graphs/graph_by_severity_status.php
index 9301e37b2b..1459127048 100644
--- a/graphs/graph_by_severity_status.php
+++ b/graphs/graph_by_severity_status.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/graphs/graph_reported_by_me.php b/graphs/graph_reported_by_me.php
index d6fe76993c..498278810b 100644
--- a/graphs/graph_reported_by_me.php
+++ b/graphs/graph_reported_by_me.php
@@ -26,9 +26,7 @@
  */
 require_once( '../core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'graph_api.php' );
+require_once( 'graph_api.php' );
 
 # Grab Data
 # ---
diff --git a/history_inc.php b/history_inc.php
index 76aa196c9a..4d8d5053a6 100644
--- a/history_inc.php
+++ b/history_inc.php
@@ -24,9 +24,7 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'history_api.php' );
+	require_once( 'history_api.php' );
 
 	$t_access_level_needed = config_get( 'view_history_threshold' );
 	if ( !access_has_bug_level( $t_access_level_needed, $f_bug_id ) ) {
diff --git a/issues_rss.php b/issues_rss.php
index 7576e485b8..828ef83c75 100644
--- a/issues_rss.php
+++ b/issues_rss.php
@@ -34,12 +34,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	require_once( 'rssbuilder' . DIRECTORY_SEPARATOR . 'class.RSSBuilder.inc.php' );
-	require_once( $t_core_path . 'user_api.php' );
-	require_once( $t_core_path . 'filter_api.php' );
-	require_once( $t_core_path . 'rss_api.php' );
+	require_once( 'user_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'rss_api.php' );
 
 	$f_project_id = gpc_get_int( 'project_id', ALL_PROJECTS );
 	$f_filter_id = gpc_get_int( 'filter_id', 0 );
diff --git a/main_page.php b/main_page.php
index 36eda89fbb..3ad36b7a32 100644
--- a/main_page.php
+++ b/main_page.php
@@ -28,13 +28,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'news_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'print_api.php' );
-	require_once( $t_core_path.'rss_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'print_api.php' );
+	require_once( 'rss_api.php' );
 
 	access_ensure_project_level( VIEWER );
 
diff --git a/manage_columns_copy.php b/manage_columns_copy.php
index 455833b6cd..eb4fc033a8 100644
--- a/manage_columns_copy.php
+++ b/manage_columns_copy.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'columns_api.php' );
-	require_once( $t_core_path . 'gpc_api.php' );
-	require_once( $t_core_path . 'helper_api.php' );
+	require_once( 'columns_api.php' );
+	require_once( 'gpc_api.php' );
+	require_once( 'helper_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/manage_columns_inc.php b/manage_columns_inc.php
index aeeb37993b..913329529c 100644
--- a/manage_columns_inc.php
+++ b/manage_columns_inc.php
@@ -30,8 +30,8 @@
 		 * MantisBT Core API's
 		 */
 		require_once( 'core.php' );
-		$t_core_path = config_get( 'core_path' );
-		require_once( $t_core_path . 'authentication_api.php' );
+
+		require_once( 'authentication_api.php' );
 
 		access_denied();
 	}
diff --git a/manage_config_columns_page.php b/manage_config_columns_page.php
index 3b428ad9d3..0c76827574 100644
--- a/manage_config_columns_page.php
+++ b/manage_config_columns_page.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'custom_field_api.php' );
-	require_once( $t_core_path . 'helper_api.php' );
-	require_once( $t_core_path . 'columns_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'helper_api.php' );
+	require_once( 'columns_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_config_columns_reset.php b/manage_config_columns_reset.php
index d5453dcaf7..5b8225205d 100644
--- a/manage_config_columns_reset.php
+++ b/manage_config_columns_reset.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'config_api.php' );
+	require_once( 'config_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/manage_config_columns_set.php b/manage_config_columns_set.php
index 14a523e608..efa012a842 100644
--- a/manage_config_columns_set.php
+++ b/manage_config_columns_set.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'columns_api.php' );
-	require_once( $t_core_path . 'gpc_api.php' );
+	require_once( 'columns_api.php' );
+	require_once( 'gpc_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/manage_config_email_page.php b/manage_config_email_page.php
index 0f449f60e1..af1aac75b4 100644
--- a/manage_config_email_page.php
+++ b/manage_config_email_page.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path . 'email_api.php' );
+	require_once( 'email_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_config_email_set.php b/manage_config_email_set.php
index 27ad1d62a8..e3785dfa7e 100644
--- a/manage_config_email_set.php
+++ b/manage_config_email_set.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	form_security_validate('manage_config_email_set');
 
diff --git a/manage_config_revert.php b/manage_config_revert.php
index beebe724c9..71704564ba 100644
--- a/manage_config_revert.php
+++ b/manage_config_revert.php
@@ -25,8 +25,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	form_security_validate('manage_config_revert');
 
 	auth_reauthenticate();
diff --git a/manage_config_work_threshold_page.php b/manage_config_work_threshold_page.php
index f1a90fb151..27eb39a71b 100644
--- a/manage_config_work_threshold_page.php
+++ b/manage_config_work_threshold_page.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path . 'email_api.php' );
+	require_once( 'email_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_config_work_threshold_set.php b/manage_config_work_threshold_set.php
index 6fc6dd1783..0c820d4892 100644
--- a/manage_config_work_threshold_set.php
+++ b/manage_config_work_threshold_set.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/manage_config_workflow_page.php b/manage_config_workflow_page.php
index 5a8d44cea8..a24b93c02d 100644
--- a/manage_config_workflow_page.php
+++ b/manage_config_workflow_page.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path . 'email_api.php' );
+	require_once( 'email_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_config_workflow_set.php b/manage_config_workflow_set.php
index 26b69b4f23..b0c1ad31ca 100644
--- a/manage_config_workflow_set.php
+++ b/manage_config_workflow_set.php
@@ -25,8 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/manage_custom_field_create.php b/manage_custom_field_create.php
index 587a9f8f43..523dfd3c79 100644
--- a/manage_custom_field_create.php
+++ b/manage_custom_field_create.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate('manage_custom_field_create');
 
diff --git a/manage_custom_field_delete.php b/manage_custom_field_delete.php
index 4f7bdcf06a..f5bba45180 100644
--- a/manage_custom_field_delete.php
+++ b/manage_custom_field_delete.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate('manage_custom_field_delete');
 
diff --git a/manage_custom_field_edit_page.php b/manage_custom_field_edit_page.php
index 6b02423b0d..f26a0b6160 100644
--- a/manage_custom_field_edit_page.php
+++ b/manage_custom_field_edit_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_custom_field_page.php b/manage_custom_field_page.php
index 05207b49df..ad6a5f2a69 100644
--- a/manage_custom_field_page.php
+++ b/manage_custom_field_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_custom_field_update.php b/manage_custom_field_update.php
index 4a44e29c83..4392354b39 100644
--- a/manage_custom_field_update.php
+++ b/manage_custom_field_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate('manage_custom_field_update');
 
diff --git a/manage_proj_cat_add.php b/manage_proj_cat_add.php
index 721f712030..b50e1f8db6 100644
--- a/manage_proj_cat_add.php
+++ b/manage_proj_cat_add.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'category_api.php' );
+	require_once( 'category_api.php' );
 
 	form_security_validate( 'manage_proj_cat_add' );
 
diff --git a/manage_proj_cat_copy.php b/manage_proj_cat_copy.php
index 4c6b8221e3..c48a6f8bfc 100644
--- a/manage_proj_cat_copy.php
+++ b/manage_proj_cat_copy.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'category_api.php' );
+	require_once( 'category_api.php' );
 
 	form_security_validate( 'manage_proj_cat_copy' );
 
diff --git a/manage_proj_cat_delete.php b/manage_proj_cat_delete.php
index 9ddcf820ef..f068dfb8b9 100644
--- a/manage_proj_cat_delete.php
+++ b/manage_proj_cat_delete.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'category_api.php' );
+	require_once( 'category_api.php' );
 
 	form_security_validate( 'manage_proj_cat_delete' );
 
diff --git a/manage_proj_cat_edit_page.php b/manage_proj_cat_edit_page.php
index d38831c999..17e2ef723b 100644
--- a/manage_proj_cat_edit_page.php
+++ b/manage_proj_cat_edit_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'category_api.php' );
+	require_once( 'category_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_proj_cat_update.php b/manage_proj_cat_update.php
index 2479e4f21e..03622a786d 100644
--- a/manage_proj_cat_update.php
+++ b/manage_proj_cat_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'category_api.php' );
+	require_once( 'category_api.php' );
 
 	form_security_validate( 'manage_proj_cat_update' );
 
diff --git a/manage_proj_create.php b/manage_proj_create.php
index 66104e6bc9..b7b5f29241 100644
--- a/manage_proj_create.php
+++ b/manage_proj_create.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'project_hierarchy_api.php' );
+	require_once( 'project_hierarchy_api.php' );
 
 	form_security_validate( 'manage_proj_create' );
 
diff --git a/manage_proj_custom_field_add_existing.php b/manage_proj_custom_field_add_existing.php
index 26bf999258..ee4c840e16 100644
--- a/manage_proj_custom_field_add_existing.php
+++ b/manage_proj_custom_field_add_existing.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate( 'manage_proj_custom_field_add_existing' );
 
diff --git a/manage_proj_custom_field_remove.php b/manage_proj_custom_field_remove.php
index 0ffe772839..7929919e37 100644
--- a/manage_proj_custom_field_remove.php
+++ b/manage_proj_custom_field_remove.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate( 'manage_proj_custom_field_remove' );
 
diff --git a/manage_proj_custom_field_update.php b/manage_proj_custom_field_update.php
index ebe65033dd..cae7401bd5 100644
--- a/manage_proj_custom_field_update.php
+++ b/manage_proj_custom_field_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'custom_field_api.php' );
+	require_once( 'custom_field_api.php' );
 
 	form_security_validate( 'manage_proj_custom_field_update' );
 
diff --git a/manage_proj_edit_page.php b/manage_proj_edit_page.php
index 8f454a42b3..a81906ea8e 100644
--- a/manage_proj_edit_page.php
+++ b/manage_proj_edit_page.php
@@ -25,12 +25,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'category_api.php' );
-	require_once( $t_core_path . 'version_api.php' );
-	require_once( $t_core_path . 'custom_field_api.php' );
-	require_once( $t_core_path . 'icon_api.php' );
+	require_once( 'category_api.php' );
+	require_once( 'version_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'icon_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_proj_page.php b/manage_proj_page.php
index feb36bbcb1..529e5f1738 100644
--- a/manage_proj_page.php
+++ b/manage_proj_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'icon_api.php' );
+	require_once( 'icon_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_proj_subproj_add.php b/manage_proj_subproj_add.php
index 84a199183d..6bfd3857d5 100644
--- a/manage_proj_subproj_add.php
+++ b/manage_proj_subproj_add.php
@@ -25,8 +25,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	form_security_validate( 'manage_proj_subproj_add' );
 
 	auth_reauthenticate();
diff --git a/manage_proj_subproj_delete.php b/manage_proj_subproj_delete.php
index d56f3cb2b4..4b0512f387 100644
--- a/manage_proj_subproj_delete.php
+++ b/manage_proj_subproj_delete.php
@@ -25,8 +25,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	form_security_validate( 'manage_proj_subproj_delete' );
 
 	auth_reauthenticate();
diff --git a/manage_proj_update_children.php b/manage_proj_update_children.php
index ce8db75532..d608e9312e 100644
--- a/manage_proj_update_children.php
+++ b/manage_proj_update_children.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'project_hierarchy_api.php' );
+	require_once( 'project_hierarchy_api.php' );
 
 	form_security_validate( 'manage_proj_update_children' );
 
diff --git a/manage_proj_ver_add.php b/manage_proj_ver_add.php
index 7817be5fa7..3bedcd110a 100644
--- a/manage_proj_ver_add.php
+++ b/manage_proj_ver_add.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'version_api.php' );
+	require_once( 'version_api.php' );
 
 	form_security_validate( 'manage_proj_ver_add' );
 
diff --git a/manage_proj_ver_copy.php b/manage_proj_ver_copy.php
index 4339c46f4c..f3f806c442 100644
--- a/manage_proj_ver_copy.php
+++ b/manage_proj_ver_copy.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'version_api.php' );
+	require_once( 'version_api.php' );
 
 	form_security_validate( 'manage_proj_ver_copy' );
 
diff --git a/manage_proj_ver_delete.php b/manage_proj_ver_delete.php
index fe1902dbd6..d45713dae6 100644
--- a/manage_proj_ver_delete.php
+++ b/manage_proj_ver_delete.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'version_api.php' );
+	require_once( 'version_api.php' );
 
 	form_security_validate( 'manage_proj_ver_delete' );
 
diff --git a/manage_proj_ver_update.php b/manage_proj_ver_update.php
index f6c76abb5b..711b5b2ddf 100644
--- a/manage_proj_ver_update.php
+++ b/manage_proj_ver_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'version_api.php' );
+	require_once( 'version_api.php' );
 
 	form_security_validate( 'manage_proj_ver_update' );
 
diff --git a/manage_tags_page.php b/manage_tags_page.php
index 963ed24e8e..01a0d4e51e 100644
--- a/manage_tags_page.php
+++ b/manage_tags_page.php
@@ -25,14 +25,12 @@
 
 require_once( 'core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
 /**
  * requires tag_api
  */
-require_once( $t_core_path . 'tag_api.php' );
-require_once( $t_core_path . 'user_pref_api.php' );
-require_once( $t_core_path . 'form_api.php' );
+require_once( 'tag_api.php' );
+require_once( 'user_pref_api.php' );
+require_once( 'form_api.php' );
 
 access_ensure_global_level( config_get( 'tag_view_threshold' ) );
 
diff --git a/manage_user_create.php b/manage_user_create.php
index 41b199a6b2..17f7d81596 100644
--- a/manage_user_create.php
+++ b/manage_user_create.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	form_security_validate( 'manage_user_create' );
 
diff --git a/manage_user_page.php b/manage_user_page.php
index da822bca02..b53d7cada0 100644
--- a/manage_user_page.php
+++ b/manage_user_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'icon_api.php' );
+	require_once( 'icon_api.php' );
 
 	auth_reauthenticate();
 
diff --git a/manage_user_update.php b/manage_user_update.php
index c4b481fe2b..b68c07cb07 100644
--- a/manage_user_update.php
+++ b/manage_user_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'email_api.php' );
+	require_once( 'email_api.php' );
 
 	form_security_validate('manage_user_update');
 
diff --git a/my_view_page.php b/my_view_page.php
index 75910f8add..04300df009 100644
--- a/my_view_page.php
+++ b/my_view_page.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'compress_api.php' );
-	require_once( $t_core_path . 'filter_api.php' );
-	require_once( $t_core_path . 'last_visited_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'last_visited_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/news_add.php b/news_add.php
index 46250de328..b635058277 100644
--- a/news_add.php
+++ b/news_add.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'news_api.php' );
-	require_once( $t_core_path.'print_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'print_api.php' );
 
 	news_ensure_enabled();
 
diff --git a/news_edit_page.php b/news_edit_page.php
index 319035dd5c..bf2a504004 100644
--- a/news_edit_page.php
+++ b/news_edit_page.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'news_api.php' );
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'string_api.php' );
 
 	news_ensure_enabled();
 	
diff --git a/news_list_page.php b/news_list_page.php
index 014d1d2528..76c473c5bf 100644
--- a/news_list_page.php
+++ b/news_list_page.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'news_api.php' );
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'string_api.php' );
 
 	news_ensure_enabled();
 	
diff --git a/news_rss.php b/news_rss.php
index c54b5b09bb..33414aaba5 100644
--- a/news_rss.php
+++ b/news_rss.php
@@ -25,13 +25,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	require_once( 'rssbuilder' . DIRECTORY_SEPARATOR . 'class.RSSBuilder.inc.php' );
-	require_once( $t_core_path . 'news_api.php' );
-	require_once( $t_core_path . 'project_api.php' );
-	require_once( $t_core_path . 'print_api.php' );
-	require_once( $t_core_path . 'rss_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'project_api.php' );
+	require_once( 'print_api.php' );
+	require_once( 'rss_api.php' );
 
 	$f_username = gpc_get_string( 'username', null );
 	$f_key = gpc_get_string( 'key', null );
diff --git a/news_update.php b/news_update.php
index d4b4f67fd0..21d65de2ae 100644
--- a/news_update.php
+++ b/news_update.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'news_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'print_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'print_api.php' );
 
 	news_ensure_enabled();
 
diff --git a/news_view_page.php b/news_view_page.php
index 03faa46df5..ff20bb68ae 100644
--- a/news_view_page.php
+++ b/news_view_page.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'news_api.php' );
-	require_once( $t_core_path . 'print_api.php' );
+	require_once( 'news_api.php' );
+	require_once( 'print_api.php' );
 
 	news_ensure_enabled();
 
diff --git a/permalink_page.php b/permalink_page.php
index 5ce79231b7..97871eca8c 100644
--- a/permalink_page.php
+++ b/permalink_page.php
@@ -25,8 +25,6 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	html_page_top();
 
 	access_ensure_project_level( config_get( 'create_permalink_threshold' ) );
diff --git a/plugins/XmlImportExport/ImportXml/Issue.php b/plugins/XmlImportExport/ImportXml/Issue.php
index 333335e365..455ec944c9 100644
--- a/plugins/XmlImportExport/ImportXml/Issue.php
+++ b/plugins/XmlImportExport/ImportXml/Issue.php
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with MantisBT.  If not, see <http://www.gnu.org/licenses/>.
 
-$t_core_dir = config_get( 'core_path' );
-require_once( $t_core_dir . DIRECTORY_SEPARATOR . 'bug_api.php' );
-require_once( $t_core_dir . DIRECTORY_SEPARATOR . 'user_api.php' );
+require_once( 'bug_api.php' );
+require_once( 'user_api.php' );
 require_once( 'Interface.php' );
 
 class ImportXml_Issue implements ImportXml_Interface {
diff --git a/print_all_bug_options_inc.php b/print_all_bug_options_inc.php
index aabce2740a..a11dba8fb2 100644
--- a/print_all_bug_options_inc.php
+++ b/print_all_bug_options_inc.php
@@ -21,9 +21,7 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 # this function only gets the field names, by appending strings
 function get_field_names()
diff --git a/print_all_bug_options_reset.php b/print_all_bug_options_reset.php
index c9dcf45f4d..961ce46cc5 100644
--- a/print_all_bug_options_reset.php
+++ b/print_all_bug_options_reset.php
@@ -26,10 +26,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	
+	require_once( 'current_user_api.php' );
 	require( 'print_all_bug_options_inc.php' );
 
 	# helper_ensure_post();
diff --git a/print_all_bug_page.php b/print_all_bug_page.php
index 6d7fb9931d..8ea7432978 100644
--- a/print_all_bug_page.php
+++ b/print_all_bug_page.php
@@ -31,14 +31,12 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'icon_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'columns_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'icon_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'columns_api.php' );
 	require_once( 'config_filter_defaults_inc.php' );
 
 	auth_ensure_user_authenticated();
diff --git a/print_all_bug_page_word.php b/print_all_bug_page_word.php
index 58bb9f670b..81404d9cec 100644
--- a/print_all_bug_page_word.php
+++ b/print_all_bug_page_word.php
@@ -29,13 +29,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/print_bug_page.php b/print_bug_page.php
index 8b122f9e91..6943ed5d8a 100644
--- a/print_bug_page.php
+++ b/print_bug_page.php
@@ -25,13 +25,11 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'custom_field_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'custom_field_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'last_visited_api.php' );
 
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
diff --git a/print_bugnote_inc.php b/print_bugnote_inc.php
index 70aa022a2b..b91abd299e 100644
--- a/print_bugnote_inc.php
+++ b/print_bugnote_inc.php
@@ -24,10 +24,8 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'string_api.php' );
 
 	$f_bug_id = gpc_get_int( 'bug_id' );
 
diff --git a/proj_doc_add.php b/proj_doc_add.php
index 34a4c03e7c..2e371fe861 100644
--- a/proj_doc_add.php
+++ b/proj_doc_add.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/proj_doc_add_page.php b/proj_doc_add_page.php
index 0c20ea4c6d..b871d69ee8 100644
--- a/proj_doc_add_page.php
+++ b/proj_doc_add_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# Check if project documentation feature is enabled.
 	if ( OFF == config_get( 'enable_project_documentation' ) ||
diff --git a/proj_doc_edit_page.php b/proj_doc_edit_page.php
index a6d8119438..6c6bc4641a 100644
--- a/proj_doc_edit_page.php
+++ b/proj_doc_edit_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'string_api.php' );
 
 	# Check if project documentation feature is enabled.
 	if ( OFF == config_get( 'enable_project_documentation' ) ||
diff --git a/proj_doc_page.php b/proj_doc_page.php
index 5fdecb7f39..05fe7e2068 100644
--- a/proj_doc_page.php
+++ b/proj_doc_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'string_api.php' );
 
 	$f_project_id = gpc_get_int( 'project_id', helper_get_current_project() );
 
diff --git a/proj_doc_update.php b/proj_doc_update.php
index 3b5dd33083..fddb662032 100644
--- a/proj_doc_update.php
+++ b/proj_doc_update.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'file_api.php' );
+	require_once( 'file_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/project_page.php b/project_page.php
index 8df665739f..42268384dc 100644
--- a/project_page.php
+++ b/project_page.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'project_api.php' );
-	require_once( $t_core_path . 'last_visited_api.php' );
-	require_once( $t_core_path . 'print_api.php' );
+	require_once( 'project_api.php' );
+	require_once( 'last_visited_api.php' );
+	require_once( 'print_api.php' );
 
 	$f_project_id	= gpc_get_int( 'project_id' );
 
diff --git a/query_delete.php b/query_delete.php
index 4d7d5d230e..dab51bfb66 100644
--- a/query_delete.php
+++ b/query_delete.php
@@ -24,14 +24,13 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/query_delete_page.php b/query_delete_page.php
index c7a24a9f6c..c504e38fb3 100644
--- a/query_delete_page.php
+++ b/query_delete_page.php
@@ -24,14 +24,13 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	auth_ensure_user_authenticated();
 	compress_enable();
diff --git a/query_store.php b/query_store.php
index dd6482ffa1..a085beeeb8 100644
--- a/query_store.php
+++ b/query_store.php
@@ -24,14 +24,13 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	# helper_ensure_post();
 
diff --git a/query_store_page.php b/query_store_page.php
index 0377234670..da9b2be036 100644
--- a/query_store_page.php
+++ b/query_store_page.php
@@ -24,14 +24,13 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
 
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/query_view_page.php b/query_view_page.php
index 509ca9b4ca..cc67306da5 100644
--- a/query_view_page.php
+++ b/query_view_page.php
@@ -24,15 +24,14 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'rss_api.php' );
+
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'rss_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/return_dynamic_filters.php b/return_dynamic_filters.php
index c2c3ea93d6..0dc6e9f894 100644
--- a/return_dynamic_filters.php
+++ b/return_dynamic_filters.php
@@ -24,14 +24,13 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
+
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/roadmap_page.php b/roadmap_page.php
index e599aedf19..ee7b7e9f5c 100644
--- a/roadmap_page.php
+++ b/roadmap_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 
 	# Print header for the specified project version.
 	function print_version_header( $p_version_row ) {
diff --git a/scripts/send_emails.php b/scripts/send_emails.php
index a320e5e33f..16722843c8 100644
--- a/scripts/send_emails.php
+++ b/scripts/send_emails.php
@@ -22,9 +22,7 @@
 
 require_once( dirname( dirname( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'core.php' );
 
-$t_core_path = config_get( 'core_path' );
-
-require_once( $t_core_path . 'email_api.php' );
+require_once( 'email_api.php' );
 
 # Make sure this script doesn't run via the webserver
 /** @todo This is a hack to detect php-cgi, there must be a better way. */
diff --git a/search.php b/search.php
index de5e9cd1fa..72bcbdb0a3 100644
--- a/search.php
+++ b/search.php
@@ -25,10 +25,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'compress_api.php' );
-	require_once( $t_core_path . 'filter_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/set_project.php b/set_project.php
index 61b82420e0..3430d1b0e2 100644
--- a/set_project.php
+++ b/set_project.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	$f_project_id	= gpc_get_string( 'project_id' );
 	$f_make_default	= gpc_get_bool  ( 'make_default' );
diff --git a/signup.php b/signup.php
index e02356b2a3..3b128db742 100644
--- a/signup.php
+++ b/signup.php
@@ -25,10 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'email_api.php' );
-	require_once( $t_core_path . 'disposable' . DIRECTORY_SEPARATOR . 'disposable.php' );
+	require_once( 'email_api.php' );
 
 	form_security_validate( 'signup' );
 
diff --git a/summary_graph_bycategory.php b/summary_graph_bycategory.php
index c519824aa5..ccc619c190 100644
--- a/summary_graph_bycategory.php
+++ b/summary_graph_bycategory.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bycategory_pct.php b/summary_graph_bycategory_pct.php
index f3be9248e1..a1486f0f75 100644
--- a/summary_graph_bycategory_pct.php
+++ b/summary_graph_bycategory_pct.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bydeveloper.php b/summary_graph_bydeveloper.php
index 11e3921197..d8a751db29 100644
--- a/summary_graph_bydeveloper.php
+++ b/summary_graph_bydeveloper.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bypriority.php b/summary_graph_bypriority.php
index 2517ab5f83..05db985e2d 100644
--- a/summary_graph_bypriority.php
+++ b/summary_graph_bypriority.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bypriority_mix.php b/summary_graph_bypriority_mix.php
index b0046be7f6..b2d76eaa83 100644
--- a/summary_graph_bypriority_mix.php
+++ b/summary_graph_bypriority_mix.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bypriority_pct.php b/summary_graph_bypriority_pct.php
index 1f9e382c15..3970d8fc72 100644
--- a/summary_graph_bypriority_pct.php
+++ b/summary_graph_bypriority_pct.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byreporter.php b/summary_graph_byreporter.php
index 9ef23cc718..149580f26d 100644
--- a/summary_graph_byreporter.php
+++ b/summary_graph_byreporter.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byresolution.php b/summary_graph_byresolution.php
index 8a0e01f988..a464aac6b2 100644
--- a/summary_graph_byresolution.php
+++ b/summary_graph_byresolution.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byresolution_mix.php b/summary_graph_byresolution_mix.php
index 579a052179..39044f3080 100644
--- a/summary_graph_byresolution_mix.php
+++ b/summary_graph_byresolution_mix.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byresolution_pct.php b/summary_graph_byresolution_pct.php
index b581a9196f..5d8553002d 100644
--- a/summary_graph_byresolution_pct.php
+++ b/summary_graph_byresolution_pct.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byseverity.php b/summary_graph_byseverity.php
index f63de91762..1dd51ffa8b 100644
--- a/summary_graph_byseverity.php
+++ b/summary_graph_byseverity.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byseverity_mix.php b/summary_graph_byseverity_mix.php
index d841ab5bc2..cd321fa3da 100644
--- a/summary_graph_byseverity_mix.php
+++ b/summary_graph_byseverity_mix.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_byseverity_pct.php b/summary_graph_byseverity_pct.php
index ed6df2ed91..bb886b99c6 100644
--- a/summary_graph_byseverity_pct.php
+++ b/summary_graph_byseverity_pct.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bystatus.php b/summary_graph_bystatus.php
index b056e2f0dd..6fa775d90d 100644
--- a/summary_graph_bystatus.php
+++ b/summary_graph_bystatus.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_bystatus_pct.php b/summary_graph_bystatus_pct.php
index e139a67555..a4db7adea8 100644
--- a/summary_graph_bystatus_pct.php
+++ b/summary_graph_bystatus_pct.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_cumulative_bydate.php b/summary_graph_cumulative_bydate.php
index 6551065255..480e88fd59 100644
--- a/summary_graph_cumulative_bydate.php
+++ b/summary_graph_cumulative_bydate.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'graph_api.php' );
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_imp_category.php b/summary_graph_imp_category.php
index 1a80b5d6bb..28bf93352b 100644
--- a/summary_graph_imp_category.php
+++ b/summary_graph_imp_category.php
@@ -26,8 +26,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'graph_api.php' );
+
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_imp_priority.php b/summary_graph_imp_priority.php
index 9c92effc7a..5e3c80d64a 100644
--- a/summary_graph_imp_priority.php
+++ b/summary_graph_imp_priority.php
@@ -26,8 +26,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'graph_api.php' );
+
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_imp_resolution.php b/summary_graph_imp_resolution.php
index 1caa6bb798..a2f04e2c4e 100644
--- a/summary_graph_imp_resolution.php
+++ b/summary_graph_imp_resolution.php
@@ -26,8 +26,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'graph_api.php' );
+
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_imp_severity.php b/summary_graph_imp_severity.php
index 944c59c549..8a03ef1366 100644
--- a/summary_graph_imp_severity.php
+++ b/summary_graph_imp_severity.php
@@ -25,8 +25,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'graph_api.php' );
+
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_graph_imp_status.php b/summary_graph_imp_status.php
index 6a50bf368f..0cdc3b8ab2 100644
--- a/summary_graph_imp_status.php
+++ b/summary_graph_imp_status.php
@@ -25,8 +25,8 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-	require_once( $t_core_path.'graph_api.php' );
+
+	require_once( 'graph_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/summary_page.php b/summary_page.php
index c05788ae29..dc828b85d4 100644
--- a/summary_page.php
+++ b/summary_page.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'summary_api.php' );
+	require_once( 'summary_api.php' );
 
 	access_ensure_project_level( config_get( 'view_summary_threshold' ) );
 
diff --git a/tag_attach.php b/tag_attach.php
index b3740bed88..5ab62fbaa3 100644
--- a/tag_attach.php
+++ b/tag_attach.php
@@ -24,12 +24,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	form_security_validate( 'tag_attach' );
 
diff --git a/tag_create.php b/tag_create.php
index 54adf85fd9..d4f817a09d 100644
--- a/tag_create.php
+++ b/tag_create.php
@@ -23,10 +23,10 @@
   * MantisBT Core API's
   */
 require_once( 'core.php' );
-$t_core_path = config_get( 'core_path' );
-require_once ( $t_core_path . 'html_api.php' );
-require_once ( $t_core_path . 'form_api.php' );
-require_once( $t_core_path . 'tag_api.php' );
+
+require_once ( 'html_api.php' );
+require_once ( 'form_api.php' );
+require_once( 'tag_api.php' );
 
 form_security_validate( 'tag_create' );
 
diff --git a/tag_delete.php b/tag_delete.php
index aa860e9968..c57ea27657 100644
--- a/tag_delete.php
+++ b/tag_delete.php
@@ -24,12 +24,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	form_security_validate( 'tag_delete' );
 
diff --git a/tag_detach.php b/tag_detach.php
index 93e64ce62e..5c739b8b19 100644
--- a/tag_detach.php
+++ b/tag_detach.php
@@ -24,12 +24,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	form_security_validate( 'tag_detach' );
 
diff --git a/tag_update.php b/tag_update.php
index 9e548d7aa4..9edc69f4fc 100644
--- a/tag_update.php
+++ b/tag_update.php
@@ -24,12 +24,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	form_security_validate( 'tag_update' );
 
diff --git a/tag_update_page.php b/tag_update_page.php
index c0fe3383a2..bc32a56298 100644
--- a/tag_update_page.php
+++ b/tag_update_page.php
@@ -24,16 +24,14 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires ajax_api
 	 */
-	require_once( $t_core_path . 'ajax_api.php' );
+	require_once( 'ajax_api.php' );
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	compress_enable();
 
diff --git a/tag_view_page.php b/tag_view_page.php
index 1f73465030..ba295d5ac7 100644
--- a/tag_view_page.php
+++ b/tag_view_page.php
@@ -24,12 +24,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires tag_api
 	 */
-	require_once( $t_core_path . 'tag_api.php' );
+	require_once( 'tag_api.php' );
 
 	access_ensure_global_level( config_get( 'tag_view_threshold' ) );
 	compress_enable();
diff --git a/view.php b/view.php
index 23a509d366..4b23d9c237 100644
--- a/view.php
+++ b/view.php
@@ -25,12 +25,10 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires string_api
 	 */
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'string_api.php' );
 
 	// Copy 'id' parameter into 'bug_id' so it is found by the simple/advanced view page.
 	$_GET['bug_id'] = gpc_get_int( 'id' );
diff --git a/view_all_bug_page.php b/view_all_bug_page.php
index 8598982aff..5e5bf2b439 100644
--- a/view_all_bug_page.php
+++ b/view_all_bug_page.php
@@ -25,11 +25,9 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'last_visited_api.php' );
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'last_visited_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/view_all_inc.php b/view_all_inc.php
index dfd55e6777..576fbcdcc4 100644
--- a/view_all_inc.php
+++ b/view_all_inc.php
@@ -21,32 +21,30 @@
 	 * @link http://www.mantisbt.org
 	 */
 
-	$t_core_path = config_get( 'core_path' );
-
 	/**
 	 * requires current_user_api
 	 */
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 	/**
 	 * requires bug_api
 	 */
-	require_once( $t_core_path.'bug_api.php' );
+	require_once( 'bug_api.php' );
 	/**
 	 * requires string_api
 	 */
-	require_once( $t_core_path.'string_api.php' );
+	require_once( 'string_api.php' );
 	/**
 	 * requires date_api
 	 */
-	require_once( $t_core_path.'date_api.php' );
+	require_once( 'date_api.php' );
 	/**
 	 * requires icon_api
 	 */
-	require_once( $t_core_path.'icon_api.php' );
+	require_once( 'icon_api.php' );
 	/**
 	 * requires columns_api
 	 */
-	require_once( $t_core_path.'columns_api.php' );
+	require_once( 'columns_api.php' );
 
 	$t_filter = current_user_get_bug_filter();
 
diff --git a/view_filters_page.php b/view_filters_page.php
index bad1a3a459..d82ee38b40 100644
--- a/view_filters_page.php
+++ b/view_filters_page.php
@@ -24,16 +24,15 @@
 	  * MantisBT Core API's
 	  */
 	require_once( 'core.php' );
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'compress_api.php' );
-	require_once( $t_core_path.'filter_api.php' );
-	require_once( $t_core_path.'relationship_api.php' );
-	require_once( $t_core_path.'current_user_api.php' );
-	require_once( $t_core_path.'bug_api.php' );
-	require_once( $t_core_path.'string_api.php' );
-	require_once( $t_core_path.'date_api.php' );
-	require_once( $t_core_path.'tag_api.php' );
+
+	require_once( 'compress_api.php' );
+	require_once( 'filter_api.php' );
+	require_once( 'relationship_api.php' );
+	require_once( 'current_user_api.php' );
+	require_once( 'bug_api.php' );
+	require_once( 'string_api.php' );
+	require_once( 'date_api.php' );
+	require_once( 'tag_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/view_user_page.php b/view_user_page.php
index 997badcbb1..503ead4691 100644
--- a/view_user_page.php
+++ b/view_user_page.php
@@ -24,9 +24,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path.'current_user_api.php' );
+	require_once( 'current_user_api.php' );
 
 	auth_ensure_user_authenticated();
 
diff --git a/wiki.php b/wiki.php
index 6d10ec88f3..a5cbb0ba4c 100644
--- a/wiki.php
+++ b/wiki.php
@@ -25,9 +25,7 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'wiki_api.php' );
+	require_once( 'wiki_api.php' );
 
 	$f_id = gpc_get_int( 'id' );
 	$f_type = gpc_get_string( 'type', 'issue' );
diff --git a/xmlhttprequest.php b/xmlhttprequest.php
index d2b8a47900..447411a0d6 100644
--- a/xmlhttprequest.php
+++ b/xmlhttprequest.php
@@ -28,10 +28,8 @@
 	  */
 	require_once( 'core.php' );
 
-	$t_core_path = config_get( 'core_path' );
-
-	require_once( $t_core_path . 'logging_api.php' );
-	require_once( $t_core_path . 'xmlhttprequest_api.php' );
+	require_once( 'logging_api.php' );
+	require_once( 'xmlhttprequest_api.php' );
 
 	auth_ensure_user_authenticated();