Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.89
diff -u -p -r1.89 field.module
--- modules/field/field.module	23 Oct 2010 15:55:04 -0000	1.89
+++ modules/field/field.module	19 Nov 2010 22:04:03 -0000
@@ -110,6 +110,97 @@ define('FIELD_LOAD_REVISION', 'FIELD_LOA
 class FieldUpdateForbiddenException extends FieldException {}
 
 /**
+ * Implements hook_hook_info().
+ */
+function field_hook_info() {
+  $field_hooks = array(
+    'field_extra_fields',
+    'field_extra_fields_alter',
+    'field_info',
+    'field_info_alter',
+    'field_load',
+    'field_prepare_view',
+    'field_validate',
+    'field_presave',
+    'field_insert',
+    'field_update',
+    'field_storage_update_field',
+    'field_delete',
+    'field_delete_revision',
+    'field_prepare_translation',
+    'field_is_empty',
+    'field_widget_info',
+    'field_widget_info_alter',
+    'field_widget_form',
+    'field_widget_error',
+    'field_formatter_info',
+    'field_formatter_info_alter',
+    'field_formatter_prepare_view',
+    'field_formatter_view',
+    'field_attach_form',
+    'field_attach_load',
+    'field_attach_validate',
+    'field_attach_submit',
+    'field_attach_presave',
+    'field_attach_insert',
+    'field_attach_update',
+    'field_attach_preprocess_alter',
+    'field_attach_delete',
+    'field_attach_delete_revision',
+    'field_attach_purge',
+    'field_attach_view_alter',
+    'field_attach_prepare_translation_alter',
+    'field_language_alter',
+    'field_available_languages_alter',
+    'field_attach_create_bundle',
+    'field_attach_rename_bundle',
+    'field_attach_delete_bundle',
+    'field_storage_info',
+    'field_storage_info_alter',
+    'field_storage_details',
+    'field_storage_details_alter',
+    'field_storage_load',
+    'field_storage_write',
+    'field_storage_delete',
+    'field_storage_delete_revision',
+    'field_storage_query',
+    'field_storage_create_field',
+    'field_storage_delete_field',
+    'field_storage_delete_instance',
+    'field_storage_pre_load',
+    'field_storage_pre_insert',
+    'field_storage_pre_update',
+    'field_info_max_weight',
+    'field_display_alter',
+    // @todo http://drupal.org/node/968264
+    'field_display_ENTITY_TYPE_alter',
+    'field_extra_fields_display_alter',
+    'field_widget_properties_alter',
+    // @todo http://drupal.org/node/968264
+    'field_widget_properties_ENTITY_TYPE_alter',
+    'field_create_field',
+    'field_create_instance',
+    'field_update_forbid',
+    'field_update_field',
+    'field_delete_field',
+    'field_update_instance',
+    'field_delete_instance',
+    'field_read_field',
+    'field_read_instance',
+    'field_purge_field',
+    'field_purge_field_instance',
+    'field_storage_purge_field',
+    'field_storage_purge_field_instance',
+    'field_storage_purge',
+    'field_access',
+  );
+  $hooks = array_fill_keys($field_hooks, array(
+    'group' => 'field',
+  ));
+  return $hooks;
+}
+
+/**
  * Implements hook_flush_caches().
  */
 function field_flush_caches() {
Index: modules/file/file.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/file/file.module,v
retrieving revision 1.46
diff -u -p -r1.46 file.module
--- modules/file/file.module	13 Nov 2010 14:04:08 -0000	1.46
+++ modules/file/file.module	19 Nov 2010 22:05:35 -0000
@@ -6,9 +6,6 @@
  * Defines a "managed_file" Form API field and a "file" field for Field module.
  */
 
-// Load all Field module hooks for File.
-require_once DRUPAL_ROOT . '/modules/file/file.field.inc';
-
 /**
  * Implements hook_help().
  */
Index: modules/image/image.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/image/image.module,v
retrieving revision 1.54
diff -u -p -r1.54 image.module
--- modules/image/image.module	18 Nov 2010 05:36:27 -0000	1.54
+++ modules/image/image.module	19 Nov 2010 22:05:43 -0000
@@ -31,9 +31,6 @@ define('IMAGE_STORAGE_EDITABLE', IMAGE_S
  */
 define('IMAGE_STORAGE_MODULE', IMAGE_STORAGE_OVERRIDE | IMAGE_STORAGE_DEFAULT);
 
-// Load all Field module hooks for Image.
-require_once DRUPAL_ROOT . '/modules/image/image.field.inc';
-
 /**
  * Implement of hook_help().
  */