diff --git a/admin/pagestart.php b/admin/pagestart.php
index 69c2bce79..0a336eaaf 100644
--- a/admin/pagestart.php
+++ b/admin/pagestart.php
@@ -1,7 +1,6 @@
 <?php
 
 define('BB_ROOT', './../');
-define('IN_FORUM', true);
 define('IN_ADMIN', true);
 
 require(BB_ROOT .'common.php');
diff --git a/callseed.php b/callseed.php
index 0db99f1cd..33786bc7d 100644
--- a/callseed.php
+++ b/callseed.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'callseed');
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
diff --git a/common.php b/common.php
index c1bfa2a4b..993fc342a 100644
--- a/common.php
+++ b/common.php
@@ -12,7 +12,6 @@ if (empty($_SERVER['HTTP_REFERER']))    $_SERVER['HTTP_REFERER'] = '';
 if (empty($_SERVER['SERVER_NAME']))     $_SERVER['SERVER_NAME'] = '';
 
 if (!defined('BB_ROOT')) define('BB_ROOT', './');
-if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
 
 header('X-Frame-Options: SAMEORIGIN');
 
@@ -476,7 +475,7 @@ function log_request ($file = '', $prepend_str = false, $add_post = true)
 }
 
 // Board init
-if (defined('IN_FORUM'))
+if (!defined('IN_TRACKER'))
 {
 	require(INC_DIR .'init_bb.php');
 }
diff --git a/dl.php b/dl.php
index 049193ed9..83358d740 100644
--- a/dl.php
+++ b/dl.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'dl');
 define('NO_GZIP', true);
 define('BB_ROOT',  './');
diff --git a/dl_list.php b/dl_list.php
index d4db8fd9c..99523984f 100644
--- a/dl_list.php
+++ b/dl_list.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'dl_list');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/feed.php b/feed.php
index 454c6dd56..7a6e9eef6 100644
--- a/feed.php
+++ b/feed.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'feed');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/group.php b/group.php
index 38778d453..d130b281a 100644
--- a/group.php
+++ b/group.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM',   true);
 define('BB_SCRIPT', 'group');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/group_edit.php b/group_edit.php
index 801e62f69..bf27b7001 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'group_edit');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/index.php b/index.php
index 7dc7b44a9..c2a752075 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM',   true);
 define('BB_SCRIPT', 'index');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/install/upgrade/r496-user_birthday.php b/install/upgrade/r496-user_birthday.php
index a82c8f2c0..014284236 100644
--- a/install/upgrade/r496-user_birthday.php
+++ b/install/upgrade/r496-user_birthday.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 
diff --git a/install/upgrade/r571-dl_upgrade.php b/install/upgrade/r571-dl_upgrade.php
index 90adb63b5..541b04f7f 100644
--- a/install/upgrade/r571-dl_upgrade.php
+++ b/install/upgrade/r571-dl_upgrade.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 
diff --git a/install/upgrade/r575-poll_upgrade.php b/install/upgrade/r575-poll_upgrade.php
index 71388bdb4..81ce5e298 100644
--- a/install/upgrade/r575-poll_upgrade.php
+++ b/install/upgrade/r575-poll_upgrade.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 
diff --git a/install/upgrade/r583-convert_avatars.php b/install/upgrade/r583-convert_avatars.php
index 20fbe2878..85fff41e3 100644
--- a/install/upgrade/r583-convert_avatars.php
+++ b/install/upgrade/r583-convert_avatars.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 require(INC_DIR . 'functions_upload.php');
diff --git a/install/upgrade/r588-short_lang.php b/install/upgrade/r588-short_lang.php
index df2eefdde..dfb79e253 100644
--- a/install/upgrade/r588-short_lang.php
+++ b/install/upgrade/r588-short_lang.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 
diff --git a/install/upgrade/r600-stable.php b/install/upgrade/r600-stable.php
index 75c57424b..8788e74c3 100644
--- a/install/upgrade/r600-stable.php
+++ b/install/upgrade/r600-stable.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
 
diff --git a/library/attach_mod/attachment_mod.php b/library/attach_mod/attachment_mod.php
index c6f3eac02..d613f5cb6 100644
--- a/library/attach_mod/attachment_mod.php
+++ b/library/attach_mod/attachment_mod.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 require(ATTACH_DIR .'includes/functions_includes.php');
 require(ATTACH_DIR .'includes/functions_attach.php');
 require(ATTACH_DIR .'includes/functions_delete.php');
diff --git a/library/attach_mod/displaying.php b/library/attach_mod/displaying.php
index e681c7390..c7a5c65f4 100644
--- a/library/attach_mod/displaying.php
+++ b/library/attach_mod/displaying.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 $allowed_extensions = array();
 $display_categories = array();
 $download_modes = array();
