Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1080
diff -u -p -r1.1080 common.inc
--- includes/common.inc	7 Jan 2010 07:45:03 -0000	1.1080
+++ includes/common.inc	7 Jan 2010 21:23:00 -0000
@@ -6143,7 +6143,7 @@ function drupal_flush_all_caches() {
 
   drupal_theme_rebuild();
   menu_rebuild();
-  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_bootstrap', 'cache_page');
Index: includes/module.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/module.inc,v
retrieving revision 1.178
diff -u -p -r1.178 module.inc
--- includes/module.inc	7 Jan 2010 04:54:18 -0000	1.178
+++ includes/module.inc	7 Jan 2010 21:28:51 -0000
@@ -359,8 +359,8 @@ function module_disable($module_list) {
   foreach ($module_list as $module) {
     if (module_exists($module)) {
       // Check if node_access table needs rebuilding.
-      if (!node_access_needs_rebuild() && module_hook($module, 'node_grants')) {
-        node_access_needs_rebuild(TRUE);
+      if (!module_invoke('node', 'access_needs_rebuild') && module_hook($module, 'node_grants')) {
+        module_invoke('node', 'access_needs_rebuild', TRUE);
       }
 
       module_load_install($module);
Index: modules/node/node.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.info,v
retrieving revision 1.13
diff -u -p -r1.13 node.info
--- modules/node/node.info	17 Nov 2009 21:24:18 -0000	1.13
+++ modules/node/node.info	7 Jan 2010 21:21:43 -0000
@@ -11,5 +11,4 @@ files[] = node.pages.inc
 files[] = node.install
 files[] = node.test
 files[] = node.tokens.inc
-required = TRUE
 configure = admin/structure/types
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.246
diff -u -p -r1.246 system.admin.inc
--- modules/system/system.admin.inc	4 Jan 2010 21:31:52 -0000	1.246
+++ modules/system/system.admin.inc	7 Jan 2010 21:26:26 -0000
@@ -1240,7 +1240,7 @@ function system_modules_submit($form, &$
   // Clear all caches.
   registry_rebuild();
   drupal_theme_rebuild();
-  node_types_rebuild();
+  module_invoke('node', 'types_rebuild');
   menu_rebuild();
   cache_clear_all('schema', 'cache');
   entity_info_cache_clear();
@@ -1256,8 +1256,6 @@ function system_modules_submit($form, &$
 
   // Synchronize to catch any actions that were added or removed.
   actions_synchronize();
-
-  return;
 }
 
 /**
Index: profiles/standard/standard.info
===================================================================
RCS file: /cvs/drupal/drupal/profiles/standard/standard.info,v
retrieving revision 1.1
diff -u -p -r1.1 standard.info
--- profiles/standard/standard.info	4 Jan 2010 23:08:34 -0000	1.1
+++ profiles/standard/standard.info	7 Jan 2010 21:20:49 -0000
@@ -3,6 +3,7 @@ name = Standard
 description = Install with commonly used features pre-configured.
 version = VERSION
 core = 7.x
+dependencies[] = node
 dependencies[] = block
 dependencies[] = color
 dependencies[] = comment