diff --git a/upload/admin/admin_attach_cp.php b/upload/admin/admin_attach_cp.php
index c73e47d02..a285d4fc6 100644
--- a/upload/admin/admin_attach_cp.php
+++ b/upload/admin/admin_attach_cp.php
@@ -20,7 +20,7 @@ else
 	$upload_dir = '../' . $attach_config['upload_dir'];
 }
 
-include(BB_ROOT .'attach_mod/includes/functions_selects.php');
+include(ATTACH_DIR .'includes/functions_selects.php');
 
 // Check if the language got included
 if (!isset($lang['TEST_SETTINGS_SUCCESSFUL']))
diff --git a/upload/admin/admin_attachments.php b/upload/admin/admin_attachments.php
index 9550e5db6..adf1bd92a 100644
--- a/upload/admin/admin_attachments.php
+++ b/upload/admin/admin_attachments.php
@@ -23,7 +23,7 @@ else
 	$upload_dir = '../' . $attach_config['upload_dir'];
 }
 
-include(BB_ROOT .'attach_mod/includes/functions_selects.php');
+include(ATTACH_DIR .'includes/functions_selects.php');
 
 // Check if the language got included
 if (!isset($lang['TEST_SETTINGS_SUCCESSFUL']))
diff --git a/upload/admin/admin_extensions.php b/upload/admin/admin_extensions.php
index d894660d9..9092c3aee 100644
--- a/upload/admin/admin_extensions.php
+++ b/upload/admin/admin_extensions.php
@@ -26,7 +26,7 @@ else
 	$upload_dir = BB_ROOT . $attach_config['upload_dir'];
 }
 
-include(BB_ROOT .'attach_mod/includes/functions_selects.php');
+include(ATTACH_DIR .'includes/functions_selects.php');
 
 // Check if the language got included
 if (!isset($lang['TEST_SETTINGS_SUCCESSFUL']))
diff --git a/upload/admin/pagestart.php b/upload/admin/pagestart.php
index 735740990..40449b461 100644
--- a/upload/admin/pagestart.php
+++ b/upload/admin/pagestart.php
@@ -5,8 +5,8 @@ define('IN_FORUM', true);
 define('IN_ADMIN', true);
 
 require(BB_ROOT .'common.php');
-require(BB_ROOT .'attach_mod/attachment_mod.php');
-require(BB_ROOT .'attach_mod/includes/functions_admin.php');
+require(ATTACH_DIR .'attachment_mod.php');
+require(ATTACH_DIR .'includes/functions_admin.php');
 require_once(INC_DIR .'functions_admin.php');
 
 $user->session_start();
diff --git a/upload/ajax.php b/upload/ajax.php
index 58539d0c8..f6838fbe2 100644
--- a/upload/ajax.php
+++ b/upload/ajax.php
@@ -34,12 +34,12 @@ switch ($ajax->action)
 	case 'mod_action':
 	case 'change_tor_status':
 	case 'gen_passkey':
-		require(BB_ROOT . 'attach_mod/attachment_mod.php');
+		require(ATTACH_DIR . 'attachment_mod.php');
 		require(INC_DIR . 'functions_torrent.php');
 		break;
 
 	case 'change_torrent':
-		require(BB_ROOT . 'attach_mod/attachment_mod.php');
+		require(ATTACH_DIR . 'attachment_mod.php');
 		require(INC_DIR . 'functions_torrent.php');
 		break;
 
diff --git a/upload/attach_mod/attachment_mod.php b/upload/attach_mod/attachment_mod.php
index 0e01672a6..3c87a76b0 100644
--- a/upload/attach_mod/attachment_mod.php
+++ b/upload/attach_mod/attachment_mod.php
@@ -2,11 +2,11 @@
 
 if (!defined('IN_FORUM')) die("Hacking attempt");
 
-require(BB_ROOT .'attach_mod/includes/functions_includes.php');
-require(BB_ROOT .'attach_mod/includes/functions_attach.php');
-require(BB_ROOT .'attach_mod/includes/functions_delete.php');
-require(BB_ROOT .'attach_mod/includes/functions_thumbs.php');
-require(BB_ROOT .'attach_mod/includes/functions_filetypes.php');
+require(ATTACH_DIR .'includes/functions_includes.php');
+require(ATTACH_DIR .'includes/functions_attach.php');
+require(ATTACH_DIR .'includes/functions_delete.php');
+require(ATTACH_DIR .'includes/functions_thumbs.php');
+require(ATTACH_DIR .'includes/functions_filetypes.php');
 
 if (defined('ATTACH_INSTALL'))
 {
@@ -76,7 +76,7 @@ if (!($attach_config = CACHE('bb_cache')->get('attach_config')))
 	CACHE('bb_cache')->set('attach_config', $attach_config, 86400);
 }
 
-include(BB_ROOT .'attach_mod/displaying.php');
-include(BB_ROOT .'attach_mod/posting_attachments.php');
+include(ATTACH_DIR .'displaying.php');
+include(ATTACH_DIR .'posting_attachments.php');
 
 $upload_dir = $attach_config['upload_dir'];
