diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php
index 7905822233c..35ed7b56145 100644
--- a/blocks/course_summary/block_course_summary.php
+++ b/blocks/course_summary/block_course_summary.php
@@ -14,6 +14,8 @@ class block_course_summary extends block_base {
     function get_content() {
         global $CFG, $OUTPUT;
 
+        require_once($CFG->libdir . '/filelib.php');
+
         if($this->content !== NULL) {
             return $this->content;
         }
diff --git a/blocks/html/block_html.php b/blocks/html/block_html.php
index de484a507ee..cab89acfd58 100755
--- a/blocks/html/block_html.php
+++ b/blocks/html/block_html.php
@@ -42,6 +42,10 @@ class block_html extends block_base {
     }
 
     function get_content() {
+        global $CFG;
+
+        require_once($CFG->libdir . '/filelib.php');
+
         if ($this->content !== NULL) {
             return $this->content;
         }
diff --git a/blog/locallib.php b/blog/locallib.php
index e28cee91168..52ff8c324b3 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -26,6 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once($CFG->libdir . '/filelib.php');
+
 /**
  * Blog_entry class. Represents an entry in a user's blog. Contains all methods for managing this entry.
  * This class does not contain any HTML-generating code. See blog_listing sub-classes for such code.
diff --git a/calendar/lib.php b/calendar/lib.php
index 3b6693fec40..4917100f2c9 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -1874,7 +1874,10 @@ class calendar_event {
      * @return string
      */
     protected function get_description() {
-       global $USER;
+        global $USER, $CFG;
+
+        require_once($CFG->libdir . '/filelib.php');
+
         if ($this->_description === null) {
             // Check if we have already resolved the context for this event
             if ($this->editorcontext === null) {
diff --git a/group/members.php b/group/members.php
index c871c7908df..92e4f9a26bc 100644
--- a/group/members.php
+++ b/group/members.php
@@ -12,6 +12,7 @@ require_once(dirname(__FILE__) . '/../config.php');
 require_once(dirname(__FILE__) . '/lib.php');
 require_once($CFG->dirroot . '/user/selector/lib.php');
 require_once($CFG->dirroot . '/course/lib.php');
+require_once($CFG->libdir . '/filelib.php');
 
 $groupid = required_param('group', PARAM_INT);
 $cancel  = optional_param('cancel', false, PARAM_BOOL);
diff --git a/group/overview.php b/group/overview.php
index 449ef14d491..53a5a8be029 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -9,6 +9,7 @@
  */
 
 require_once('../config.php');
+require_once($CFG->libdir . '/filelib.php');
 
 $courseid   = required_param('id', PARAM_INT);
 $groupid    = optional_param('group', 0, PARAM_INT);
diff --git a/lib/grade/grade_outcome.php b/lib/grade/grade_outcome.php
index 2f964e26441..47e538e6e7f 100644
--- a/lib/grade/grade_outcome.php
+++ b/lib/grade/grade_outcome.php
@@ -276,6 +276,9 @@ class grade_outcome extends grade_object {
      * @return string
      */
     public function get_description() {
+        global $CFG;
+        require_once($CFG->libdir . '/filelib.php');
+
         $options = new stdClass;
         $options->noclean = true;
         $systemcontext = get_context_instance(CONTEXT_SYSTEM);
diff --git a/lib/grade/grade_scale.php b/lib/grade/grade_scale.php
index 390c2880881..d9b5fb84806 100644
--- a/lib/grade/grade_scale.php
+++ b/lib/grade/grade_scale.php
@@ -313,6 +313,9 @@ class grade_scale extends grade_object {
      * @return string
      */
     public function get_description() {
+        global $CFG;
+        require_once($CFG->libdir . '/filelib.php');
+
         $systemcontext = get_context_instance(CONTEXT_SYSTEM);
         $options = new stdClass;
         $options->noclean = true;
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index c1535843521..54532f71ca5 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -2,6 +2,8 @@
 require_once($CFG->libdir.'/formslib.php');
 require_once($CFG->libdir . '/portfoliolib.php');
 require_once($CFG->dirroot . '/mod/assignment/lib.php');
+require_once($CFG->libdir . '/filelib.php');
+
 /**
  * Extend the base assignment class for assignments where you upload a single file
  *
diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php
index 5f446b9408c..ce9b3999e1f 100644
--- a/mod/feedback/item/label/lib.php
+++ b/mod/feedback/item/label/lib.php
@@ -112,7 +112,9 @@ class feedback_item_label extends feedback_item_base {
     }
 
     function print_item($item){
-        global $DB;
+        global $DB, $CFG;
+
+        require_once($CFG->libdir . '/filelib.php');
 
         //is the item a template?
         if(!$item->feedback AND $item->template) {
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 443bd8ccf99..8ffaaa9961b 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -3110,6 +3110,8 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
                           $footer="", $highlight="", $postisread=null, $dummyifcantsee=true, $istracked=null, $return=false) {
     global $USER, $CFG, $OUTPUT;
 
+    require_once($CFG->libdir . '/filelib.php');
+
     // String cache
     static $str;
 
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 0f58ef02266..858093a0b70 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -821,6 +821,10 @@ function glossary_print_entry($course, $cm, $glossary, $entry, $mode='',$hook=''
  * @return void Output is echo'd
  */
 function glossary_print_entry_default ($entry, $glossary, $cm) {
+    global $CFG;
+
+    require_once($CFG->libdir . '/filelib.php');
+
     echo '<h3>'. strip_tags($entry->concept) . ': </h3>';
 
     $definition = $entry->definition;
diff --git a/mod/glossary/showentry_ajax.php b/mod/glossary/showentry_ajax.php
index 8dac6446d60..9703a062874 100644
--- a/mod/glossary/showentry_ajax.php
+++ b/mod/glossary/showentry_ajax.php
@@ -3,6 +3,7 @@ define('AJAX_SCRIPT', true);
 
 require_once('../../config.php');
 require_once('lib.php');
+require_once($CFG->libdir . '/filelib.php');
 
 $concept  = optional_param('concept', '', PARAM_CLEAN);
 $courseid = optional_param('courseid', 0, PARAM_INT);
@@ -66,7 +67,7 @@ if ($entries) {
         $options = new stdClass();
         $options->para = false;
         $options->trusted = $entry->definitiontrust;
-        $options->context = $context; 
+        $options->context = $context;
         $entries[$key]->definition = format_text($definition, $entry->definitionformat, $options);
 
         $entries[$key]->footer = "<p style=\"text-align:right\">&raquo;&nbsp;<a href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid\">".format_string($entry->glossaryname,true)."</a></p>";
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 0f7881cc582..f5213307a7d 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -31,6 +31,7 @@ defined('MOODLE_INTERNAL') || die();
 /** Include the files that are required by this module */
 require_once($CFG->dirroot.'/course/moodleform_mod.php');
 require_once($CFG->dirroot . '/mod/lesson/lib.php');
+require_once($CFG->libdir . '/filelib.php');
 
 /** This page */
 define('LESSON_THISPAGE', 0);
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index db4f1f0ff37..c11641d7ba9 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -48,6 +48,7 @@ require_once($CFG->dirroot . '/mod/quiz/accessrules.php');
 require_once($CFG->dirroot . '/mod/quiz/attemptlib.php');
 require_once($CFG->dirroot . '/question/editlib.php');
 require_once($CFG->libdir  . '/eventslib.php');
+require_once($CFG->libdir . '/filelib.php');
 
 /// Constants ///////////////////////////////////////////////////////////////////
 
@@ -1031,7 +1032,7 @@ function quiz_send_confirmation($a) {
     $eventdata->smallmessage      = get_string('emailconfirmsmall', 'quiz', $a);
     $eventdata->contexturl        = $a->quizurl;
     $eventdata->contexturlname    = $a->quizname;
-    
+
     return message_send($eventdata);
 }
 
diff --git a/mod/quiz/report/reportlib.php b/mod/quiz/report/reportlib.php
index 74a0ef54be8..b016a2af21a 100644
--- a/mod/quiz/report/reportlib.php
+++ b/mod/quiz/report/reportlib.php
@@ -310,7 +310,10 @@ function quiz_report_highlighting_grading_method($quiz, $qmsubselect, $qmfilter)
  * @return string the comment that corresponds to this grade (empty string if there is not one.
  */
 function quiz_report_feedback_for_grade($grade, $quizid, $context) {
-    global $DB;
+    global $DB, $CFG;
+
+    require_once($CFG->libdir . '/filelib.php');
+
     static $feedbackcache = array();
     if (!isset($feedbackcache[$quizid])){
         $feedbackcache[$quizid] = $DB->get_records('quiz_feedback', array('quizid' => $quizid));
diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index 6f077953016..e411f97da71 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -34,6 +34,7 @@
 
 require_once($CFG->dirroot . '/mod/wiki/lib.php');
 require_once($CFG->dirroot . '/mod/wiki/parser/parser.php');
+require_once($CFG->libdir . '/filelib.php');
 
 define('WIKI_REFRESH_CACHE_TIME', 30); // @TODO: To be deleted.
 define('FORMAT_CREOLE', '37');
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index c3ecbc5a7ec..0f943af9c35 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -33,6 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 
 require_once(dirname(__FILE__).'/lib.php');     // we extend this library here
 require_once($CFG->libdir . '/gradelib.php');   // we use some rounding and comparing routines here
+require_once($CFG->libdir . '/filelib.php');
 
 /**
  * Full-featured workshop API
diff --git a/user/index.php b/user/index.php
index 35fff599b5e..d94cd210819 100644
--- a/user/index.php
+++ b/user/index.php
@@ -4,6 +4,7 @@
 
     require_once('../config.php');
     require_once($CFG->libdir.'/tablelib.php');
+    require_once($CFG->libdir.'/filelib.php');
 
     define('USER_SMALL_CLASS', 20);   // Below this is considered small
     define('USER_LARGE_CLASS', 200);  // Above this is considered large
diff --git a/user/view.php b/user/view.php
index d5d00eded8d..e70df1ca32e 100644
--- a/user/view.php
+++ b/user/view.php
@@ -26,6 +26,7 @@
 require_once("../config.php");
 require_once($CFG->dirroot.'/user/profile/lib.php');
 require_once($CFG->dirroot.'/tag/lib.php');
+require_once($CFG->libdir . '/filelib.php');
 
 $id        = optional_param('id', 0, PARAM_INT);   // user id
 $courseid  = optional_param('course', SITEID, PARAM_INT);   // course id (defaults to Site)