Index: drupalvb.admin-pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.admin-pages.inc,v
retrieving revision 1.11
diff -u -p -r1.11 drupalvb.admin-pages.inc
--- drupalvb.admin-pages.inc	18 Oct 2008 17:09:35 -0000	1.11
+++ drupalvb.admin-pages.inc	1 Feb 2009 01:56:45 -0000
@@ -141,7 +141,7 @@ function drupalvb_settings_database_subm
 
   if ($initial_import) {
     // First time setup; initialize DrupalvB's user mapping.
-    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+    module_load_include('inc', 'drupalvb');
     _drupalvb_init_user_map();
   }
 }
Index: drupalvb.inc.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.inc.php,v
retrieving revision 1.32
diff -u -p -r1.32 drupalvb.inc.php
--- drupalvb.inc.php	3 Dec 2008 23:43:07 -0000	1.32
+++ drupalvb.inc.php	1 Feb 2009 01:56:53 -0000
@@ -247,7 +247,7 @@ function drupalvb_set_mapping($uid, $use
  * Export all drupal users to vBulletin.
  */
 function drupalvb_export_drupal_users() {
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
 
   $result = db_query("SELECT * FROM {users} ORDER BY uid");
   while ($user = db_fetch_object($result)) {
Index: drupalvb.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.install,v
retrieving revision 1.10
diff -u -p -r1.10 drupalvb.install
--- drupalvb.install	18 Oct 2008 17:09:35 -0000	1.10
+++ drupalvb.install	1 Feb 2009 01:57:32 -0000
@@ -47,7 +47,7 @@ function drupalvb_update_5100() {
   else {
     variable_set('drupalvb_db', $db_url);
   }
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc.php';
+  module_load_include('inc.php', 'drupalvb');
   $config = drupalvb_get_config();
   variable_set('drupalvb_db_prefix', $config['Database']['tableprefix']);
   return $ret;
Index: drupalvb.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drupalvb/drupalvb.module,v
retrieving revision 1.33
diff -u -p -r1.33 drupalvb.module
--- drupalvb.module	18 Oct 2008 17:09:35 -0000	1.33
+++ drupalvb.module	1 Feb 2009 01:56:18 -0000
@@ -42,7 +42,7 @@ function drupalvb_help($path, $arg) {
       return t('Allows basic integration of Drupal with a vBulletin forum.');
 
     case 'admin/settings/drupalvb':
-      require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+      module_load_include('inc', 'drupalvb');
       $vb_config = drupalvb_get('config');
       $vb_options = drupalvb_get('options');
       if (empty($vb_config)) {
@@ -144,8 +144,8 @@ function drupalvb_perm() {
  */
 function drupalvb_settings($form = 'integration') {
   $path = drupal_get_path('module', 'drupalvb');
-  require_once $path .'/drupalvb.inc';
-  require_once $path .'/drupalvb.admin-pages.inc';
+  module_load_include('inc', 'drupalvb');
+  module_load_include('inc', 'drupalvb', 'drupalvb.admin-pages');
   return drupal_get_form('drupalvb_settings_'. $form);
 }
 
@@ -162,7 +162,7 @@ function drupalvb_settings($form = 'inte
  */
 function drupalvb_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'user_login_block' || $form_id == 'user_login') {
-    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+    module_load_include('inc', 'drupalvb');
 
     // Splice in our validate handler for authentication if user is performing
     // a vBulletin login.
@@ -212,7 +212,7 @@ function drupalvb_login_validate($form, 
     return TRUE;
   }
 
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
   if (!drupalvb_db_is_valid()) {
     return;
   }
@@ -272,7 +272,7 @@ function drupalvb_user_pass_validate($fo
     return;
   }
   
-  require_once drupal_get_path('module', 'drupalvb') . '/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
 
   // Try to import a corresponding user from vB.
   if ($userid = db_result(drupalvb_db_query("SELECT userid FROM {user} WHERE username = '%s' OR email = '%s'", drupalvb_htmlspecialchars($name), $name))) {
@@ -295,7 +295,7 @@ function drupalvb_user_load($userid) {
  * Implementation of hook_user().
  */
 function drupalvb_user($op, &$edit, &$account, $category = NULL) {
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
   if (!drupalvb_db_is_valid()) {
     return;
   }
@@ -512,7 +512,8 @@ function drupalvb_login() {
  */
 function drupalvb_logout() {
   global $user;
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
+  module_load_include('inc', 'user', 'pages');
 
   if ($user->uid) {
     if (module_exists('singlesignon')) {
@@ -635,7 +636,7 @@ function drupalvb_block($op = 'list', $d
     }
   }
   else if ($op == 'view') {
-    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+    module_load_include('inc', 'drupalvb');
     $block = array();
     if (!drupalvb_db_is_valid()) {
       return $block;
@@ -933,7 +934,7 @@ function theme_drupalvb_username($object
  */
 function drupalvb_private_messages() {
   global $user;
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
 
   $vb_options = drupalvb_get('options');
 
@@ -1014,7 +1015,7 @@ function drupalvb_redirect() {
  *   The corresponding Drupal uid, if the vBulletin userid could be validated.
  */
 function drupalvb_lookup_drupal_user($userid) {
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
 
   // Check if this vBulletin user id already exists as Drupal user.
   if ($uid = drupalvb_user_load($userid)) {
@@ -1074,7 +1075,7 @@ function drupalvb_lookup_drupal_user($us
  * existing messages.
  */
 function drupalvb_privatemsg($message, $op) {
-  require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';
+  module_load_include('inc', 'drupalvb');
   if (!(variable_get('drupalvb_pm_sync', FALSE) && drupalvb_db_is_valid())) {
     return;
   }