Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.906
diff -u -p -r1.906 common.inc
--- includes/common.inc	20 May 2009 06:03:06 -0000	1.906
+++ includes/common.inc	20 May 2009 20:18:10 -0000
@@ -2959,7 +2959,9 @@ function _drupal_bootstrap_full() {
   // Undo magic quotes
   fix_gpc_magic();
   // Load all enabled modules
-  module_load_all();
+  drupal_load('module', 'system');
+  drupal_load('module', 'filter');
+  #module_load_all();
 
   // Let all modules take action before menu system handles the request
   // We do not want this while running update.php.
@@ -4242,7 +4244,7 @@ function drupal_flush_all_caches() {
 
   drupal_theme_rebuild();
   // Rebuild content types, menu will be rebuilt as well.
-  node_types_rebuild();
+  module_invoke('node', 'types_rebuild');
   // Don't clear cache_form - in-progress form submissions may break.
   // Ordered so clearing the page cache will always be the last action.
   $core = array('cache', 'cache_filter', 'cache_registry', 'cache_page');
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.324
diff -u -p -r1.324 menu.inc
--- includes/menu.inc	14 May 2009 08:35:58 -0000	1.324
+++ includes/menu.inc	20 May 2009 19:22:45 -0000
@@ -399,6 +399,11 @@ function menu_execute_active_handler($pa
   if ($router_item = menu_get_item($path)) {
     if ($router_item['access']) {
       if (drupal_function_exists($router_item['page_callback'])) {
+        preg_match('/^[^_]+/', $router_item['page_callback'], $matches);
+        if ($matches[0] == 'drupal') {
+          preg_match('/^[^_]+/', $router_item['page_arguments'][0], $matches);
+        }
+        drupal_load('module', $matches[0]);
         return call_user_func_array($router_item['page_callback'], $router_item['page_arguments']);
       }
     }
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.20
diff -u -p -r1.20 template.php
--- themes/garland/template.php	20 Jan 2009 03:18:41 -0000	1.20
+++ themes/garland/template.php	20 May 2009 20:22:50 -0000
@@ -50,7 +50,7 @@ function garland_preprocess_page(&$vars)
   $vars['site_html'] = implode(' ', $site_fields);
 
   // Hook into color.module
-  if (module_exists('color')) {
+  if (drupal_function_exists('_color_page_alter')) {
     _color_page_alter($vars);
   }
 }