Index: views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v
retrieving revision 1.231
diff -u -r1.231 views.module
--- views.module	18 Mar 2008 15:52:39 -0000	1.231
+++ views.module	20 Mar 2008 15:56:51 -0000
@@ -299,6 +299,25 @@
 }
 
 /**
+ * Load views files on behalf of modules.
+ */
+function views_module_include($file) {
+  $views_path = drupal_get_path('module', 'views') . '/modules';
+  foreach (module_list() as $module) {
+    $module_path = drupal_get_path('module', $module);
+    if (file_exists("$module_path/$module.$file")) {
+      require_once "./$module_path/$module.$file";
+    }
+    else if (file_exists("$module_path/includes/$module.$file")) {
+      require_once "./$module_path/includes/$module.$file";
+    }
+    else if (file_exists("$views_path/$module.$file")) {
+      require_once "./$views_path/$module.$file";
+    }
+  }
+}
+
+/**
  * Include views .css files.
  */
 function views_add_css($file) {
Index: includes/cache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/cache.inc,v
retrieving revision 1.10
diff -u -r1.10 cache.inc
--- includes/cache.inc	18 Mar 2008 15:52:39 -0000	1.10
+++ includes/cache.inc	20 Mar 2008 15:56:19 -0000
@@ -11,36 +11,14 @@
  * Load views files on behalf of modules.
  */
 function _views_include_handlers() {
-  $views_path = drupal_get_path('module', 'views') . '/modules';
-  foreach (module_list() as $module) {
-    $module_path = drupal_get_path('module', $module);
-    if (file_exists("$module_path/$module.views.inc")) {
-      require_once "./$module_path/$module.views.inc";
-    }
-    else if (file_exists("$module_path/includes/$module.views.inc")) {
-      require_once "./$module_path/includes/$module.views.inc";
-    }
-    else if (file_exists("$views_path/$module.views.inc")) {
-      require_once "./$views_path/$module.views.inc";
-    }
-  }
+  views_module_include('views.inc');
 }
 
 /**
  * Load default views files on behalf of modules.
  */
 function _views_include_default_views() {
-  // Now include the views_default files specifically.
-  $views_path = drupal_get_path('module', 'views') . '/modules';
-  foreach (module_list() as $module) {
-    $module_path = drupal_get_path('module', $module);
-    if (file_exists("$module_path/$module.views_default.inc")) {
-      require_once "./$module_path/$module.views_default.inc";
-    }
-    else if (file_exists("$views_path/$module.views_default.inc")) {
-      require_once "./$views_path/$module.views_default.inc";
-    }
-  }
+  views_module_include('views_default.inc');
 }
 
 /**
Index: includes/convert.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/convert.inc,v
retrieving revision 1.4
diff -u -r1.4 convert.inc
--- includes/convert.inc	20 Mar 2008 15:40:14 -0000	1.4
+++ includes/convert.inc	20 Mar 2008 15:56:30 -0000
@@ -123,17 +123,7 @@
  * Convert a Views 1 view to a Views 2 view.
  */
 function views1_import($imported) {
-  // Include the views_convert files specifically.
-  $views_path = drupal_get_path('module', 'views') . '/modules';
-  foreach (module_list() as $module) {
-    $module_path = drupal_get_path('module', $module);
-    if (file_exists("$module_path/$module.views_convert.inc")) {
-      require_once "./$module_path/$module.views_convert.inc";
-    }
-    else if (file_exists("$views_path/$module.views_convert.inc")) {
-      require_once "./$views_path/$module.views_convert.inc";
-    }
-  }
+  views_module_include('views_convert.inc');
 
   $view = views_new_view();