diff --git a/website/account/addpolicy.php b/website/account/addpolicy.php
index 698d696b..93cf2057 100755
--- a/website/account/addpolicy.php
+++ b/website/account/addpolicy.php
@@ -1,17 +1,17 @@
 <?php require_once "../common.inc";
 
-# $Id: addpolicy.php,v 1.10 2005/10/27 01:44:09 frabcus Exp $
+# $Id: addpolicy.php,v 1.11 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
-include "../db.inc";
-include "../cache-tools.inc";
-include "../dream.inc";
+require_once "../database.inc";
+require_once "user.inc";
+require_once "../db.inc";
+require_once "../cache-tools.inc";
+require_once "../dream.inc";
 
 $just_logged_in = do_login_screen();
 
diff --git a/website/account/changeemail.php b/website/account/changeemail.php
index 94a35cb8..89142804 100755
--- a/website/account/changeemail.php
+++ b/website/account/changeemail.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: changeemail.php,v 1.10 2005/10/06 12:45:07 frabcus Exp $
+# $Id: changeemail.php,v 1.11 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 $password1=mysql_escape_string($_POST["password1"]);
 $new_email=mysql_escape_string($_POST["new_email"]);
diff --git a/website/account/changepass.php b/website/account/changepass.php
index 7c6c270d..af283f73 100755
--- a/website/account/changepass.php
+++ b/website/account/changepass.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: changepass.php,v 1.6 2005/10/06 12:45:07 frabcus Exp $
+# $Id: changepass.php,v 1.7 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 if (user_isloggedin())
 {
diff --git a/website/account/confirm.php b/website/account/confirm.php
index 48554a97..c0c14f10 100755
--- a/website/account/confirm.php
+++ b/website/account/confirm.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: confirm.php,v 1.9 2005/10/27 01:44:09 frabcus Exp $
+# $Id: confirm.php,v 1.10 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 $email=mysql_escape_string($_GET["email"]);
 $hash=mysql_escape_string($_GET["hash"]);
diff --git a/website/account/editpolicy.php b/website/account/editpolicy.php
index 6c999731..83ac9592 100755
--- a/website/account/editpolicy.php
+++ b/website/account/editpolicy.php
@@ -7,10 +7,10 @@
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
-include "../db.inc";
-include "../cache-tools.inc";
+require_once "../database.inc";
+require_once "user.inc";
+require_once "../db.inc";
+require_once "../cache-tools.inc";
 require_once "../dream.inc";
 require_once "../DifferenceEngine.inc";
 
diff --git a/website/account/logout.php b/website/account/logout.php
index dfbf7ff8..e323c97e 100755
--- a/website/account/logout.php
+++ b/website/account/logout.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: logout.php,v 1.7 2005/10/06 12:45:07 frabcus Exp $
+# $Id: logout.php,v 1.8 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 if (user_isloggedin()) {
 	user_logout();
diff --git a/website/account/lostpass.php b/website/account/lostpass.php
index 1592de08..1e5ecb19 100755
--- a/website/account/lostpass.php
+++ b/website/account/lostpass.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: lostpass.php,v 1.6 2005/10/06 12:45:07 frabcus Exp $
+# $Id: lostpass.php,v 1.7 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 $email=mysql_escape_string($_POST["email"]);
 $user_name=mysql_escape_string($_POST["user_name"]);
diff --git a/website/account/register.php b/website/account/register.php
index 1ce08cf3..518abfa6 100755
--- a/website/account/register.php
+++ b/website/account/register.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
 
-# $Id: register.php,v 1.22 2005/10/27 01:44:09 frabcus Exp $
+# $Id: register.php,v 1.23 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 $user_name=mysql_escape_string($_POST["user_name"]);
 $password1=mysql_escape_string($_POST["password1"]);
diff --git a/website/account/settings.php b/website/account/settings.php
index 6a965973..b84d8594 100755
--- a/website/account/settings.php
+++ b/website/account/settings.php
@@ -1,14 +1,14 @@
 <?php require_once "../common.inc";
-# $Id: settings.php,v 1.19 2005/10/27 01:44:09 frabcus Exp $
+# $Id: settings.php,v 1.20 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include('../database.inc');
-include_once('user.inc');
-include "../db.inc";
+require_once "../database.inc";
+require_once "user.inc";
+require_once "../db.inc";
 $db = new DB(); 
 
 $just_logged_in = do_login_screen();
diff --git a/website/account/wiki.php b/website/account/wiki.php
index 7467db69..6b42325f 100755
--- a/website/account/wiki.php
+++ b/website/account/wiki.php
@@ -1,5 +1,5 @@
 <?php require_once "../common.inc";
-# $Id: wiki.php,v 1.23 2005/11/01 00:42:05 frabcus Exp $
+# $Id: wiki.php,v 1.24 2005/11/01 00:56:21 frabcus Exp $
 # vim:sw=4:ts=4:et:nowrap
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
@@ -7,8 +7,8 @@
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-require_once('../database.inc');
-require_once('user.inc');
+require_once "../database.inc";
+require_once "user.inc";
 
 require_once "../db.inc";
 require_once "../cache-tools.inc";
diff --git a/website/boths.php b/website/boths.php
index 89d85d05..ee3cda75 100644
--- a/website/boths.php
+++ b/website/boths.php
@@ -1,5 +1,5 @@
 <?php require_once "common.inc";
-    # $Id: boths.php,v 1.10 2005/10/05 14:42:39 frabcus Exp $
+    # $Id: boths.php,v 1.11 2005/11/01 00:56:21 frabcus Exp $
 
     # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
     # This is free software, and you are welcome to redistribute it under
@@ -8,9 +8,9 @@
 
     $title = "Voted both aye and no"; 
     include "header.inc";
-    include "db.inc";
-    include "render.inc";
-    include "parliaments.inc";
+    require_once "db.inc";
+    require_once "render.inc";
+    require_once "parliaments.inc";
     $db = new DB(); 
 
     $sort = db_scrub($_GET["sort"]);
diff --git a/website/cache-begin.inc b/website/cache-begin.inc
index 15f6c850..b3a7844b 100644
--- a/website/cache-begin.inc
+++ b/website/cache-begin.inc
@@ -1,5 +1,5 @@
 <?php
-# $Id: cache-begin.inc,v 1.19 2005/01/18 02:05:59 frabcus Exp $
+# $Id: cache-begin.inc,v 1.20 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -11,8 +11,8 @@ if (!isset($cache_params))
     $cache_params = md5($_SERVER['QUERY_STRING']);
 $cache_file = $cache_dir . $cache_params . ".html";
 
-include_once $toppath . "account/user.inc";
-include_once $toppath . "cache-tools.inc";
+require_once $toppath . "account/user.inc";
+require_once $toppath . "cache-tools.inc";
 
 if (file_exists($cache_file) && $pw_cache_enable)
 {
diff --git a/website/cache-tools.inc b/website/cache-tools.inc
index 54da497a..b61a73db 100644
--- a/website/cache-tools.inc
+++ b/website/cache-tools.inc
@@ -1,12 +1,12 @@
 <?php
-# $Id: cache-tools.inc,v 1.26 2005/10/27 01:44:09 frabcus Exp $
+# $Id: cache-tools.inc,v 1.27 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include_once $toppath . "account/user.inc";
+require_once $toppath . "account/user.inc";
 
 function newsletter_navbar() {
     $ret = "";
diff --git a/website/common.inc b/website/common.inc
index ffcaa57c..f8320294 100755
--- a/website/common.inc
+++ b/website/common.inc
@@ -1,6 +1,6 @@
 <?php
 
-# $Id: common.inc,v 1.8 2005/10/26 21:50:24 frabcus Exp $
+# $Id: common.inc,v 1.9 2005/11/01 00:56:21 frabcus Exp $
 
 # Included from all main .php files on the first line
 
@@ -70,6 +70,6 @@ function getmicrotime()
     return ((float)$usec + (float)$sec);
 }
 
-include_once $toppath . "config.php";
+require_once $toppath . "config.php";
 
 ?>
diff --git a/website/decodeids.inc b/website/decodeids.inc
index 2bbc55e5..6997c64c 100644
--- a/website/decodeids.inc
+++ b/website/decodeids.inc
@@ -1,13 +1,13 @@
 <?php
-# $Id: decodeids.inc,v 1.28 2005/10/20 10:16:15 theyworkforyou Exp $
+# $Id: decodeids.inc,v 1.29 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2005 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include $toppath . "parliaments.inc";
-include $toppath . "postcode.inc";
+require_once $toppath . "parliaments.inc";
+require_once $toppath . "postcode.inc";
 require_once $toppath . "wiki.inc";
 require_once $toppath . "links.inc";
 
diff --git a/website/divisions.php b/website/divisions.php
index 8b5a3cee..cb8bb8a6 100644
--- a/website/divisions.php
+++ b/website/divisions.php
@@ -1,17 +1,18 @@
 <?php require_once "common.inc";
-# $Id: divisions.php,v 1.18 2005/10/05 14:42:39 frabcus Exp $
+# $Id: divisions.php,v 1.19 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
+    require_once "db.inc";
     $db = new DB();
 	$bdebug = 0;
 
-	include "decodeids.inc";
-	include "tablemake.inc";
+	require_once "decodeids.inc";
+	require_once "tablemake.inc";
+    require_once "render.inc";
 
 	# constants
 	$rdismodes = array();
@@ -103,8 +104,6 @@ function makedivlink($rdisplay, $sort)
 		print "<p>You can change the order of the table by selecting
 				the headings.</p>";
 
-    include "render.inc";
-
 	function makeheadcelldivlink($rdisplay, $sort, $hcelltitle, $hcellsort, $hcellalt)
 	{
 		$dlink = makedivlink($rdisplay, $hcellsort);
diff --git a/website/dream.inc b/website/dream.inc
index 0faa0894..c120e0b0 100755
--- a/website/dream.inc
+++ b/website/dream.inc
@@ -1,13 +1,13 @@
 <?php
-# $Id: dream.inc,v 1.41 2005/10/29 17:14:51 goatchurch Exp $
+# $Id: dream.inc,v 1.42 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2005 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include_once $toppath . "wiki.inc";
-include_once $toppath . "forummagic.inc";
+require_once $toppath . "wiki.inc";
+require_once $toppath . "forummagic.inc";
 
 # the equation that should be reused on the different places
 function calc_dreammp_person_distance($nvotessame, $nvotessamestrong,
diff --git a/website/dreamplot.php b/website/dreamplot.php
index 82fa4e37..140df867 100644
--- a/website/dreamplot.php
+++ b/website/dreamplot.php
@@ -1,7 +1,7 @@
 <?php require_once "common.inc";
 header("Content-Type: image/png");
 $dreamid = intval($_GET["id"]);
-# $Id: dreamplot.php,v 1.6 2005/10/05 14:42:39 frabcus Exp $
+# $Id: dreamplot.php,v 1.7 2005/11/01 00:56:21 frabcus Exp $
 
 # Draw thumbsketch histogram of how many MPs are each distance away
 # from the Dream MP.
@@ -11,9 +11,9 @@
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include "db.inc";
-include "parliaments.inc";
-include "dream.inc";
+require_once "db.inc";
+require_once "parliaments.inc";
+require_once "dream.inc";
 
 $db = new DB(); 
 update_dreammp_person_distance($db, $dreamid); # new method
diff --git a/website/edits.php b/website/edits.php
index 50c48247..3c3c17e9 100755
--- a/website/edits.php
+++ b/website/edits.php
@@ -7,10 +7,10 @@
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include "wiki.inc";
-    include "pretty.inc";
-    include "DifferenceEngine.inc";
+    require_once "db.inc";
+    require_once "wiki.inc";
+    require_once "pretty.inc";
+    require_once "DifferenceEngine.inc";
     $db = new DB(); 
 
     $type = db_scrub($_GET["type"]);
diff --git a/website/election.php b/website/election.php
index 9b0595ba..365c235e 100644
--- a/website/election.php
+++ b/website/election.php
@@ -1,6 +1,6 @@
 <?php require_once "common.inc";
 
-# $Id: election.php,v 1.22 2005/07/15 16:57:29 frabcus Exp $
+# $Id: election.php,v 1.23 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -14,12 +14,12 @@
 # Think about dream/person distance, check it works OK
 # Do redirect stuff, using interstitial and cookies?
 
-include "db.inc";
-include "decodeids.inc";
-include "dream.inc";
-include "pretty.inc";
+require_once "db.inc";
+require_once "decodeids.inc";
+require_once "dream.inc";
+require_once "pretty.inc";
 require_once "constituencies.inc";
-include "account/user.inc";
+require_once "account/user.inc";
 $db = new DB();
 $db2 = new DB();
 
diff --git a/website/faq.php b/website/faq.php
index 9edd2ce4..dc16088b 100755
--- a/website/faq.php
+++ b/website/faq.php
@@ -1,5 +1,5 @@
 <?php require_once "common.inc";
-# $Id: faq.php,v 1.55 2005/10/14 12:02:39 frabcus Exp $
+# $Id: faq.php,v 1.56 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -86,8 +86,8 @@
 know</a> if you find any.
 
 <?php
-    include "db.inc";
-    include "parliaments.inc";
+    require_once "db.inc";
+    require_once "parliaments.inc";
     $db = new DB(); 
 
     $div_count = $db->query_one_value("select count(*) from pw_division");
diff --git a/website/header.inc b/website/header.inc
index e1c14635..5e485fb9 100644
--- a/website/header.inc
+++ b/website/header.inc
@@ -3,16 +3,16 @@
 <html>
 
 <?php
-# $Id: header.inc,v 1.63 2005/10/28 17:34:13 publicwhip Exp $
+# $Id: header.inc,v 1.64 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-include_once $toppath . "pretty.inc";
-include_once $toppath . "account/user.inc";
-include_once $toppath . "cache-tools.inc";
+require_once $toppath . "pretty.inc";
+require_once $toppath . "account/user.inc";
+require_once $toppath . "cache-tools.inc";
 
 $pagetitle = "$title - The Public Whip";
 if ($title == "Counting votes on your behalf")
diff --git a/website/index.php b/website/index.php
index 0c82667b..f400d00d 100644
--- a/website/index.php
+++ b/website/index.php
@@ -2,7 +2,7 @@
 
 $cache_params = rand(0, 10); include "cache-begin.inc";
 
-# $Id: index.php,v 1.51 2005/10/12 09:25:30 frabcus Exp $
+# $Id: index.php,v 1.52 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
@@ -18,14 +18,14 @@
 For more information about the project, <a href="faq.php">read the FAQ</a>.
 
 <?php
-    include "db.inc";
+    require_once "db.inc";
     $db = new DB();
 
-	include "decodeids.inc";
-	include "tablemake.inc";
-	include "tablepeop.inc";
+	require_once "decodeids.inc";
+	require_once "tablemake.inc";
+	require_once "tablepeop.inc";
 
-    include "dream.inc";
+    require_once "dream.inc";
 
 	update_dreammp_votemeasures($db, null, 0); # for all
 
diff --git a/website/mp.php b/website/mp.php
index 55694594..41387ec8 100644
--- a/website/mp.php
+++ b/website/mp.php
@@ -1,21 +1,21 @@
 <?php require_once "common.inc";
-    # $Id: mp.php,v 1.98 2005/10/29 17:14:51 goatchurch Exp $
+    # $Id: mp.php,v 1.99 2005/11/01 00:56:21 frabcus Exp $
 
     # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
     # This is free software, and you are welcome to redistribute it under
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
+    require_once "db.inc";
     $db = new DB();
 	$db2 = new DB();
 
 	# standard decoding functions for the url attributes
-	include "decodeids.inc";
-	include "tablemake.inc";
-	include "tableoth.inc";
-    include "dream.inc";
-	include "tablepeop.inc";
+	require_once "decodeids.inc";
+	require_once "tablemake.inc";
+	require_once "tableoth.inc";
+    require_once "dream.inc";
+	require_once "tablepeop.inc";
 
 	# pull in the voter2 type first so if it's a dreammp we can filter
 	# the main mp list
diff --git a/website/mps-xml.php b/website/mps-xml.php
index 68e6adb4..0fa6a2bb 100644
--- a/website/mps-xml.php
+++ b/website/mps-xml.php
@@ -1,19 +1,19 @@
 <?php require_once "common.inc";
-    # $Id: mps-xml.php,v 1.5 2005/10/05 14:42:39 frabcus Exp $
+    # $Id: mps-xml.php,v 1.6 2005/11/01 00:56:21 frabcus Exp $
 
     # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
     # This is free software, and you are welcome to redistribute it under
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include "render.inc";
+    require_once "db.inc";
+    require_once "render.inc";
     $db = new DB(); 
 
     header("Content-type: text/xml");
     header("Content-Disposition: attachment; filename=\"mpinfo.xml\"");
 
-    include "parliaments.inc";
+    require_once "parliaments.inc";
 
     print "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
     print "<publicwhip>\n";
diff --git a/website/mps.php b/website/mps.php
index f444d7ef..525baf0d 100644
--- a/website/mps.php
+++ b/website/mps.php
@@ -1,16 +1,16 @@
 <?php require_once "common.inc";
-    # $Id: mps.php,v 1.17 2005/10/05 14:42:39 frabcus Exp $
+    # $Id: mps.php,v 1.18 2005/11/01 00:56:21 frabcus Exp $
 
     # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
     # This is free software, and you are welcome to redistribute it under
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include "tablemake.inc";
-    include "tablepeop.inc";
+    require_once "db.inc";
+    require_once "tablemake.inc";
+    require_once "tablepeop.inc";
 
-    include "render.inc";
+    require_once "render.inc";
     $db = new DB();
 
     $sort = db_scrub($_GET["sort"]);
@@ -19,7 +19,7 @@
     else
         $title = "Rebels";
 
-    include "parliaments.inc";
+    require_once "parliaments.inc";
 	if ($parlsession != "")
 		$title .= " - " . parlsession_name($parlsession) . " Session";
 	else
diff --git a/website/policies.php b/website/policies.php
index a2e9b460..fb613faa 100644
--- a/website/policies.php
+++ b/website/policies.php
@@ -6,13 +6,13 @@
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include('database.inc');
-    include "parliaments.inc";
+    require_once "db.inc";
+    require_once "database.inc";
+    require_once "parliaments.inc";
     require_once "constituencies.inc";
-    include "render.inc";
-    include "dream.inc";
-    include_once "account/user.inc";
+    require_once "render.inc";
+    require_once "dream.inc";
+    require_once "account/user.inc";
     $dbo = new DB();
     $db = new DB();
 	global $bdebug;
diff --git a/website/policy.php b/website/policy.php
index 16643ae0..8b692e75 100644
--- a/website/policy.php
+++ b/website/policy.php
@@ -7,17 +7,17 @@
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include('database.inc');
+    require_once "db.inc";
+    require_once('database.inc');
     $db = new DB();
 
 	# standard decoding functions for the url attributes
-	include "decodeids.inc";
-	include "tablemake.inc";
+	require_once "decodeids.inc";
+	require_once "tablemake.inc";
 
-    include "render.inc";
-    include "dream.inc";
-	include "tablepeop.inc";
+    require_once "render.inc";
+    require_once "dream.inc";
+	require_once "tablepeop.inc";
 
 	# this replaces a lot of the work just below
 	$voter = get_dreammpid_attr_decode($db, "id");  # for pulling a dreammpid from id= rather than the more standard dmp=
diff --git a/website/search.php b/website/search.php
index bfd7b0f5..38b682e0 100755
--- a/website/search.php
+++ b/website/search.php
@@ -1,12 +1,12 @@
 <?php require_once "common.inc";
-# $Id: search.php,v 1.39 2005/10/12 09:25:30 frabcus Exp $
+# $Id: search.php,v 1.40 2005/11/01 00:56:21 frabcus Exp $
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
 # This is free software, and you are welcome to redistribute it under
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
+    require_once "db.inc";
     $prettyquery = html_scrub(trim($_GET["query"]));
     $query = strtolower(db_scrub(trim($_GET["query"])));
     $title = "Search for '$prettyquery'"; 
@@ -14,11 +14,11 @@
         $onload = "givefocus('query')";
         $title = "Search";
     }
-    include "render.inc";
-    include "parliaments.inc";
+    require_once "render.inc";
+    require_once "parliaments.inc";
     require_once "constituencies.inc";
     require_once "links.inc";
-    include "postcode.inc";
+    require_once "postcode.inc";
 
     $db = new DB(); 
 
diff --git a/website/test.php b/website/test.php
index af40e313..c89a5edb 100644
--- a/website/test.php
+++ b/website/test.php
@@ -9,7 +9,7 @@
 $title = "Test";
 include "header.inc";
 
-include "DifferenceEngine.inc";
+require_once "DifferenceEngine.inc";
 $df = new WordLevelDiff(
 array("Hello, this is some text. It is really quite long and took me ages to type and I got a bit fed up.\n\nIt has some paragraphs."), 
 array("Hello, this is some text. It is really quite short and took me ages to type and I got a bit fed up.\n\nIt has no paragraphs.")
diff --git a/website/twfydivinsert.php b/website/twfydivinsert.php
index 5f02ee90..e758fd03 100755
--- a/website/twfydivinsert.php
+++ b/website/twfydivinsert.php
@@ -2,7 +2,7 @@
 <html>
 
 <?php require_once "common.inc";
-# $Id: twfydivinsert.php,v 1.1 2005/07/06 14:46:52 frabcus Exp $
+# $Id: twfydivinsert.php,v 1.2 2005/11/01 00:56:21 frabcus Exp $
 # vim:sw=4:ts=4:et:nowrap
 
 # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
@@ -10,14 +10,14 @@
 # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
 # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
+    require_once "db.inc";
     $db = new DB();
 
-   	include "decodeids.inc";
-	include "tablepeop.inc";
-	include "tablemake.inc";
-	include "tableoth.inc";
-	include "pretty.inc";
+   	require_once "decodeids.inc";
+	require_once "tablepeop.inc";
+	require_once "tablemake.inc";
+	require_once "tableoth.inc";
+	require_once "pretty.inc";
 
 	# decode the attributes
 	$divattr = get_division_attr_decode($db, "");
diff --git a/website/wrans.php b/website/wrans.php
index d4f10e90..6adf209a 100644
--- a/website/wrans.php
+++ b/website/wrans.php
@@ -1,13 +1,13 @@
 <?php require_once "common.inc";
-    # $Id: wrans.php,v 1.18 2005/01/15 20:38:11 frabcus Exp $
+    # $Id: wrans.php,v 1.19 2005/11/01 00:56:21 frabcus Exp $
 
     # The Public Whip, Copyright (C) 2003 Francis Irving and Julian Todd
     # This is free software, and you are welcome to redistribute it under
     # certain conditions.  However, it comes with ABSOLUTELY NO WARRANTY.
     # For details see the file LICENSE.html in the top level of the source.
 
-    include "db.inc";
-    include "parliaments.inc";
+    require_once "db.inc";
+    require_once "parliaments.inc";
     $db = new DB(); 
 
     $prettysearch = html_scrub(trim($_GET["search"]));