Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.428
diff -u -p -r1.428 aggregator.module
--- modules/aggregator/aggregator.module	1 Nov 2009 17:50:45 -0000	1.428
+++ modules/aggregator/aggregator.module	12 Nov 2009 06:23:40 -0000
@@ -12,6 +12,20 @@
 define('AGGREGATOR_CLEAR_NEVER', 0);
 
 /**
+ * Implements hook_hook_info().
+ */
+function aggregator_hook_info() {
+  $hooks['aggregator_fetch_info'] = array('group' => 'aggregator');
+  $hooks['aggregator_fetch'] = array('group' => 'aggregator');
+  $hooks['aggregator_parse_info'] = array('group' => 'aggregator');
+  $hooks['aggregator_parse'] = array('group' => 'aggregator');
+  $hooks['aggregator_process_info'] = array('group' => 'aggregator');
+  $hooks['aggregator_process'] = array('group' => 'aggregator');
+  $hooks['aggregator_remove'] = array('group' => 'aggregator');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function aggregator_help($path, $arg) {
Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.398
diff -u -p -r1.398 block.module
--- modules/block/block.module	11 Nov 2009 08:52:27 -0000	1.398
+++ modules/block/block.module	12 Nov 2009 06:14:44 -0000
@@ -12,6 +12,19 @@
 define('BLOCK_REGION_NONE', -1);
 
 /**
+ * Implements hook_hook_info().
+ */
+function block_hook_info() {
+  $hooks['block_info'] = array('group' => 'block');
+  $hooks['block_info_alter'] = array('group' => 'block');
+  $hooks['block_configure'] = array('group' => 'block');
+  $hooks['block_save'] = array('group' => 'block');
+  $hooks['block_view'] = array('group' => 'block');
+  $hooks['block_view_alter'] = array('group' => 'block');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function block_help($path, $arg) {
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.804
diff -u -p -r1.804 comment.module
--- modules/comment/comment.module	12 Nov 2009 06:46:44 -0000	1.804
+++ modules/comment/comment.module	12 Nov 2009 07:11:58 -0000
@@ -71,6 +71,23 @@ define('COMMENT_NODE_CLOSED', 1);
 define('COMMENT_NODE_OPEN', 2);
 
 /**
+ * Implements hook_hook_info().
+ */
+function comment_hook_info() {
+  $hooks['comment_presave'] = array('group' => 'comment');
+  $hooks['comment_insert'] = array('group' => 'comment');
+  $hooks['comment_load'] = array('group' => 'comment');
+  $hooks['comment_update'] = array('group' => 'comment');
+  $hooks['comment_delete'] = array('group' => 'comment');
+  $hooks['comment_view'] = array('group' => 'comment');
+  $hooks['comment_build_alter'] = array('group' => 'comment');
+  $hooks['comment_publish'] = array('group' => 'comment');
+  $hooks['comment_unpublish'] = array('group' => 'comment');
+  $hooks['comment_validate'] = array('group' => 'comment');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function comment_help($path, $arg) {
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.47
diff -u -p -r1.47 field.module
--- modules/field/field.module	31 Oct 2009 18:00:48 -0000	1.47
+++ modules/field/field.module	12 Nov 2009 06:18:12 -0000
@@ -136,6 +136,20 @@ class FieldException extends Exception {
 class FieldUpdateForbiddenException extends FieldException {}
 
 /**
+ * Implements hook_hook_info().
+ */
+function field_hook_info() {
+  $hooks['field_build_modes'] = array('group' => 'build');
+  $hooks['field_info'] = array('group' => 'build');
+  $hooks['field_info_alter'] = array('group' => 'build');
+  $hooks['field_widget_info'] = array('group' => 'build');
+  $hooks['field_widget_info_alter'] = array('group' => 'build');
+  $hooks['field_formatter_info'] = array('group' => 'build');
+  $hooks['field_formatter_info_alter'] = array('group' => 'build');
+  return $hooks;
+}
+
+/**
  * Implement hook_flush_caches.
  */
 function field_flush_caches() {
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1166
diff -u -p -r1.1166 node.module
--- modules/node/node.module	8 Nov 2009 10:02:41 -0000	1.1166
+++ modules/node/node.module	12 Nov 2009 06:19:49 -0000
@@ -61,6 +61,14 @@ define('NODE_ACCESS_DENY', 'deny');
 define('NODE_ACCESS_IGNORE', NULL);
 
 /**
+ * Implements hook_hook_info().
+ */
+function node_hook_info() {
+  $hooks['node_info'] = array('group' => 'build');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function node_help($path, $arg) {
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.324
diff -u -p -r1.324 search.module
--- modules/search/search.module	8 Nov 2009 10:02:41 -0000	1.324
+++ modules/search/search.module	12 Nov 2009 06:22:45 -0000
@@ -91,6 +91,24 @@ define('PREG_CLASS_CJK', '\x{3041}-\x{30
 '\x{4e00}-\x{9fbb}\x{f900}-\x{fad9}');
 
 /**
+ * Implements hook_hook_info().
+ */
+function search_hook_info() {
+  $hooks['search_info'] = array('group' => 'search');
+  $hooks['search_page'] = array('group' => 'search');
+  $hooks['search_access'] = array('group' => 'search');
+  $hooks['search_execute'] = array('group' => 'search');
+  $hooks['search_admin'] = array('group' => 'search');
+  $hooks['search_status'] = array('group' => 'search');
+  $hooks['search_reset'] = array('group' => 'search');
+  $hooks['update_index'] = array('group' => 'search');
+  $hooks['node_update_index'] = array('group' => 'search');
+  $hooks['search_preprocess'] = array('group' => 'search');
+  $hooks['ranking'] = array('group' => 'search');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function search_help($path, $arg) {
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.840
diff -u -p -r1.840 system.module
--- modules/system/system.module	11 Nov 2009 17:14:59 -0000	1.840
+++ modules/system/system.module	12 Nov 2009 07:12:09 -0000
@@ -262,12 +262,17 @@ function system_rdf_namespaces() {
  * Implement hook_hook_info().
  */
 function system_hook_info() {
-  $hooks['token_info'] = array(
-    'group' => 'tokens',
-  );
-  $hooks['tokens'] = array(
-    'group' => 'tokens',
-  );
+  $hooks['token_info'] = array('group' => 'tokens');
+  $hooks['tokens'] = array('group' => 'tokens');
+  $hooks['flush_caches'] = array('group' => 'build');
+  $hooks['system_info_alter'] = array('group' => 'build');
+  $hooks['menu'] = array('group' => 'build');
+  $hooks['menu_alter'] = array('group' => 'build');
+  $hooks['theme'] = array('group' => 'build');
+  $hooks['theme_registry_alter'] = array('group' => 'build');
+  $hooks['entity_info'] = array('group' => 'build');
+  $hooks['action_info'] = array('group' => 'build');
+  $hooks['action_info_alter'] = array('group' => 'build');
   return $hooks;
 }
 
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.537
diff -u -p -r1.537 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Nov 2009 17:10:49 -0000	1.537
+++ modules/taxonomy/taxonomy.module	12 Nov 2009 06:21:21 -0000
@@ -7,6 +7,21 @@
  */
 
 /**
+ * Implements hook_hook_info().
+ */
+function taxonomy_hook_info() {
+  $hooks['taxonomy_vocabulary_insert'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_vocabulary_load'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_vocabulary_update'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_vocabulary_delete'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_term_insert'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_term_load'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_term_update'] = array('group' => 'taxonomy');
+  $hooks['taxonomy_term_delete'] = array('group' => 'taxonomy');
+  return $hooks;
+}
+
+/**
  * Implement hook_permission().
  */
 function taxonomy_permission() {
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.54
diff -u -p -r1.54 trigger.module
--- modules/trigger/trigger.module	8 Nov 2009 10:02:41 -0000	1.54
+++ modules/trigger/trigger.module	12 Nov 2009 06:18:55 -0000
@@ -8,6 +8,15 @@
  */
 
 /**
+ * Implements hook_hook_info().
+ */
+function trigger_hook_info() {
+  $hooks['trigger_info'] = array('group' => 'build');
+  $hooks['trigger_info_alter'] = array('group' => 'build');
+  return $hooks;
+}
+
+/**
  * Implement hook_help().
  */
 function trigger_help($path, $arg) {