Index: imagefield.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v
retrieving revision 1.99
diff -u -r1.99 imagefield.module
--- imagefield.module	20 Apr 2009 23:57:17 -0000	1.99
+++ imagefield.module	3 Jul 2009 20:26:10 -0000
@@ -6,6 +6,9 @@
  * ImageField core hooks and menu callbacks.
  */
 
+include_once dirname(__FILE__) . '/imagefield_file.inc';
+include_once dirname(__FILE__) . '/imagefield_widget.inc';
+
 /**
  * Implementation of hook_init().
  *
@@ -18,9 +21,6 @@
     drupal_set_message(t('The ImageField module has been disabled. The <a href="http://drupal.org/project/filefield">FileField module</a> needs to be installed for it to work properly.'));
     return;
   }
-
-  module_load_include('inc', 'imagefield', 'imagefield_file');
-  module_load_include('inc', 'imagefield', 'imagefield_widget');
 }
 
 /**