diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 41e421b2fe..f815d71063 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once ("../../lib/base.php");
 OC_JSON::checkLoggedIn();
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;
diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index ba079e2dae..cc15102bbc 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -22,7 +22,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
 
 if(!OC_User::isLoggedIn()){
 	if(!isset($_SERVER['PHP_AUTH_USER'])){
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 3091926095..a6433b1964 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -22,7 +22,7 @@
 */
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 $app = $_POST["app"];
 
diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
index d9910d5a98..c8168eaf46 100644
--- a/core/ajax/userlist.php
+++ b/core/ajax/userlist.php
@@ -22,7 +22,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
 
 if(!OC_User::isLoggedIn()){
         if(!isset($_SERVER['PHP_AUTH_USER'])){
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
index a55c54a9a4..258bd50fca 100644
--- a/core/ajax/validateuser.php
+++ b/core/ajax/validateuser.php
@@ -22,7 +22,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
-
+require_once('../../lib/base.php');
 
 if(!isset($_SERVER['PHP_AUTH_USER'])){
         header('WWW-Authenticate: Basic realm="ownCloud Server"');
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index b0183af7fc..a58489228d 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -14,7 +14,7 @@ function debug($msg) {
 	OC_Log::write('core','ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
- 
+require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 $category = isset($_GET['category'])?strip_tags($_GET['category']):null;
 $app = isset($_GET['app'])?$_GET['app']:null;
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index f96add3d8c..75def433d3 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -15,7 +15,7 @@ function debug($msg) {
 	OC_Log::write('core','ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
- 
+require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 $app = isset($_POST['app'])?$_POST['app']:null;
 $categories = isset($_POST['categories'])?$_POST['categories']:null;
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index 5b346bef28..252b3d3454 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -15,7 +15,7 @@ function debug($msg) {
 	OC_Log::write('core','ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 }
 
- 
+require_once('../../../lib/base.php');
 OC_JSON::checkLoggedIn();
 $app = isset($_GET['app'])?$_GET['app']:null;
 
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 1400ec67ca..89bb6cfa79 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -7,7 +7,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps
-
+require_once('../../lib/base.php');
 
 // Someone lost their password:
 if (isset($_POST['user'])) {
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 5f16e854f4..1c78d72094 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -7,7 +7,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps
-
+require_once('../../lib/base.php');
 
 // Someone wants to reset their password:
 if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === $_GET['token']) {
diff --git a/ocs/providers.php b/ocs/providers.php
index d4ccd4ef9f..e1d6ef7ee1 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -21,7 +21,7 @@
 * 
 */
 
- 
+require_once('../lib/base.php');
 
 $url='http://'.substr($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/';
 
diff --git a/ocs/v1.php b/ocs/v1.php
index ed97db2d9b..f5ff6cb605 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -21,7 +21,7 @@
 * 
 */
 
- 
+require_once('../lib/base.php');
 @ob_clean();
 OC_OCS::handle();
 
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 8f89256b82..326724d60c 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
diff --git a/search/index.php b/search/index.php
index d1f94f74a2..518695c56d 100644
--- a/search/index.php
+++ b/search/index.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+require_once('../lib/base.php');
 
 // Check if we are a user
 OC_Util::checkLoggedIn();
diff --git a/settings/admin.php b/settings/admin.php
index 399ddd907e..a997bad4e3 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 0ed3c4919f..860ea98787 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index faeccf48b5..57d82e7bd9 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index e1eb1a7866..1ed53efcf0 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index 859c293722..53e9be379e 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,6 @@
 <?php
 // Init owncloud
-
+require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
 OC_JSON::setContentTypeHeader();
 
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index bebcbcc903..cb116ebe4e 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 OC_JSON::checkAdminUser();
 OC_JSON::setContentTypeHeader();
 
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index bcb05fdd02..ed48b2cae1 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -6,7 +6,7 @@
  */
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 4368566992..5874dec964 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkLoggedIn();
 
diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index 712f5b652f..58d071255c 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 $l=OC_L10N::get('settings');
 
diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index 73f86061e3..4d36478189 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 325549ba3b..2c288997a1 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index bcdc3bc133..e3b00c3bc8 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 $l=OC_L10N::get('settings');
 
diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 6383ce3c80..298cbd6473 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-
+require_once('../../lib/base.php');
 OC_Util::checkAdminUser();
 
 OC_Config::setValue( 'loglevel', $_POST['level'] );
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 0e2ca31f14..f59017600a 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -6,7 +6,7 @@
  */
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 9449261af7..3ee3239dd8 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-
+require_once('../../lib/base.php');
 
 OC_JSON::checkAdminUser();
 
diff --git a/settings/apps.php b/settings/apps.php
index aed198c77c..0889b0c45e 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -21,7 +21,7 @@
 *
 */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 // Load the files we need
diff --git a/settings/help.php b/settings/help.php
index 00e93720ee..48fcec3278 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
 
diff --git a/settings/log.php b/settings/log.php
index 31e6f6ff37..ddbf72c443 100644
--- a/settings/log.php
+++ b/settings/log.php
@@ -20,7 +20,7 @@
  *
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 // Load the files we need
diff --git a/settings/personal.php b/settings/personal.php
index 7717bb7666..41499657ac 100755
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
 // Highlight navigation entry
diff --git a/settings/settings.php b/settings/settings.php
index c73d6b706e..a49de85520 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkLoggedIn();
 
 OC_Util::addStyle( 'settings', 'settings' );
diff --git a/settings/users.php b/settings/users.php
index 591d85ff67..96515a90ce 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
- 
+require_once('../lib/base.php');
 OC_Util::checkAdminUser();
 
 // We have some javascript foo!