=== modified file 'includes/module.inc'
--- includes/module.inc	2009-10-16 04:00:03 +0000
+++ includes/module.inc	2009-10-25 03:43:20 +0000
@@ -146,7 +146,9 @@ function module_load_install($module) {
  *   module_load_include('inc', 'node', 'content_types');
  * @endcode
  *
- * Do not use this function to load an install file. Use module_load_install()
+ * Do not use this function to load an install file, use module_load_install()
+ * instead. Do not use this function in a global context since it required
+ * Drupal to be fully bootstrapped, but use require(DRUPAL_ROOT . 'path/file')
  * instead.
  *
  * @param $type

=== modified file 'modules/field/field.module'
--- modules/field/field.module	2009-10-23 23:00:03 +0000
+++ modules/field/field.module	2009-10-25 03:31:00 +0000
@@ -10,12 +10,12 @@
  * mechanism for auto-loading core APIs, so we have to load them on
  * every page request.
  */
-module_load_include('inc', 'field', 'field.crud');
-module_load_include('inc', 'field', 'field.default');
-module_load_include('inc', 'field', 'field.info');
-module_load_include('inc', 'field', 'field.multilingual');
-module_load_include('inc', 'field', 'field.attach');
-module_load_include('inc', 'field', 'field.form');
+require(DRUPAL_ROOT . '/modules/field/field.crud.inc');
+require(DRUPAL_ROOT . '/modules/field/field.default.inc');
+require(DRUPAL_ROOT . '/modules/field/field.info.inc');
+require(DRUPAL_ROOT . '/modules/field/field.multilingual.inc');
+require(DRUPAL_ROOT . '/modules/field/field.attach.inc');
+require(DRUPAL_ROOT . '/modules/field/field.form.inc');
 
 /**
  * @defgroup field Field API

=== modified file 'modules/file/file.module'
--- modules/file/file.module	2009-10-23 23:00:03 +0000
+++ modules/file/file.module	2009-10-25 03:31:00 +0000
@@ -7,7 +7,7 @@
  */
 
 // Load all Field module hooks for File.
-module_load_include('inc', 'file', 'file.field');
+require(DRUPAL_ROOT . '/modules/file/file.field.inc');
 
 /**
  * Implement hook_menu().

