From a9c4bcd71f0ce046bd57ea727c140c6e91fcd013 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 9 Sep 2013 23:05:33 +0200
Subject: [PATCH] Removing unnecessary require_once lines (autoload!)

---
 actions/apiaccountratelimitstatus.php             | 2 --
 actions/apiaccountupdatedeliverydevice.php        | 2 --
 actions/apiaccountupdateprofile.php               | 2 --
 actions/apiaccountupdateprofileimage.php          | 2 --
 actions/apiaccountverifycredentials.php           | 2 --
 actions/apiatomservice.php                        | 4 +++-
 actions/apiblockcreate.php                        | 2 --
 actions/apiblockdestroy.php                       | 2 --
 actions/apiconversation.php                       | 2 --
 actions/apidirectmessage.php                      | 2 --
 actions/apidirectmessagenew.php                   | 2 --
 actions/apifavoritecreate.php                     | 2 --
 actions/apifavoritedestroy.php                    | 2 --
 actions/apifriendshipscreate.php                  | 2 --
 actions/apifriendshipsdestroy.php                 | 2 --
 actions/apifriendshipsshow.php                    | 2 --
 actions/apigroupcreate.php                        | 2 --
 actions/apigroupismember.php                      | 2 --
 actions/apigroupjoin.php                          | 2 --
 actions/apigroupleave.php                         | 2 --
 actions/apigrouplist.php                          | 2 --
 actions/apigroupprofileupdate.php                 | 2 --
 actions/apilist.php                               | 2 --
 actions/apilistmember.php                         | 2 --
 actions/apilistmemberships.php                    | 2 --
 actions/apilists.php                              | 2 --
 actions/apilistsubscriber.php                     | 2 --
 actions/apilistsubscriptions.php                  | 2 --
 actions/apimediaupload.php                        | 3 ---
 actions/apistatusesdestroy.php                    | 2 --
 actions/apistatusesretweet.php                    | 3 ---
 actions/apistatusesretweets.php                   | 3 ---
 actions/apistatusesupdate.php                     | 3 ---
 actions/apisubscriptions.php                      | 2 --
 actions/apitimelinefavorites.php                  | 2 --
 actions/apitimelinefriends.php                    | 2 --
 actions/apitimelinehome.php                       | 2 --
 actions/apitimelinementions.php                   | 2 --
 actions/apitimelineretweetedbyme.php              | 3 ---
 actions/apitimelineretweetedtome.php              | 2 --
 actions/apitimelineretweetsofme.php               | 3 ---
 actions/apitimelineuser.php                       | 2 --
 actions/apiuserfollowers.php                      | 2 --
 actions/apiuserfriends.php                        | 2 --
 actions/atompubfavoritefeed.php                   | 2 --
 actions/atompubmembershipfeed.php                 | 2 --
 actions/atompubshowfavorite.php                   | 2 --
 actions/atompubshowmembership.php                 | 2 --
 actions/atompubshowsubscription.php               | 2 --
 actions/atompubsubscriptionfeed.php               | 2 --
 actions/newnotice.php                             | 3 ---
 lib/{apiauth.php => apiauthaction.php}            | 6 +-----
 lib/{apibareauth.php => apibareauthaction.php}    | 2 --
 lib/apilistusers.php                              | 2 --
 lib/apiprivateauth.php                            | 2 --
 lib/mailhandler.php                               | 1 -
 plugins/Bookmark/actions/apitimelinebookmarks.php | 2 --
 57 files changed, 4 insertions(+), 122 deletions(-)
 rename lib/{apiauth.php => apiauthaction.php} (98%)
 rename lib/{apibareauth.php => apibareauthaction.php} (98%)

diff --git a/actions/apiaccountratelimitstatus.php b/actions/apiaccountratelimitstatus.php
index 8490e2965c..0883425513 100644
--- a/actions/apiaccountratelimitstatus.php
+++ b/actions/apiaccountratelimitstatus.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * We don't have a rate limit, but some clients check this method.
  * It always returns the same thing: 150 hits left.
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
index 57e4fbfa00..dd0c404456 100644
--- a/actions/apiaccountupdatedeliverydevice.php
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Sets which channel (device) StatusNet delivers updates to for
  * the authenticating user. Sending none as the device parameter
diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index 15b13c0f20..04151ec01e 100644
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * API analog to the profile settings page
  * Only the parameters specified will be updated.
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index 3bf064ea89..07cafbdb99 100644
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Updates the authenticating user's profile image. Note that this API method
  * expects raw multipart data, not a URL to an image.
