Index: includes/mail.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/mail.inc,v
retrieving revision 1.19
diff -u -p -r1.19 mail.inc
--- includes/mail.inc	30 Mar 2009 05:32:31 -0000	1.19
+++ includes/mail.inc	3 Apr 2009 05:27:51 -0000
@@ -260,7 +260,7 @@ function drupal_wrap_mail($text, $indent
  */
 function drupal_html_to_text($string, $allowed_tags = NULL) {
   // Cache list of supported tags.
-  static $supported_tags;
+  $supported_tags = &drupal_static(__FUNCTION__);
   if (empty($supported_tags)) {
     $supported_tags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr');
   }
@@ -434,7 +434,8 @@ function _drupal_wrap_mail_line(&$line, 
  */
 function _drupal_html_to_mail_urls($match = NULL, $reset = FALSE) {
   global $base_url, $base_path;
-  static $urls = array(), $regexp;
+  $urls = &drupal_static(__FUNCTION__, array())
+  $regexp = &drupal_static(__FUNCTION__ . 'regexp');
 
   if ($reset) {
     // Reset internal URL list.
Index: includes/module.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/module.inc,v
retrieving revision 1.139
diff -u -p -r1.139 module.inc
--- includes/module.inc	22 Feb 2009 17:55:29 -0000	1.139
+++ includes/module.inc	3 Apr 2009 05:27:51 -0000
@@ -44,7 +44,8 @@ function module_load_all() {
  *   modules.
  */
 function module_list($refresh = FALSE, $sort = FALSE, $fixed_list = NULL) {
-  static $list = array(), $sorted_list;
+  $list = &drupal_static(__FUNCTION__, array())
+  $sorted_list = &drupal_static(__FUNCTION__ . 'sorted_list');
 
   if (empty($list) || $refresh || $fixed_list) {
     $list = array();
@@ -390,7 +391,10 @@ function module_hook($module, $hook) {
  *   the implementations are loaded as necessary.
  */
 function module_implements($hook, $sort = FALSE) {
-  static $implementations = array(), $sorted_implementations = array(), $loaded = array(), $cached_hooks = 0;
+  $implementations = &drupal_static(__FUNCTION__, array());
+  $sorted_implementations = &drupal_static(__FUNCTION__ . 'sorted_implementations', array());
+  $loaded = &drupal_static(__FUNCTION__ . 'loaded', array());
+  $cached_hooks = &drupal_static(__FUNCTION__ . 'cached_hooks', 0);
 
   if (defined('MAINTENANCE_MODE')) {
     return _module_implements_maintenance($hook, $sort);
Index: includes/pager.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/pager.inc,v
retrieving revision 1.65
diff -u -p -r1.65 pager.inc
--- includes/pager.inc	22 Feb 2009 16:53:41 -0000	1.65
+++ includes/pager.inc	3 Apr 2009 05:27:51 -0000
@@ -20,7 +20,7 @@ class PagerDefault extends SelectQueryEx
    *
    * @var int
    */
-  static protected $maxElement = 0;
+  protected $maxElement = &drupal_static(__FUNCTION__, 0);
 
   /**
    * The number of elements per page to allow.
@@ -227,7 +227,7 @@ function pager_query($query, $limit = 10
  *   except for those pertaining to paging.
  */
 function pager_get_querystring() {
-  static $string = NULL;
+  $string = &drupal_static(__FUNCTION__, NULL);
   if (!isset($string)) {
     $string = drupal_query_string_encode($_REQUEST, array_merge(array('q', 'page'), array_keys($_COOKIE)));
   }
@@ -533,7 +533,7 @@ function theme_pager_link($text, $page_n
 
   // Set each pager link title
   if (!isset($attributes['title'])) {
-    static $titles = NULL;
+    $titles = &drupal_static(__FUNCTION__, NULL);
     if (!isset($titles)) {
       $titles = array(
         t('« first') => t('Go to first page'),