diff --git a/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
index 4373939a7..c99254e03 100644
--- a/library/attach_mod/displaying_torrent.php
+++ b/library/attach_mod/displaying_torrent.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die(basename(__FILE__));
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $images;
 
diff --git a/library/attach_mod/includes/functions_thumbs.php b/library/attach_mod/includes/functions_thumbs.php
index 54b9035d2..7c446de58 100644
--- a/library/attach_mod/includes/functions_thumbs.php
+++ b/library/attach_mod/includes/functions_thumbs.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 $imagick = '';
 
 /**
diff --git a/library/attach_mod/posting_attachments.php b/library/attach_mod/posting_attachments.php
index 368706b3a..b7466d78f 100644
--- a/library/attach_mod/posting_attachments.php
+++ b/library/attach_mod/posting_attachments.php
@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 define('FILENAME_PREFIX',         false);
 define('FILENAME_PREFIX_LENGTH',  6);
 define('FILENAME_MAX_LENGTH',     180);
diff --git a/library/includes/ucp/activate.php b/library/includes/ucp/activate.php
index 7cfdc91d2..2806c5e33 100644
--- a/library/includes/ucp/activate.php
+++ b/library/includes/ucp/activate.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die('Hacking attempt');
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 if (empty($_GET['u']) || empty($_GET['act_key']))
 {
diff --git a/library/includes/ucp/email.php b/library/includes/ucp/email.php
index 382727706..2022dca34 100644
--- a/library/includes/ucp/email.php
+++ b/library/includes/ucp/email.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 // Is send through board enabled? No, return to index
 if (!$bb_cfg['board_email_form'])
diff --git a/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php
index 051ee55b9..546177c77 100644
--- a/library/includes/ucp/sendpasswd.php
+++ b/library/includes/ucp/sendpasswd.php
@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 set_die_append_msg();
 
diff --git a/login.php b/login.php
index f16742e53..184e66894 100644
--- a/login.php
+++ b/login.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM',   true);
 define('BB_SCRIPT', 'login');
 define('IN_LOGIN', true);
 define('BB_ROOT', './');
diff --git a/memberlist.php b/memberlist.php
index 7a55374d0..3db1ea906 100644
--- a/memberlist.php
+++ b/memberlist.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'memberlist');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/modcp.php b/modcp.php
index 6467704ca..4a2b9a70e 100644
--- a/modcp.php
+++ b/modcp.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'modcp');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
diff --git a/posting.php b/posting.php
index 6c02c0954..51a0d9fb4 100644
--- a/posting.php
+++ b/posting.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'posting');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
diff --git a/privmsg.php b/privmsg.php
index 440adde73..9da32edb9 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM',   true);
 define('BB_SCRIPT', 'pm');
 define('IN_PM',     true);
 define('BB_ROOT', './');
diff --git a/viewforum.php b/viewforum.php
index 39fc24677..69595b0b7 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM',   true);
 define('BB_SCRIPT', 'forum');
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');
diff --git a/viewtopic.php b/viewtopic.php
index 52b133746..0e09d94f1 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'topic');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
@@ -61,32 +60,6 @@ if (!$topic_id && !$post_id)
 $tracking_topics = get_tracks('topic');
 $tracking_forums = get_tracks('forum');
 
-// Find topic id if user requested a newer or older topic
-if ($topic_id && isset($_GET['view']) && ($_GET['view'] == 'next' || $_GET['view'] == 'previous'))
-{
-	$sql_condition = ($_GET['view'] == 'next') ? '>' : '<';
-	$sql_ordering = ($_GET['view'] == 'next') ? 'ASC' : 'DESC';
-
-	$sql = "SELECT t.topic_id
-		FROM ". BB_TOPICS ." t, ". BB_TOPICS ." t2
-		WHERE t2.topic_id = $topic_id
-			AND t.forum_id = t2.forum_id
-			AND t.topic_moved_id = 0
-			AND t.topic_last_post_id $sql_condition t2.topic_last_post_id
-		ORDER BY t.topic_last_post_id $sql_ordering
-		LIMIT 1";
-
-	if ($row = DB()->fetch_row($sql))
-	{
-		$next_topic_id = $topic_id = $row['topic_id'];
-	}
-	else
-	{
-		$message = ($_GET['view'] == 'next') ? $lang['NO_NEWER_TOPICS'] : $lang['NO_OLDER_TOPICS'];
-		bb_die($message);
-	}
-}
-
 // Get forum/topic data
 if ($topic_id)
 {