diff --git a/mod/forum/index.php b/mod/forum/index.php
index ee846b628d8..cd607672794 100644
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -393,12 +393,12 @@
     }
 
     if ($generalforums) {
-        print_heading(get_string('generalforums', 'forum'));
+        echo $OUTPUT->heading(get_string('generalforums', 'forum'));
         print_table($generaltable);
     }
 
     if ($learningforums) {
-        print_heading(get_string('learningforums', 'forum'));
+        echo $OUTPUT->heading(get_string('learningforums', 'forum'));
         print_table($learningtable);
     }
 
diff --git a/mod/forum/post.php b/mod/forum/post.php
index 54b9c0efb6a..1a692a32dc1 100644
--- a/mod/forum/post.php
+++ b/mod/forum/post.php
@@ -410,7 +410,7 @@
             $navigation = build_navigation($navlinks, $cm);
             print_header_simple(format_string($discussion->name).": ".format_string($post->subject), "", $navigation, '', "", true, "", navmenu($course, $cm));
 
-            print_heading(get_string('pruneheading', 'forum'));
+            echo $OUTPUT->heading(get_string('pruneheading', 'forum'));
             echo '<center>';
 
             include('prune.html');
diff --git a/mod/forum/search.php b/mod/forum/search.php
index 7a426e1fbb0..f5ca87a68ee 100644
--- a/mod/forum/search.php
+++ b/mod/forum/search.php
@@ -127,7 +127,7 @@
 
     if (!$posts = forum_search_posts($searchterms, $course->id, $page*$perpage, $perpage, $totalcount)) {
         print_header_simple("$strsearchresults", "", $navigation, 'search.words', "", "", "&nbsp;", navmenu($course));
-        print_heading(get_string("nopostscontaining", "forum", $search));
+        echo $OUTPUT->heading(get_string("nopostscontaining", "forum", $search));
 
         if (!$individualparams) {
             $words = $search;
@@ -158,7 +158,7 @@
                              '">'.get_string('advancedsearch','forum').'...</a>';
     echo '</div>';
 
-    print_heading("$strsearchresults: $totalcount");
+    echo $OUTPUT->heading("$strsearchresults: $totalcount");
 
     print_paging_bar($totalcount, $page, $perpage, "search.php?search=".urlencode($search)."&amp;id=$course->id&amp;perpage=$perpage&amp;");
 
diff --git a/mod/forum/subscribers.php b/mod/forum/subscribers.php
index e00a8713a75..193f110656d 100644
--- a/mod/forum/subscribers.php
+++ b/mod/forum/subscribers.php
@@ -58,11 +58,11 @@
 
         if (! $users = forum_subscribed_users($course, $forum, $currentgroup, $context) ) {
 
-            print_heading(get_string("nosubscribers", "forum"));
+            echo $OUTPUT->heading(get_string("nosubscribers", "forum"));
 
         } else {
 
-            print_heading(get_string("subscribersto","forum", "'".format_string($forum->name)."'"));
+            echo $OUTPUT->heading(get_string("subscribersto","forum", "'".format_string($forum->name)."'"));
 
             echo '<table align="center" cellpadding="5" cellspacing="5">';
             foreach ($users as $user) {
diff --git a/mod/forum/unsubscribeall.php b/mod/forum/unsubscribeall.php
index 4bfbd64c95e..e1ce8c456fa 100644
--- a/mod/forum/unsubscribeall.php
+++ b/mod/forum/unsubscribeall.php
@@ -19,7 +19,7 @@ $navlinks = array(array('name' => get_string('modulename', 'forum'), 'link' => n
 $navigation = build_navigation($navlinks);
 
 print_header($strunsubscribeall, format_string($COURSE->fullname), $navigation);
-print_heading($strunsubscribeall);
+echo $OUTPUT->heading($strunsubscribeall);
 
 if (data_submitted() and $confirm and confirm_sesskey()) {
     $DB->delete_records('forum_subscriptions', array('userid'=>$USER->id));
diff --git a/mod/forum/user.php b/mod/forum/user.php
index 436fd71e8b9..85782e59d35 100644
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -36,7 +36,7 @@ if (!$DB->get_record('role_assignments', array('userid' => $USER->id, 'contextid
 
 if ($user->deleted) {
     print_header();
-    print_heading(get_string('userdeleted'));
+    echo $OUTPUT->heading(get_string('userdeleted'));
     print_footer($course);
     die;
 }
@@ -169,9 +169,9 @@ if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $pe
             "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
 } else {
     if ($mode == 'posts') {
-        print_heading(get_string('noposts', 'forum'));
+        echo $OUTPUT->heading(get_string('noposts', 'forum'));
     } else {
-        print_heading(get_string('nodiscussionsstartedby', 'forum'));
+        echo $OUTPUT->heading(get_string('nodiscussionsstartedby', 'forum'));
     }
 }
 echo '</div>';