diff --git a/html/forum/rate.php b/html/forum/rate.php
index e685f24f6a..304c30a766 100644
--- a/html/forum/rate.php
+++ b/html/forum/rate.php
@@ -1,7 +1,8 @@
 <?php
-require_once("../util.inc");
-require_once("../include.php");
-require_once("forum.inc");
+
+require_once('../include/template.inc');
+require_once('forum.inc');
+require_once('../util.inc');
 
 if (!empty($_GET['post'])) {
     $postId = $_GET['post'];
@@ -9,9 +10,9 @@ if (!empty($_GET['post'])) {
     $rating = $_POST['rating'];
 
     if ($choice == SOLUTION) {
-	    $rating = 1;
+        $rating = 1;
     } else if ($choice == OFF_TOPIC) {
-	 	$rating = -1;   
+        $rating = -1;   
     }
     
     // TODO: Define constants for these.
diff --git a/html/forum/search.php b/html/forum/search.php
index 8c1c9fec6f..c6fdafc1e0 100644
--- a/html/forum/search.php
+++ b/html/forum/search.php
@@ -1,6 +1,9 @@
 <?php
-require_once('../include.php');
+
+require_once('../include/template.inc');
 require_once('forum.inc');
+require_once('../util.inc');
+
 doHeader('Forum');
 
 /* sanitize variable */
@@ -12,7 +15,7 @@ $categories = getCategories();
 
 <p>
 	<span class="title">Search</span>
-	<br><a href="index.php"><?php echo $cfg['sitename'] ?> Forum</a>
+	<br><a href="index.php"><?php echo PROJECT ?> Forum</a>
 </p>
 
 <p style="text-align:center">