Performance issue with dynamic loading of includes

Hi, thanks for the module, looking at the code there's a bit of a random 'include' statement at the very top of the .module file that looks like:

/**
 * Include additional files.
 */
$dirname = dirname(__FILE__);
$includes = file_scan_directory($dirname . '/includes', '/.inc$/');
foreach (module_list() as $module) {
  $file = $dirname . '/includes/' . $module . '.inc';
  if (isset($includes[$file])) {
    require_once $file;
  }
}

This all boils down to:

require_once dirname(__FILE__) . '/includes/imageapi_optimize.inc';

The former code is massively detrimental for performance, we're hitting the disk, and searching a directory, when we know what file we're looking for. We could just replace the complicated code, with the simple code, but looking at the file, it's actually just a hook implementation, and an implementation of our own hook at that, so actually we could just implement hook_hook_info and Drupal would include the file on demand, also other modules could then do this too.

Patch to follow...