diff --git twitter.inc twitter.inc
index d147b7a..e314800 100644
--- twitter.inc
+++ twitter.inc
@@ -11,7 +11,7 @@ function twitter_connect($account) {
   module_load_include('lib.php', 'twitter');
   $auth = $account->get_auth();
   if (_twitter_use_oauth() && $auth['oauth_token'] && $auth['oauth_token_secret']) {
-    module_load_include('lib.php', 'oauth');
+    module_load_include('php', 'oauth_common','lib/OAuth');
     return new TwitterOAuth(variable_get('twitter_consumer_key', ''), variable_get('twitter_consumer_secret', ''), $auth['oauth_token'], $auth['oauth_token_secret']);
   }
   else if ($auth['password']) {
diff --git twitter.module twitter.module
index 14502a4..c9adba6 100644
--- twitter.module
+++ twitter.module
@@ -244,7 +244,7 @@ function twitter_twitter_accounts($account) {
 }
 
 function _twitter_use_oauth() {
-  if (!module_exists('oauth')) {
+  if (!module_exists('oauth_common')) {
     return FALSE;
   }
   
diff --git twitter.pages.inc twitter.pages.inc
index e9fd940..0f55273 100644
--- twitter.pages.inc
+++ twitter.pages.inc
@@ -10,7 +10,7 @@ function twitter_admin_form() {
     '#type' => 'fieldset',
     '#title' => t('OAuth Settings'),
     '#description' => t(''),
-    '#access' => module_exists('oauth'),
+    '#access' => module_exists('oauth_common'),
     '#description' => t('To enable OAuth based access for twitter, you must <a href="@url">register your application</a> with twitter and add the provided keys here.', array('@url' => 'https://dev.twitter.com/apps/new')),
   );
 
@@ -331,7 +331,7 @@ function twitter_account_form_submit($form, &$form_state) {
 }
 
 function twitter_account_oauth_validate($form, &$form_state) {
-  module_load_include('lib.php', 'oauth');
+  module_load_include('php', 'oauth_common', 'lib/OAuth');
   module_load_include('lib.php', 'twitter');
 
   $key = variable_get('twitter_consumer_key', '');
@@ -372,7 +372,7 @@ function twitter_oauth_callback_validate($form, &$form_state) {
     form_set_error('oauth_token', t('Invalid OAuth token.'));
   }
 
-  module_load_include('lib.php', 'oauth');
+  module_load_include('php', 'oauth_common','lib/OAuth');
   module_load_include('lib.php', 'twitter');
   module_load_include('inc', 'twitter');
 
diff --git twitter_actions/twitter_actions.info twitter_actions/twitter_actions.info
index 1184fdb..23e4b99 100644
--- twitter_actions/twitter_actions.info
+++ twitter_actions/twitter_actions.info
@@ -2,4 +2,4 @@ name = Twitter actions
 description = Exposes Drupal actions to send Twitter messages.
 core = 6.x
 dependencies[] = twitter
-dependencies[] = oauth
+dependencies[] = oauth_common
diff --git twitter_post/twitter_post.info twitter_post/twitter_post.info
index 2504330..41fb13e 100644
--- twitter_post/twitter_post.info
+++ twitter_post/twitter_post.info
@@ -2,4 +2,4 @@ name = Twitter Post
 description = Enables posting to twitter
 core = 6.x
 dependencies[] = twitter
-dependencies[] = oauth
\ No newline at end of file
+dependencies[] = oauth_common
\ No newline at end of file
diff --git twitter_signin/twitter_signin.info twitter_signin/twitter_signin.info
index cf31d09..efcf469 100644
--- twitter_signin/twitter_signin.info
+++ twitter_signin/twitter_signin.info
@@ -3,4 +3,4 @@ description = Adds support for "Sign in with Twitter"
 php = 5.1
 core = 6.x
 dependencies[] = twitter
-dependencies[] = oauth
+dependencies[] = oauth_common
diff --git twitter_signin/twitter_signin.module twitter_signin/twitter_signin.module
index 05ee4a7..cfac098 100644
--- twitter_signin/twitter_signin.module
+++ twitter_signin/twitter_signin.module
@@ -71,7 +71,7 @@ function twitter_signin_button() {
  * Submit handler for twitter signin
  */
 function twitter_signin_redirect() {
-  module_load_include('lib.php', 'oauth');
+  module_load_include('php', 'oauth_common','lib/OAuth');
   module_load_include('lib.php', 'twitter');
   module_load_include('inc', 'twitter');