diff --git a/admin/admin.php b/admin/admin.php
index 106ff89f9ff..59e5403abdd 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -2,7 +2,7 @@
       // Admin-only script to assign administrative rights to users
       // !!! based on ../course/teacher.php (cut and pasted, then mangled)
 
-	require("../config.php");
+	require_once("../config.php");
 
     # sanity checks
     assert("!ereg('[^0-9]', \$_REQUEST['add'])");
diff --git a/admin/auth.php b/admin/auth.php
index cf72f160a77..a62466993d7 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -109,7 +109,7 @@
 
     echo "<table border=\"0\" width=\"100%\" cellpadding=\"4\">";
 
-    require("$CFG->dirroot/auth/$auth/config.html");
+    require_once("$CFG->dirroot/auth/$auth/config.html");
 
     if ($auth != "email" and $auth != "none") {
         echo "<tr valign=\"top\">";
diff --git a/admin/config.php b/admin/config.php
index cb3430e0eb7..db440ce6601 100644
--- a/admin/config.php
+++ b/admin/config.php
@@ -9,8 +9,8 @@
         }
     }
 
-    require("../config.php");
-	require("../lib/countries.php");
+    require_once("../config.php");
+	require_once("../lib/countries.php");
 
     if (isset($config)) {    // For debugging purposes, protected by password
         if (md5($config) == "caf9b6b99962bf5c2264824231d7a40c") {
diff --git a/admin/cron.php b/admin/cron.php
index aca529fc1f6..bafed380ae5 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -13,7 +13,7 @@
 
     $FULLME = "cron";
 
-    require("../config.php");
+    require_once("../config.php");
 
     echo "<PRE>\n";
 
diff --git a/admin/delete.php b/admin/delete.php
index 97af1ea0db8..ca1988a3f02 100644
--- a/admin/delete.php
+++ b/admin/delete.php
@@ -3,7 +3,7 @@
 // Deletes the moodledata directory, COMPLETELY!!
 // BE VERY CAREFUL USING THIS!
 
-    include("../config.php");
+    require_once("../config.php");
 
     require_login();
 
diff --git a/admin/index.php b/admin/index.php
index 62c9e6efbf1..9a1f45d7758 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../config.php");
+    require_once("../config.php");
 
 
 /// Check that PHP is of a sufficient version
diff --git a/admin/lang.php b/admin/lang.php
index 2c3b5c66c2a..65341c63cf2 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../config.php");
+    require_once("../config.php");
 
     optional_variable($mode, "");
 
diff --git a/admin/site.php b/admin/site.php
index b1bdc50e0d7..a7271f5a26c 100644
--- a/admin/site.php
+++ b/admin/site.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../config.php");
+    require_once("../config.php");
 
     if ($site = get_site()) {
         if (!isadmin()) {
diff --git a/admin/user.php b/admin/user.php
index 4749cd64f59..c1123bc26de 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
 
-	require("../config.php");
-	require("../user/lib.php");
-    require("../lib/countries.php");
+	require_once("../config.php");
+	require_once("../user/lib.php");
+    require_once("../lib/countries.php");
 
     $recordsperpage = 30;
 
diff --git a/config-dist.php b/config-dist.php
index a9d68d83978..c9e6a4bd1f8 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -99,7 +99,7 @@ $CFG->buggy_referer = false;
 
 
 $CFG->libdir    = "$CFG->dirroot/lib";   // Do not change this
-require("$CFG->libdir/setup.php");       // Do not change this
+require_once("$CFG->libdir/setup.php");       // Do not change this
 
 // MAKE SURE WHEN YOU EDIT THIS FILE THAT THERE ARE NO SPACES, BLANK LINES, 
 // RETURNS, OR ANYTHING ELSE AFTER THE TWO CHARACTERS ON THE NEXT LINE.
diff --git a/course/categories.php b/course/categories.php
index 07506a07d8d..63c67635822 100644
--- a/course/categories.php
+++ b/course/categories.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Allows the admin to create, delete and rename course categories
 
-	require("../config.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
     if (!isadmin()) {
         error("Only administrators can use this course!");
diff --git a/course/delete.php b/course/delete.php
index e81599c369b..e8630ad2841 100644
--- a/course/delete.php
+++ b/course/delete.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
       // Admin-only code to delete a course utterly
 
-	require("../config.php");
+	require_once("../config.php");
 
     optional_variable($id);       // course id
     optional_variable($delete);   // delete confirmation
diff --git a/course/edit.php b/course/edit.php
index ce988de8734..2634a981cc6 100644
--- a/course/edit.php
+++ b/course/edit.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Edit course settings
 
-	require("../config.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
     optional_variable($id, 0);   // course id
 
diff --git a/course/editsection.php b/course/editsection.php
index eadcdac5f2d..2ddca3cffd8 100644
--- a/course/editsection.php
+++ b/course/editsection.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Edit the introduction of a section
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Week ID
 
diff --git a/course/enrol.php b/course/enrol.php
index 5072a703df9..570f1421db5 100644
--- a/course/enrol.php
+++ b/course/enrol.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Asks for a course pass key, once only, and enrols that user
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_login();
     require_variable($id);
diff --git a/course/grade.php b/course/grade.php
index 31066372cca..9fb0507758b 100644
--- a/course/grade.php
+++ b/course/grade.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Displays all grades for a student in a course
 
-	require("../config.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
     require_variable($id);              // course id
 
diff --git a/course/grades.php b/course/grades.php
index c329a86bed7..926302994c3 100644
--- a/course/grades.php
+++ b/course/grades.php
@@ -1,9 +1,9 @@
 <?PHP // $Id$
       // Displays all grades for a course
 
-	require("../config.php");
-	require("lib.php");
-    require("../lib/psxlsgen.php");
+	require_once("../config.php");
+	require_once("lib.php");
+    require_once("../lib/psxlsgen.php");
 
     require_variable($id);              // course id
     optional_variable($download, "");   // to download data 
diff --git a/course/index.php b/course/index.php
index a26cb44f91a..82ad3ee9870 100644
--- a/course/index.php
+++ b/course/index.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Display list of all courses
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     optional_variable($category, "");
 
diff --git a/course/lib.php b/course/lib.php
index eec952663e7..fe047a7740f 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -594,7 +594,7 @@ function print_side_block_end() {
 
 
 function print_admin_links ($siteid, $width=180) {
-    global $THEME, $CFG;
+    global $CFG;
     
     $icon = "<IMG SRC=\"$CFG->wwwroot/pix/i/settings.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
     $moddata[]="<A HREF=\"$CFG->wwwroot/admin/config.php\">".get_string("configvariables")."</A>";
@@ -639,7 +639,7 @@ function print_admin_links ($siteid, $width=180) {
 }
 
 function print_course_admin_links($course, $width=180) {
-    global $USER, $THEME, $CFG;
+    global $USER, $CFG;
 
     if (isteacher($course->id)) {
         $adminicon[]="<IMG SRC=\"$CFG->wwwroot/pix/i/edit.gif\" HEIGHT=16 WIDTH=16 ALT=\"\">";
diff --git a/course/log.php b/course/log.php
index 7176f324530..775b3e0f052 100644
--- a/course/log.php
+++ b/course/log.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Displays different views of the logs.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course ID
     optional_variable($user, 0); // User to display
diff --git a/course/loggraph.php b/course/loggraph.php
index 481b18f6eb6..ca050de71cf 100644
--- a/course/loggraph.php
+++ b/course/loggraph.php
@@ -1,9 +1,9 @@
 <?PHP // $Id$
       // Produces a graph of log accesses
 
-    require("../config.php");
-    require("lib.php");
-    require("$CFG->libdir/graphlib.php");
+    require_once("../config.php");
+    require_once("lib.php");
+    require_once("$CFG->libdir/graphlib.php");
 
     require_variable($id);    // Course ID
     require_variable($type);  // Graph Type
diff --git a/course/loginas.php b/course/loginas.php
index 134bafa8524..9c903ce0341 100644
--- a/course/loginas.php
+++ b/course/loginas.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Allows a teacher/admin to login as another user (in stealth mode)
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);     // course id
     optional_variable($user);   // login as this user
diff --git a/course/loglive.php b/course/loglive.php
index 9a10cebb8a0..fd9f8191ecb 100644
--- a/course/loglive.php
+++ b/course/loglive.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       //  Displays live view of recent logs
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_login($id);
 
diff --git a/course/mod.php b/course/mod.php
index 3263ecb6da5..52994dbaf80 100644
--- a/course/mod.php
+++ b/course/mod.php
@@ -35,7 +35,7 @@
 
         $modlib = "../mod/$mod->modulename/lib.php";
         if (file_exists($modlib)) {
-            include($modlib);
+            include_once($modlib);
         } else {
             error("This module is missing important code! ($modlib)");
         }
@@ -163,7 +163,7 @@
         $form->fullmodulename  = $fullmodulename;
         $form->instancename = $instance->name;
 
-        include("mod_delete.html");
+        include_once("mod_delete.html");
 
         exit;
 
@@ -284,7 +284,7 @@
 
         print_heading($pageheading);
         print_simple_box_start("center", "", "$THEME->cellheading");
-        include($modform);
+        include_once($modform);
         print_simple_box_end();
 
     } else {
diff --git a/course/social.php b/course/social.php
index c6e76577fa9..32d50de89db 100644
--- a/course/social.php
+++ b/course/social.php
@@ -2,8 +2,8 @@
     // social.php - course format featuring social forum
     //              included from view.php
     
-    include_once("$CFG->dirroot/mod/forum/lib.php");
-    include_once("$CFG->dirroot/mod/resource/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/resource/lib.php");
 
     $leftwidth = 210;
 ?>
diff --git a/course/teacher.php b/course/teacher.php
index e3172f4b36e..fce25fbd782 100644
--- a/course/teacher.php
+++ b/course/teacher.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Admin-only script to assign teachers to courses
 
-	require("../config.php");
-	require("../user/lib.php");
+	require_once("../config.php");
+	require_once("../user/lib.php");
 
     optional_variable($id);       // course id
 
diff --git a/course/teachers.php b/course/teachers.php
index e4e992f5c12..186552ebc29 100644
--- a/course/teachers.php
+++ b/course/teachers.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Allows a teacher to edit teacher order and roles for a course
 
-	require("../config.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("lib.php");
 
     require_variable($id);   // course id
 
diff --git a/course/topics.php b/course/topics.php
index d423a3a4f46..1e7ae735ff9 100644
--- a/course/topics.php
+++ b/course/topics.php
@@ -6,7 +6,7 @@
       // courses that aren't so rigidly defined by time.
       // Included from "view.php"
 
-    include_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
 
     if (isset($topic)) {
         if ($topic == "all") {
diff --git a/course/unenrol.php b/course/unenrol.php
index d5ce56600ad..9c524aa9711 100644
--- a/course/unenrol.php
+++ b/course/unenrol.php
@@ -5,8 +5,8 @@
 //  but will remove them from the student list and prevent 
 //  any course email being sent to them.
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);               //course
     optional_variable($user, $USER->id); //user
diff --git a/course/user.php b/course/user.php
index 7af2485dac7..7171f7198cf 100644
--- a/course/user.php
+++ b/course/user.php
@@ -2,8 +2,8 @@
 
 // Display user activity reports for a course
 
-    require("../config.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     require_variable($id);       // course id
     require_variable($user);     // user id
diff --git a/course/view.php b/course/view.php
index 382c79daf57..04f4ff14fa2 100644
--- a/course/view.php
+++ b/course/view.php
@@ -2,8 +2,8 @@
 
 //  Display the course home page.
 
-    include_once("../config.php");
-    include_once("lib.php");
+    require_once("../config.php");
+    require_once("lib.php");
 
     optional_variable($id);
     optional_variable($name);
diff --git a/course/weeks.php b/course/weeks.php
index 99da7560f11..ecc2d09f7c9 100644
--- a/course/weeks.php
+++ b/course/weeks.php
@@ -2,7 +2,7 @@
       // Display the whole course as "weeks" made of of modules
       // Included from "view.php"
 
-    include_once("$CFG->dirroot/mod/forum/lib.php");
+    require_once("$CFG->dirroot/mod/forum/lib.php");
 
 
     if (isset($week)) {
diff --git a/file.php b/file.php
index 78c3ecf0f4c..4ef1baf4c0d 100644
--- a/file.php
+++ b/file.php
@@ -2,8 +2,8 @@
       // This function fetches files from the data directory
       // Syntax:   file.php/courseid/dir/.../dir/filename.ext
 
-    require("config.php");
-    require("files/mimetypes.php");
+    require_once("config.php");
+    require_once("files/mimetypes.php");
 
     $lifetime = 86400;
 
diff --git a/help.php b/help.php
index 18e95bcbc0c..6a112140092 100644
--- a/help.php
+++ b/help.php
@@ -4,7 +4,7 @@
   ///            Usually this will appear in a popup 
   ///            See helpbutton() in lib/moodlelib.php
 
-  include("config.php");
+  require_once("config.php");
 
   optional_variable($file, "");
   optional_variable($text, "No text to display");
@@ -26,7 +26,7 @@
         }
 
         if (file_exists("$filepath")) {
-            include("$filepath");           // Chosen language
+            require_once("$filepath");           // Chosen language
 
         } else {                            // Fall back to English
             if ($module == "moodle") {
@@ -36,7 +36,7 @@
             }
 
             if (file_exists("$filepath")) {
-                include("$filepath");
+                require_once("$filepath");
             } else {
                 notify("Can not find the specified help file");
                 die;
diff --git a/index.php b/index.php
index a3de87b7847..656b8076a95 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,10 @@
 <?PHP  // $Id$
        // index.php - the front page.
     
-    require("config.php");
-    require("course/lib.php");
-    require("mod/resource/lib.php"); 
-    require("mod/forum/lib.php");
+    require_once("config.php");
+    require_once("course/lib.php");
+    require_once("mod/resource/lib.php"); 
+    require_once("mod/forum/lib.php");
 
     if (! $site = get_site()) {
         redirect("$CFG->wwwroot/admin/index.php");
diff --git a/lib/setup.php b/lib/setup.php
index 62d51c86a2c..3164742eaf4 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -15,7 +15,7 @@
 
 /// Connect to the database using adodb
 
-    require("$CFG->libdir/adodb/adodb.inc.php"); // Database access functions
+    require_once("$CFG->libdir/adodb/adodb.inc.php"); // Database access functions
 
     $db = &ADONewConnection($CFG->dbtype);         
 
@@ -33,9 +33,9 @@
 
 /// Load up standard libraries 
 
-    require("$CFG->libdir/weblib.php");          // Functions for producing HTML
-    require("$CFG->libdir/datalib.php");         // Functions for accessing databases
-    require("$CFG->libdir/moodlelib.php");       // Other general-purpose functions
+    require_once("$CFG->libdir/weblib.php");          // Functions for producing HTML
+    require_once("$CFG->libdir/datalib.php");         // Functions for accessing databases
+    require_once("$CFG->libdir/moodlelib.php");       // Other general-purpose functions
 
 
 /// Load up any configuration from the config table
diff --git a/login/change_password.php b/login/change_password.php
index 27ce2cf7aee..83d382ae65d 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-	include("../config.php");
+	require_once("../config.php");
 
     optional_variable($id);
 
diff --git a/login/confirm.php b/login/confirm.php
index 8091d832499..7862e7cf6ee 100644
--- a/login/confirm.php
+++ b/login/confirm.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-	require("../config.php");
+	require_once("../config.php");
 
 	if ( isset($p) && isset($s) ) {     #  p = user.secret   s = user.username
 
diff --git a/login/forgot_password.php b/login/forgot_password.php
index ec5ffc73209..d68f9696229 100644
--- a/login/forgot_password.php
+++ b/login/forgot_password.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-	include("../config.php");
+	require_once("../config.php");
 
 	if ($frm = data_submitted()) {
 
diff --git a/login/index.php b/login/index.php
index 0455c7c677d..9c7560382de 100644
--- a/login/index.php
+++ b/login/index.php
@@ -1,5 +1,6 @@
 <?PHP // $Id$
-    require("../config.php");
+
+    require_once("../config.php");
 
     // Check if the guest user exists.  If not, create one.
     if (! record_exists("user", "username", "guest")) {
diff --git a/login/logout.php b/login/logout.php
index 686ecebf17c..0e0dd19a645 100644
--- a/login/logout.php
+++ b/login/logout.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 // Logs the user out and sends them to the home page
 
-    require("../config.php");
+    require_once("../config.php");
 
     $USER = NULL;
     $SESSION = NULL;
diff --git a/login/signup.php b/login/signup.php
index f07d3c509bc..bd477d0f4ed 100644
--- a/login/signup.php
+++ b/login/signup.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-	require("../config.php");
-	require("../lib/countries.php");
+	require_once("../config.php");
+	require_once("../lib/countries.php");
 
 	if ($user = data_submitted()) {
 
diff --git a/mod/assignment/index.php b/mod/assignment/index.php
index 76c945ba7d7..167082dae40 100644
--- a/mod/assignment/index.php
+++ b/mod/assignment/index.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index ce180627801..97526afebd1 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1,6 +1,6 @@
 <?PHP  // $Id$
 
-include_once("$CFG->dirroot/files/mimetypes.php");
+require_once("$CFG->dirroot/files/mimetypes.php");
 
 define("OFFLINE",      "0");
 define("UPLOADSINGLE", "1");
diff --git a/mod/assignment/submissions.php b/mod/assignment/submissions.php
index bd3a9d49fb0..1654da237be 100644
--- a/mod/assignment/submissions.php
+++ b/mod/assignment/submissions.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Assignment
 
diff --git a/mod/assignment/upload.php b/mod/assignment/upload.php
index 6109ed23e24..50d3ac68973 100644
--- a/mod/assignment/upload.php
+++ b/mod/assignment/upload.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);          // Assignment ID
 
diff --git a/mod/assignment/view.php b/mod/assignment/view.php
index d34985fc93b..1893431ed93 100644
--- a/mod/assignment/view.php
+++ b/mod/assignment/view.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);    // Course Module ID
     optional_variable($a);    // Assignment ID
diff --git a/mod/choice/index.php b/mod/choice/index.php
index 35d0a3b9ea7..e5730369191 100644
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/choice/report.php b/mod/choice/report.php
index df27b580c60..250fd222a89 100644
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course module
 
diff --git a/mod/choice/view.php b/mod/choice/view.php
index ddc66da931e..ed8e75075c4 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
 
diff --git a/mod/forum/delete.php b/mod/forum/delete.php
index 3eb2b60a0be..a6cab3ff30b 100644
--- a/mod/forum/delete.php
+++ b/mod/forum/delete.php
@@ -2,8 +2,8 @@
 
 //  Deletes a forum entirely.  
 
-    require("../../config.php");
-    require("mod.php");
+    require_once("../../config.php");
+    require_once("mod.php");
 
     require_variable($f);  // The forum to delete.
 
diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index c2b21adf645..3cf7977a714 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -3,8 +3,8 @@
 //  Displays a post, and all the posts below it.
 //  If no post is given, displays all posts in a discussion
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($d);       // Discussion ID
     optional_variable($parent); // If set, then display this post and all children.
diff --git a/mod/forum/index.php b/mod/forum/index.php
index 672aebf71de..93dc634c582 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);          // course
 
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 3dd9dda1b5b..8170a1cbaf9 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1,6 +1,6 @@
 <?PHP  // $Id$
 
-include_once("$CFG->dirroot/files/mimetypes.php");
+require_once("$CFG->dirroot/files/mimetypes.php");
 
 /// CONSTANTS ///////////////////////////////////////////////////////////
 
diff --git a/mod/forum/post.php b/mod/forum/post.php
index fa38ce0c355..4edef6ef883 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -3,8 +3,8 @@
 //  Edit and save a new post to a discussion
 
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     if (isguest()) {
         error(get_string("noguestpost", "forum"), $_SERVER["HTTP_REFERER"]);
diff --git a/mod/forum/rate.php b/mod/forum/rate.php
index 940708c63db..7ff53c035c6 100644
--- a/mod/forum/rate.php
+++ b/mod/forum/rate.php
@@ -3,8 +3,8 @@
 //  Collect ratings, store them, then return to where we came from
 
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     if (isguest()) {
         error("Guests are not allowed to rate posts.", $_SERVER["HTTP_REFERER"]);
diff --git a/mod/forum/report.php b/mod/forum/report.php
index 66fdc43dbdf..799200e67cc 100644
--- a/mod/forum/report.php
+++ b/mod/forum/report.php
@@ -2,8 +2,8 @@
 
 //  For a given post, shows a report of all the ratings it has
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);
 
diff --git a/mod/forum/search.php b/mod/forum/search.php
index 09314ceaf24..27dffd54a05 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);           // course id
     optional_variable($search, "");  // search string
diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php
index 45b389459e6..0802b37c093 100644
--- a/mod/forum/subscribe.php
+++ b/mod/forum/subscribe.php
@@ -2,8 +2,8 @@
 
 //  Subscribe to or unsubscribe from a forum.
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);      // The forum to subscribe or unsubscribe to
     optional_variable($force);  // Force everyone to be subscribed to this forum?
diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index 519b0612b98..5688e61d1a4 100644
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);          // forum
 
diff --git a/mod/forum/view.php b/mod/forum/view.php
index 24f6517dad0..088faf413dd 100644
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);      // Course Module ID
     optional_variable($f);       // Forum ID
diff --git a/mod/journal/edit.php b/mod/journal/edit.php
index f27a5986390..4411957070f 100644
--- a/mod/journal/edit.php
+++ b/mod/journal/edit.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-	require("../../config.php");
+	require_once("../../config.php");
 
     require_variable($id);    // Course Module ID
 
diff --git a/mod/journal/index.php b/mod/journal/index.php
index 0e149569bb5..ed63bd8763a 100644
--- a/mod/journal/index.php
+++ b/mod/journal/index.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/journal/report.php b/mod/journal/report.php
index 87d9e38da90..27280daeec8 100644
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course module
 
diff --git a/mod/journal/view.php b/mod/journal/view.php
index e800aec7c12..7c8e3258e4c 100644
--- a/mod/journal/view.php
+++ b/mod/journal/view.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
 
diff --git a/mod/quiz/attempt.php b/mod/quiz/attempt.php
index e7658b2adce..5fb9188a5b7 100644
--- a/mod/quiz/attempt.php
+++ b/mod/quiz/attempt.php
@@ -2,8 +2,8 @@
 
 // This page prints a particular instance of quiz
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);    // Course Module ID, or
     optional_variable($q);     // quiz ID
diff --git a/mod/quiz/category.php b/mod/quiz/category.php
index dcc90386595..94630fa6caf 100644
--- a/mod/quiz/category.php
+++ b/mod/quiz/category.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
       // Allows a teacher to create, edit and delete categories
 
-	require("../../config.php");
-	require("lib.php");
+	require_once("../../config.php");
+	require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 2b979fe3834..49622409523 100644
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_login();
 
diff --git a/mod/quiz/index.php b/mod/quiz/index.php
index 684fbb50e8e..3cd40202315 100644
--- a/mod/quiz/index.php
+++ b/mod/quiz/index.php
@@ -2,8 +2,8 @@
 
 // This page lists all the instances of quiz in a particular course
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html
index b347bca6dbf..139311f5c2f 100644
--- a/mod/quiz/mod.html
+++ b/mod/quiz/mod.html
@@ -2,7 +2,7 @@
 <!-- It is used from /course/mod.php.  The whole instance is available as $form. -->
 
 <?PHP 
-    include_once("$CFG->dirroot/mod/quiz/lib.php");
+    require_once("$CFG->dirroot/mod/quiz/lib.php");
 
     if (empty($form->name)) {
         $form->name = "";
diff --git a/mod/quiz/question.php b/mod/quiz/question.php
index 2f765cbf3d4..75ddc40fc7e 100644
--- a/mod/quiz/question.php
+++ b/mod/quiz/question.php
@@ -1,9 +1,9 @@
 <?PHP // $Id$
       /// For creating and editing quiz questions.
 
-    require("../../config.php");
-    require("lib.php");
-    require("../../files/mimetypes.php");
+    require_once("../../config.php");
+    require_once("lib.php");
+    require_once("../../files/mimetypes.php");
 
     optional_variable($id);
 
diff --git a/mod/quiz/report.php b/mod/quiz/report.php
index 3a2364f87dc..13729e320f5 100644
--- a/mod/quiz/report.php
+++ b/mod/quiz/report.php
@@ -2,8 +2,8 @@
 
 // This page prints a particular instance of quiz
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);    // Course Module ID, or
     optional_variable($q);     // quiz ID
diff --git a/mod/quiz/view.php b/mod/quiz/view.php
index 7ecb933c5d0..0744a4bb70c 100644
--- a/mod/quiz/view.php
+++ b/mod/quiz/view.php
@@ -2,8 +2,8 @@
 
 // This page prints a particular instance of quiz
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     optional_variable($id);    // Course Module ID, or
     optional_variable($q);     // quiz ID
diff --git a/mod/resource/details.php b/mod/resource/details.php
index a974d1ad3bf..b6f41a310ac 100644
--- a/mod/resource/details.php
+++ b/mod/resource/details.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_login();
 
diff --git a/mod/resource/index.php b/mod/resource/index.php
index 0002f398e20..1fc59cc6a57 100644
--- a/mod/resource/index.php
+++ b/mod/resource/index.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../../config.php");
+    require_once("../../config.php");
 
     require_variable($id);   // course
 
diff --git a/mod/resource/view.php b/mod/resource/view.php
index ab3c99a4c56..7f4a9257334 100644
--- a/mod/resource/view.php
+++ b/mod/resource/view.php
@@ -1,7 +1,7 @@
 <?PHP  // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
 
diff --git a/mod/survey/details.php b/mod/survey/details.php
index e805c0f9cbf..5cb1ca9a907 100644
--- a/mod/survey/details.php
+++ b/mod/survey/details.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../../config.php");
+    require_once("../../config.php");
 
     if ($form = data_submitted($destination)) { 
 
diff --git a/mod/survey/download.php b/mod/survey/download.php
index c400a17719a..45cafd753be 100644
--- a/mod/survey/download.php
+++ b/mod/survey/download.php
@@ -109,7 +109,7 @@
 // Output the file as a valid Excel spreadsheet if required
 
     if ($type == "xls") {
-        include( "$CFG->libdir/psxlsgen.php" );
+        require_once( "$CFG->libdir/psxlsgen.php" );
 
 
         $myxls = new PhpSimpleXlsGen();
diff --git a/mod/survey/graph.php b/mod/survey/graph.php
index fb9b70a470d..fed1e359a37 100644
--- a/mod/survey/graph.php
+++ b/mod/survey/graph.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("$CFG->libdir/graphlib.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("$CFG->libdir/graphlib.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
     require_variable($type);  // Graph Type
diff --git a/mod/survey/index.php b/mod/survey/index.php
index 66f96773f1c..12bcfc56ce8 100644
--- a/mod/survey/index.php
+++ b/mod/survey/index.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    require("../../config.php");
-    require("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);   // course
 
diff --git a/mod/survey/report.php b/mod/survey/report.php
index c397b587e2b..ca3c51eb1ca 100644
--- a/mod/survey/report.php
+++ b/mod/survey/report.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    include("../../config.php");
-    include("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
 // Check that all the parameters have been provided.
  
diff --git a/mod/survey/save.php b/mod/survey/save.php
index 63536bb5da8..00dcb766701 100644
--- a/mod/survey/save.php
+++ b/mod/survey/save.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-	require('../../config.php');
-	require('lib.php');
+	require_once('../../config.php');
+	require_once('lib.php');
 
 
 // Make sure this is a legitimate posting
diff --git a/mod/survey/view.php b/mod/survey/view.php
index d3c7436c267..12091a6e9c5 100644
--- a/mod/survey/view.php
+++ b/mod/survey/view.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
-    include("../../config.php");
-    include("lib.php");
+    require_once("../../config.php");
+    require_once("lib.php");
 
     require_variable($id);    // Course Module ID
 
diff --git a/theme/index.php b/theme/index.php
index 5c4aef8ba95..11af3a8e36f 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-    require("../config.php");
+    require_once("../config.php");
 
     optional_variable($preview);   // which theme to show
     optional_variable($choose);    // set this theme as default
diff --git a/user/edit.php b/user/edit.php
index bf29f04ab2c..27a43bee595 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -1,8 +1,8 @@
 <?PHP // $Id$
 
-	require("../config.php");
-	require("../lib/countries.php");
-	require("lib.php");
+	require_once("../config.php");
+	require_once("../lib/countries.php");
+	require_once("lib.php");
 
     require_variable($id);       // user id
     require_variable($course);   // course id
diff --git a/user/index.php b/user/index.php
index 90f8d811ed4..44fedb3d024 100644
--- a/user/index.php
+++ b/user/index.php
@@ -2,9 +2,9 @@
 
 //  Lists all the users within a given course
 
-    require("../config.php");
-    require("../lib/countries.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("../lib/countries.php");
+    require_once("lib.php");
 
     require_variable($id);   //course
     optional_variable($sort, "lastaccess");  //how to sort students
diff --git a/user/pix.php b/user/pix.php
index 9a07f13b47a..9feff114a01 100644
--- a/user/pix.php
+++ b/user/pix.php
@@ -3,7 +3,7 @@
       // Syntax:   pix.php/userid/f1.jpg or pix.php/userid/f2.jpg
       //     OR:   ?file=userid/f1.jpg or ?file=userid/f2.jpg
 
-    require("../config.php");
+    require_once("../config.php");
 
     $lifetime = 86400;
 
diff --git a/user/view.php b/user/view.php
index 0a6d88a164a..369e9d901fe 100644
--- a/user/view.php
+++ b/user/view.php
@@ -2,10 +2,10 @@
 
 //  Display profile for a particular user
 
-    require("../config.php");
-    require("../lib/countries.php");
-    require("../mod/forum/lib.php");
-    require("lib.php");
+    require_once("../config.php");
+    require_once("../lib/countries.php");
+    require_once("../mod/forum/lib.php");
+    require_once("lib.php");
 
     require_variable($id);
     require_variable($course);