diff --git a/actions/apiaccountverifycredentials.php b/actions/apiaccountverifycredentials.php
index 359939b0cc..ccb3bd7a60 100644
--- a/actions/apiaccountverifycredentials.php
+++ b/actions/apiaccountverifycredentials.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Check a user's credentials. Returns an HTTP 200 OK response code and a
  * representation of the requesting user if authentication was successful;
diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index 5d786723e9..8267c38b83 100644
--- a/actions/apiatomservice.php
+++ b/actions/apiatomservice.php
@@ -27,7 +27,9 @@
  * @link      http://status.net/
  */
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 /**
  * Shows an AtomPub service document for a user
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index 766d91bd41..bb0d722889 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Blocks the user specified in the ID parameter as the authenticating user.
  * Destroys a friendship to the blocked user if it exists. Returns the
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 7dd0859e9c..535c7a10ab 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -32,8 +32,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Un-blocks the user specified in the ID parameter for the authenticating user.
  * Returns the un-blocked user in the requested format when successful.
diff --git a/actions/apiconversation.php b/actions/apiconversation.php
index 23ddf02c5d..b3b44c7721 100644
--- a/actions/apiconversation.php
+++ b/actions/apiconversation.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show a stream of notices in a particular conversation
  *
diff --git a/actions/apidirectmessage.php b/actions/apidirectmessage.php
index 584decc747..308d143f27 100644
--- a/actions/apidirectmessage.php
+++ b/actions/apidirectmessage.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show a list of direct messages from or to the authenticating user
  *
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index d642252b4d..6d637fcb46 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Creates a new direct message from the authenticating user to
  * the user specified by id.
diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php
index 26e4325e65..607fb76edc 100644
--- a/actions/apifavoritecreate.php
+++ b/actions/apifavoritecreate.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Favorites the status specified in the ID parameter as the authenticating user.
  * Returns the favorite status when successful.
diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php
index af1b4075f6..02f81cf4df 100644
--- a/actions/apifavoritedestroy.php
+++ b/actions/apifavoritedestroy.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Un-favorites the status specified in the ID parameter as the authenticating user.
  * Returns the un-favorited status in the requested format when successful.
diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php
index 9932809818..acafbb964b 100644
--- a/actions/apifriendshipscreate.php
+++ b/actions/apifriendshipscreate.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Allows the authenticating users to follow (subscribe) the user specified in
  * the ID parameter.  Returns the befriended user in the requested format when
diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php
index 1534aa799f..5f7c85e0af 100644
--- a/actions/apifriendshipsdestroy.php
+++ b/actions/apifriendshipsdestroy.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Allows the authenticating users to unfollow (unsubscribe) the user specified in
  * the ID parameter.  Returns the unfollowed user in the requested format when
diff --git a/actions/apifriendshipsshow.php b/actions/apifriendshipsshow.php
index bf7e7daf62..58e610ecdb 100644
--- a/actions/apifriendshipsshow.php
+++ b/actions/apifriendshipsshow.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Outputs detailed information about the relationship between two users
  *
diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php
index 295962896d..6992da9db9 100644
--- a/actions/apigroupcreate.php
+++ b/actions/apigroupcreate.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Make a new group. Sets the authenticated user as the administrator of the group.
  *
diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index 13ed9e1fbf..c9a363582b 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns whether a user is a member of a specified group.
  *
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index 6f3df0d8cd..e18e20c5dd 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Joins the authenticated user to the group speicified by ID
  *
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 9d2825b00e..bdfa36aa43 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Removes the authenticated user from the group specified by ID
  *
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index c7518ca129..a3fc3fc435 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -35,8 +35,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns whether a user is a member of a specified group.
  *
diff --git a/actions/apigroupprofileupdate.php b/actions/apigroupprofileupdate.php
index eb47fa2512..73b3823e36 100644
--- a/actions/apigroupprofileupdate.php
+++ b/actions/apigroupprofileupdate.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * API analog to the group edit page
  *
diff --git a/actions/apilist.php b/actions/apilist.php
index 90cbfddb69..56d0f0f1bc 100644
--- a/actions/apilist.php
+++ b/actions/apilist.php
@@ -30,8 +30,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 class ApiListAction extends ApiBareAuthAction
 {
     /**
diff --git a/actions/apilistmember.php b/actions/apilistmember.php
index 8e6a84c96d..1d56a3dbc7 100644
--- a/actions/apilistmember.php
+++ b/actions/apilistmember.php
@@ -30,8 +30,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Action handler for Twitter list_memeber methods
  *
diff --git a/actions/apilistmemberships.php b/actions/apilistmemberships.php
index 3d235c5d93..9dc48fa8d4 100644
--- a/actions/apilistmemberships.php
+++ b/actions/apilistmemberships.php
@@ -30,8 +30,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Action handler for API method to list lists a user belongs to.
  * (people tags for a user)
diff --git a/actions/apilists.php b/actions/apilists.php
index 5eab3e6a1f..529bdd6785 100644
--- a/actions/apilists.php
+++ b/actions/apilists.php
@@ -30,8 +30,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Action handler for Twitter list_memeber methods
  *
diff --git a/actions/apilistsubscriber.php b/actions/apilistsubscriber.php
index cd10568e1b..9d7fde329f 100644
--- a/actions/apilistsubscriber.php
+++ b/actions/apilistsubscriber.php
@@ -29,8 +29,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 class ApiListSubscriberAction extends ApiBareAuthAction
 {
     var $list   = null;
diff --git a/actions/apilistsubscriptions.php b/actions/apilistsubscriptions.php
index 480523033b..263d00ca30 100644
--- a/actions/apilistsubscriptions.php
+++ b/actions/apilistsubscriptions.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 class ApiListSubscriptionsAction extends ApiBareAuthAction
 {
     var $lists = array();
diff --git a/actions/apimediaupload.php b/actions/apimediaupload.php
index 0b08dbedf1..9c888ce3ed 100644
--- a/actions/apimediaupload.php
+++ b/actions/apimediaupload.php
@@ -30,9 +30,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Upload an image via the API.  Returns a shortened URL for the image
  * to the user.
diff --git a/actions/apistatusesdestroy.php b/actions/apistatusesdestroy.php
index 1f97b1a9de..db41c87ad0 100644
--- a/actions/apistatusesdestroy.php
+++ b/actions/apistatusesdestroy.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Deletes one of the authenticating user's statuses (notices).
  *
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
index feed505fb2..ee391fdb4a 100644
--- a/actions/apistatusesretweet.php
+++ b/actions/apistatusesretweet.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Repeat a notice through the API
  *
diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
index 3a1a43bc63..7af4cd3ec6 100644
--- a/actions/apistatusesretweets.php
+++ b/actions/apistatusesretweets.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Show up to 100 repeats of a notice
  *
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 9144f09002..7209ae3333 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -129,9 +129,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Updates the authenticating user's status (posts a notice).
  *
diff --git a/actions/apisubscriptions.php b/actions/apisubscriptions.php
index 84731ac00f..be53086ee4 100644
--- a/actions/apisubscriptions.php
+++ b/actions/apisubscriptions.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * This class outputs a list of profiles as Twitter-style user and status objects.
  * It is used by the API methods /api/statuses/(friends|followers). To support the
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index e2cb7c2ee2..7e8dd7aad6 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
-
 /**
  * Returns the 20 most recent favorite notices for the authenticating user or user
  * specified by the ID parameter in the requested format.
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 591baccfcc..ed4cce4908 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -133,8 +133,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns the most recent notices (default 20) posted by the target user.
  * This is the equivalent of 'You and friends' page accessed via Web.
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 22c6cc5f94..1ca74b208e 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns the most recent notices (default 20) posted by the target user.
  * This is the equivalent of 'You and friends' page accessed via Web.
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 07fbdf0b67..4ba8a4966b 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns the most recent (default 20) mentions (status containing @nickname)
  *
diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php
index 5fe9609159..01f3fe378b 100644
--- a/actions/apitimelineretweetedbyme.php
+++ b/actions/apitimelineretweetedbyme.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Show authenticating user's most recent repeats
  *
diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 2ea84f16e3..85f52f7388 100644
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show most recent notices that are repeats in user's inbox
  *
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index d01db87b93..fe90213665 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -31,9 +31,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Show authenticating user's most recent notices that have been repeated
  *
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 19e1a52d15..2540c036c1 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -38,8 +38,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Returns the most recent notices (default 20) posted by the authenticating
  * user. Another user's timeline can be requested via the id parameter. This
diff --git a/actions/apiuserfollowers.php b/actions/apiuserfollowers.php
index a5a429259d..61d743e27c 100644
--- a/actions/apiuserfollowers.php
+++ b/actions/apiuserfollowers.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Ouputs the authenticating user's followers (subscribers), each with
  * current Twitter-style status inline.  They are ordered by the order
diff --git a/actions/apiuserfriends.php b/actions/apiuserfriends.php
index b77d08097c..be6ccba273 100644
--- a/actions/apiuserfriends.php
+++ b/actions/apiuserfriends.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 /**
  * Ouputs the authenticating user's friends (subscriptions), each with
  * current Twitter-style status inline.  They are ordered by the date
diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index 8d5fde8150..837a9da3e9 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Feed of ActivityStreams 'favorite' actions
  *
diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 57d7317eef..e5ca8b0a5a 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Feed of group memberships for a user, in ActivityStreams format
  *
diff --git a/actions/atompubshowfavorite.php b/actions/atompubshowfavorite.php
index d8f371a39c..436e88e693 100644
--- a/actions/atompubshowfavorite.php
+++ b/actions/atompubshowfavorite.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show a single favorite in Atom Activity Streams format.
  *
diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index 025e2cb83e..ad6aa6c1d0 100644
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show (or delete) a single membership event as an ActivityStreams entry
  *
diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index 4dbb2af2e0..ec3949c4d8 100644
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Show a single subscription
  *
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 744a970d60..1b9f4b98a5 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apiauth.php';
-
 /**
  * Subscription feed class for AtomPub
  *
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 9ac8d46b6e..1c8f956b5d 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -34,9 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/noticelist.php';
-require_once INSTALLDIR . '/lib/mediafile.php';
-
 /**
  * Action for posting new notices
  *
diff --git a/lib/apiauth.php b/lib/apiauthaction.php
similarity index 98%
rename from lib/apiauth.php
rename to lib/apiauthaction.php
index 499c502480..3edcda4cb7 100644
--- a/lib/apiauth.php
+++ b/lib/apiauthaction.php
@@ -104,11 +104,7 @@ class ApiAuthAction extends ApiAction
         }
 
         // NOTE: Make sure we're scoped properly based on the auths!
-        if (isset($this->auth_user) && !empty($this->auth_user)) {
-            $this->scoped = $this->auth_user->getProfile();
-        } else {
-            $this->scoped = null;
-        }
+        $this->scoped = $this->auth_user->getProfile();
 
         // Reject API calls with the wrong access level
 
diff --git a/lib/apibareauth.php b/lib/apibareauthaction.php
similarity index 98%
rename from lib/apibareauth.php
rename to lib/apibareauthaction.php
index 043181b07a..8c20a031e8 100644
--- a/lib/apibareauth.php
+++ b/lib/apibareauthaction.php
@@ -41,8 +41,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
-
 /**
  * Actions extending this class will require auth unless a target
  * user ID has been specified
diff --git a/lib/apilistusers.php b/lib/apilistusers.php
index 04fc46730d..0838228ba0 100644
--- a/lib/apilistusers.php
+++ b/lib/apilistusers.php
@@ -29,8 +29,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
 class ApiListUsersAction extends ApiBareAuthAction
 {
     var $list   = null;
diff --git a/lib/apiprivateauth.php b/lib/apiprivateauth.php
index df401c382e..12f9898463 100644
--- a/lib/apiprivateauth.php
+++ b/lib/apiprivateauth.php
@@ -40,8 +40,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apiauth.php';
-
 /**
  * Actions extending this class will require auth only if a site is private
  *
diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 75e4e1c1e4..188e848703 100644
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -18,7 +18,6 @@
  */
 
 require_once(INSTALLDIR . '/lib/mail.php');
-require_once(INSTALLDIR . '/lib/mediafile.php');
 require_once('Mail/mimeDecode.php');
 
 // @todo FIXME: we use both Mail_mimeDecode and mailparse
diff --git a/plugins/Bookmark/actions/apitimelinebookmarks.php b/plugins/Bookmark/actions/apitimelinebookmarks.php
index 34dbfa75d3..58aac5d21c 100644
--- a/plugins/Bookmark/actions/apitimelinebookmarks.php
+++ b/plugins/Bookmark/actions/apitimelinebookmarks.php
@@ -34,8 +34,6 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/apibareauth.php';
-
 /**
  * Returns the 20 most recent favorite notices for the authenticating user or user
  * specified by the ID parameter in the requested format.