\ No newline at end of file
diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php
index 4c544a2a6..1efd81481 100644
--- a/upload/attach_mod/displaying.php
+++ b/upload/attach_mod/displaying.php
@@ -344,7 +344,7 @@ function display_attachments($post_id)
 			// bt
 			if ($link && ($attachments['_'. $post_id][$i]['extension'] === TORRENT_EXT))
 			{
-				include(BB_ROOT .'attach_mod/displaying_torrent.php');
+				include(ATTACH_DIR .'displaying_torrent.php');
 			}
 			else if ($link)
 			{
diff --git a/upload/attach_mod/includes/functions_includes.php b/upload/attach_mod/includes/functions_includes.php
index a5784ed56..a4e8708ad 100644
--- a/upload/attach_mod/includes/functions_includes.php
+++ b/upload/attach_mod/includes/functions_includes.php
@@ -33,9 +33,9 @@ function attachment_quota_settings($admin_mode, $submit = false, $mode)
 		$upload_dir = BB_ROOT . $attach_config['upload_dir'];
 	}
 
-	include(BB_ROOT .'attach_mod/includes/functions_selects.php');
+	include(ATTACH_DIR .'includes/functions_selects.php');
 	if (!function_exists("process_quota_settings"))
-		include(BB_ROOT . 'attach_mod/includes/functions_admin.php');
+		include(ATTACH_DIR . 'includes/functions_admin.php');
 
 	$user_id = 0;
 
diff --git a/upload/config.php b/upload/config.php
index b92071297..7e4b730dc 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -239,16 +239,16 @@ $page_cfg['show_torhelp'] = array(
 // Path (trailing slash '/' at the end: XX_PATH - without, XX_DIR - with)
 define('DIR_SEPR', DIRECTORY_SEPARATOR);
 
-define('BB_PATH',       realpath(BB_ROOT)     );  // absolute pathname to the forum root
-define('ADMIN_DIR',     BB_PATH .'/admin/'    );
-define('CACHE_DIR',     BB_PATH .'/cache/'    );
-define('CFG_DIR',       BB_PATH .'/config/'   );
-define('INC_DIR',       BB_PATH .'/includes/' );
-define('LANG_ROOT_DIR', BB_PATH .'/language/' );
-define('LOG_DIR',       BB_PATH .'/log/'      );
-define('TEMPLATES_DIR', BB_PATH .'/templates/');
-define('TRIGGERS_DIR',  BB_PATH .'/triggers/' );
-define('LOCKS_DIR',     BB_PATH .'/locks/'    );
+define('BB_PATH',       realpath(BB_ROOT)      );  // absolute pathname to the forum root
+define('ADMIN_DIR',     BB_PATH .'/admin/'     );
+define('ATTACH_DIR',    BB_PATH .'/attach_mod/');
+define('CACHE_DIR',     BB_PATH .'/cache/'     );
+define('CFG_DIR',       BB_PATH .'/config/'    );
+define('INC_DIR',       BB_PATH .'/includes/'  );
+define('LANG_ROOT_DIR', BB_PATH .'/language/'  );
+define('LOG_DIR',       BB_PATH .'/log/'       );
+define('TEMPLATES_DIR', BB_PATH .'/templates/' );
+define('TRIGGERS_DIR',  BB_PATH .'/triggers/'  );
 
 // URL's
 $bb_cfg['ajax_url']    = 'ajax.php';     #  "http://{$_SERVER['SERVER_NAME']}/ajax.php"
diff --git a/upload/download.php b/upload/download.php
index 26ffe65a0..6af6676dc 100644
--- a/upload/download.php
+++ b/upload/download.php
@@ -5,8 +5,8 @@ define('BB_SCRIPT', 'download');
 define('IN_SERVICE', true);
 define('NO_GZIP', true);
 define('BB_ROOT',  './');
-require(BB_ROOT ."common.php");
-require(BB_ROOT ."attach_mod/attachment_mod.php");
+require(BB_ROOT .'common.php');
+require(ATTACH_DIR .'attachment_mod.php');
 
 $datastore->enqueue(array(
 	'attach_extensions',
diff --git a/upload/misc.php b/upload/misc.php
index 900dde854..172f2317f 100644
--- a/upload/misc.php
+++ b/upload/misc.php
@@ -16,7 +16,7 @@ if ($do == 'attach_rules')
 	{
 		bb_die('invalid forum_id');
 	}
-	require(BB_ROOT .'attach_mod/attachment_mod.php');
+	require(ATTACH_DIR .'attachment_mod.php');
 	// Display the allowed Extension Groups and Upload Size
 	$auth = auth(AUTH_ALL, $forum_id, $userdata);
 	$_max_filesize = $attach_config['max_filesize'];
diff --git a/upload/posting.php b/upload/posting.php
index 82b42e45c..acef3fa9f 100644
--- a/upload/posting.php
+++ b/upload/posting.php
@@ -6,7 +6,7 @@ define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
 require(INC_DIR .'bbcode.php');
 require(INC_DIR .'functions_post.php');
-require(BB_ROOT .'attach_mod/attachment_mod.php');
+require(ATTACH_DIR .'attachment_mod.php');
 
 $page_cfg['load_tpl_vars'] = array('post_icons');
 
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index 2049efab9..088e8e77e 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -631,7 +631,7 @@ require(INC_DIR .'torrent_show_dl_list.php');
 
 if ($t_data['topic_attachment'])
 {
-	require(BB_ROOT .'attach_mod/attachment_mod.php');
+	require(ATTACH_DIR .'attachment_mod.php');
 	init_display_post_attachments($t_data['topic_attachment']);
 }