diff --git a/boot.php b/boot.php
index 358e88494..216a93496 100644
--- a/boot.php
+++ b/boot.php
@@ -21,6 +21,7 @@
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Util\Lock;
 
diff --git a/include/Contact.php b/include/Contact.php
index f69454e39..0dbe2ca13 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 // Included here for completeness, but this is a very dangerous operation.
diff --git a/include/Photo.php b/include/Photo.php
index 5c3a52ffd..7cdab27a0 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/photos.php");
 
diff --git a/include/Smilies.php b/include/Smilies.php
index 9264a09d8..488f3c55c 100644
--- a/include/Smilies.php
+++ b/include/Smilies.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * This class contains functions to handle smiles
diff --git a/include/api.php b/include/api.php
index 16ff0f4a0..31d5ddd97 100644
--- a/include/api.php
+++ b/include/api.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/HTTPExceptions.php';
diff --git a/include/auth.php b/include/auth.php
index d301f8705..148afb303 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once('include/security.php');
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 832dab7e8..8a64ba7fd 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 use League\HTMLToMarkdown\HtmlConverter;
diff --git a/include/bbcode.php b/include/bbcode.php
index 8e38d139e..c4d35d3c4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/oembed.php';
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 2bc1e89f5..2073e40f7 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/contact_selectors.php';
diff --git a/include/conversation.php b/include/conversation.php
index 4f40bc288..759712c47 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
diff --git a/include/dbstructure.php b/include/dbstructure.php
index fea88c9d3..4b8deca0d 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once "boot.php";
diff --git a/include/delivery.php b/include/delivery.php
index 05fba7985..507e17f4a 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/queue_fn.php';
diff --git a/include/dfrn.php b/include/dfrn.php
index c2b599ce2..6065697ba 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/Contact.php");
 require_once("include/ostatus.php");
diff --git a/include/diaspora.php b/include/diaspora.php
index 3d0726832..d6bd8e7d5 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -9,6 +9,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/items.php';
diff --git a/include/enotify.php b/include/enotify.php
index 3b5672dcd..09482a410 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/Emailer.php');
 require_once('include/email.php');
diff --git a/include/event.php b/include/event.php
index e5f19deda..609e058d7 100644
--- a/include/event.php
+++ b/include/event.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/bbcode.php';
 require_once 'include/map.php';
diff --git a/include/follow.php b/include/follow.php
index 711579ff5..6f3f24b74 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/probe.php';
 require_once 'include/socgraph.php';
diff --git a/include/identity.php b/include/identity.php
index bc18319b2..c25621c39 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/ForumManager.php';
 require_once 'include/bbcode.php';
diff --git a/include/items.php b/include/items.php
index d8f615a2c..0586e7184 100644
--- a/include/items.php
+++ b/include/items.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\ParseUrl;
 use Friendica\Util\Lock;
 use Friendica\Core\Config;
diff --git a/include/like.php b/include/like.php
index 4f2600271..37241790b 100644
--- a/include/like.php
+++ b/include/like.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/diaspora.php");
 
diff --git a/include/message.php b/include/message.php
index 0c1ffff7c..410dc6b39 100644
--- a/include/message.php
+++ b/include/message.php
@@ -3,6 +3,7 @@
 // send a private message
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
diff --git a/include/nav.php b/include/nav.php
index 435e892d9..796609636 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function nav(App $a) {
 
diff --git a/include/network.php b/include/network.php
index 5f2c120bc..08c038ec7 100644
--- a/include/network.php
+++ b/include/network.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
 
diff --git a/include/oauth.php b/include/oauth.php
index 9e2be68c7..61fbecb79 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
diff --git a/include/oembed.php b/include/oembed.php
index cb23517cd..2124efa5c 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\ParseUrl;
 use Friendica\Core\Config;
 
diff --git a/include/ostatus.php b/include/ostatus.php
index e3724f3bf..2027ad281 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
 
diff --git a/include/plugin.php b/include/plugin.php
index 4dd79b521..79512ccf5 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * @brief uninstalls an addon.
diff --git a/include/poller.php b/include/poller.php
index 8c30d1628..7524c3ad0 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Util\Lock;
 
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 6702a2149..eeb071e1f 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once('include/items.php');
diff --git a/include/redir.php b/include/redir.php
index d6b8285cf..bc4f9714b 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function auto_redir(App $a, $contact_nick) {
 
diff --git a/include/security.php b/include/security.php
index 0a4379d95..355faaea2 100644
--- a/include/security.php
+++ b/include/security.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
diff --git a/include/socgraph.php b/include/socgraph.php
index ace1b916e..e0288fc46 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
 
diff --git a/include/tags.php b/include/tags.php
index de716edef..d4fa84e46 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function create_tags_from_item($itemid) {
 	$profile_base = App::get_baseurl();
diff --git a/include/text.php b/include/text.php
index cd271676c..fd31de558 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/template_processor.php";
 require_once "include/friendica_smarty.php";
diff --git a/include/threads.php b/include/threads.php
index c1277778e..dcb3b3f13 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function add_thread($itemid, $onlyshadow = false) {
 	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
diff --git a/include/uimport.php b/include/uimport.php
index 3bdde2235..6d1f6d49a 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
diff --git a/index.php b/index.php
index e67ace132..ea67cd723 100644
--- a/index.php
+++ b/index.php
@@ -14,6 +14,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'boot.php';
diff --git a/mod/admin.php b/mod/admin.php
index fbc096800..ea369f142 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once("include/enotify.php");
diff --git a/mod/allfriends.php b/mod/allfriends.php
index fe3013a7c..690097aa5 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index f7dd25677..e9c14e47b 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/conversation.php');
 require_once('include/items.php');
diff --git a/mod/cal.php b/mod/cal.php
index cd884e50e..18ef1eca9 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/event.php');
 require_once('include/redir.php');
diff --git a/mod/contacts.php b/mod/contacts.php
index 6b40f0455..d84919235 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
diff --git a/mod/content.php b/mod/content.php
index a8c313033..70f3ec501 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -16,6 +16,7 @@
 // and 10-20 milliseconds to fetch all the child items.
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function content_content(App $a, $update = 0) {
 
diff --git a/mod/delegate.php b/mod/delegate.php
index e99734a33..4b59b4eeb 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('mod/settings.php');
 
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 897e85ecb..4e655c223 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -19,6 +19,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index e6196accc..33035d879 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/items.php');
 require_once('include/auth.php');
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 0050decee..dacade2ea 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -13,6 +13,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 884eca9a6..4dfe73585 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/contact_widgets.php';
 require_once 'include/probe.php';
diff --git a/mod/display.php b/mod/display.php
index 4adb860f3..414e43c07 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/dfrn.php');
 
diff --git a/mod/editpost.php b/mod/editpost.php
index c0d903d0c..d6826e610 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/acl_selectors.php');
 
diff --git a/mod/events.php b/mod/events.php
index 0fdec5cbe..8be5bc033 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 21b9b2e7b..1aa627d23 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/Photo.php');
 
diff --git a/mod/fetch.php b/mod/fetch.php
index 6dd6966d9..9ecfe10f4 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,6 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/crypto.php");
 require_once("include/diaspora.php");
diff --git a/mod/filerm.php b/mod/filerm.php
index 71e0af08d..29c6a67be 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function filerm_content(App $a) {
 
diff --git a/mod/follow.php b/mod/follow.php
index 8d5cb9912..df2686eb6 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/probe.php';
 require_once 'include/follow.php';
diff --git a/mod/friendica.php b/mod/friendica.php
index bbfdbfe09..1c1b6c940 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 function friendica_init(App $a) {
diff --git a/mod/group.php b/mod/group.php
index c01d1cf55..908336856 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function group_init(App $a) {
 	if (local_user()) {
diff --git a/mod/hcard.php b/mod/hcard.php
index 229939a4a..a208890b9 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function hcard_init(App $a) {
 
diff --git a/mod/help.php b/mod/help.php
index 95fe91c38..6a9d01faa 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('library/markdown.php');
 
diff --git a/mod/home.php b/mod/home.php
index bd77a840d..a502c0c57 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 if(! function_exists('home_init')) {
 function home_init(App $a) {
diff --git a/mod/ignored.php b/mod/ignored.php
index a7c3ba6e1..5f597ca17 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function ignored_init(App $a) {
 
diff --git a/mod/install.php b/mod/install.php
index aa891dba7..4c0353acf 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/Photo.php";
 
diff --git a/mod/invite.php b/mod/invite.php
index 5982574fa..88a0059cb 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/email.php');
 
diff --git a/mod/item.php b/mod/item.php
index cbe338c4f..3b54b0cf8 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -16,6 +16,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/crypto.php';
 require_once 'include/enotify.php';
diff --git a/mod/like.php b/mod/like.php
index c542a540a..346109018 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
diff --git a/mod/localtime.php b/mod/localtime.php
index c32f67976..554d87b12 100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/datetime.php');
 
@@ -47,4 +48,4 @@ function localtime_content(App $a) {
 
 	return $o;
 
-}
\ No newline at end of file
+}
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 37ef3e2f8..a192388ad 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/email.php');
 require_once('include/enotify.php');
diff --git a/mod/manage.php b/mod/manage.php
index a6ab32c2d..c5123f2dd 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/text.php");
 
diff --git a/mod/manifest.php b/mod/manifest.php
index d38dcb8d9..90fd71741 100644
--- a/mod/manifest.php
+++ b/mod/manifest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 function manifest_content(App $a) {
diff --git a/mod/match.php b/mod/match.php
index 4119bf8e8..7d5f7a8cd 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/text.php');
 require_once('include/socgraph.php');
diff --git a/mod/message.php b/mod/message.php
index 76f675f19..34f68187a 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
diff --git a/mod/mood.php b/mod/mood.php
index c693e7cdc..bbdd51683 100644
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
diff --git a/mod/msearch.php b/mod/msearch.php
index 460b9c303..fcf87f958 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function msearch_post(App $a) {
 
diff --git a/mod/navigation.php b/mod/navigation.php
index 31b20e891..26a637e22 100644
--- a/mod/navigation.php
+++ b/mod/navigation.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/nav.php");
 
diff --git a/mod/network.php b/mod/network.php
index 395d1347b..519442e0b 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function network_init(App $a) {
 	if (! local_user()) {
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index b0fcc09ed..bf6740c7f 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -6,6 +6,7 @@
 */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/plugin.php';
diff --git a/mod/noscrape.php b/mod/noscrape.php
index 814dc885c..273233650 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function noscrape_init(App $a) {
 
diff --git a/mod/notice.php b/mod/notice.php
index 1114b9a5a..ed94b35d1 100644
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -3,6 +3,7 @@
 /* identi.ca -> friendica items permanent-url compatibility */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function notice_init(App $a) {
 
diff --git a/mod/notify.php b/mod/notify.php
index e38068193..f2a73ea2a 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/NotificationsManager.php');
 
diff --git a/mod/oexchange.php b/mod/oexchange.php
index 930caac7e..b04270ffb 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function oexchange_init(App $a) {
 
diff --git a/mod/openid.php b/mod/openid.php
index 5707b1b72..a7413073f 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('library/openid.php');
 
diff --git a/mod/opensearch.php b/mod/opensearch.php
index dc7adeb05..33dd6c048 100644
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function opensearch_content(App $a) {
 
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 0b399acf2..7395cd053 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/probe.php';
 require_once 'include/follow.php';
diff --git a/mod/p.php b/mod/p.php
index f66dd43a2..18c6a5d7f 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -4,6 +4,7 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/diaspora.php");
 
diff --git a/mod/photos.php b/mod/photos.php
index bf21b3437..1aa330a85 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
 
diff --git a/mod/ping.php b/mod/ping.php
index ad1d4019f..138090331 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/datetime.php');
 require_once('include/bbcode.php');
diff --git a/mod/poke.php b/mod/poke.php
index 83f3bf1c7..a7d1701c8 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -15,6 +15,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
diff --git a/mod/profile.php b/mod/profile.php
index c7bd13a3e..37daaf0a2 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index c9fc5232d..ca55f8006 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/Photo.php");
 
diff --git a/mod/profiles.php b/mod/profiles.php
index 01030914c..5161f814c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
diff --git a/mod/proxy.php b/mod/proxy.php
index a78f40dab..65b3fdc51 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -2,6 +2,7 @@
 // Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
 
 use Friendica\App;
+use Friendica\Core\System;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
diff --git a/mod/randprof.php b/mod/randprof.php
index 8d9083ada..7bdd9e4ee 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function randprof_init(App $a) {
 	require_once('include/Contact.php');
diff --git a/mod/redir.php b/mod/redir.php
index 366c39886..b0d2da262 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function redir_init(App $a) {
 
diff --git a/mod/register.php b/mod/register.php
index 4766445d8..6ae9c5d52 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/enotify.php');
 require_once('include/bbcode.php');
diff --git a/mod/regmod.php b/mod/regmod.php
index 3c8601208..28d45f5a6 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/enotify.php');
 require_once('include/user.php');
diff --git a/mod/removeme.php b/mod/removeme.php
index 639c9be9f..fe3770842 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function removeme_post(App $a) {
 
diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index ff4c11a7a..3cbc92ae1 100755
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once 'include/probe.php';
 require_once 'include/follow.php';
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index 1417e9646..7b234e465 100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function rsd_xml_content(App $a)
 {
@@ -22,4 +23,4 @@ function rsd_xml_content(App $a)
 </rsd>';
 
 	killme();
-}
\ No newline at end of file
+}
diff --git a/mod/settings.php b/mod/settings.php
index f13e89cd1..c09b4397d 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/group.php');
 require_once('include/socgraph.php');
diff --git a/mod/starred.php b/mod/starred.php
index e1b38cfc4..b0cb5bd1d 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function starred_init(App $a) {
 
diff --git a/mod/subthread.php b/mod/subthread.php
index 0745fc0ee..9568dab41 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
diff --git a/mod/suggest.php b/mod/suggest.php
index a82dca794..1f6fec186 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
diff --git a/mod/tagger.php b/mod/tagger.php
index e6619f9fe..3ca067e45 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
diff --git a/mod/tagrm.php b/mod/tagrm.php
index ea1ab7909..f767902d9 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/bbcode.php');
 
diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
index 12a611527..caa02b1e4 100644
--- a/mod/toggle_mobile.php
+++ b/mod/toggle_mobile.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function toggle_mobile_init(App $a) {
 
diff --git a/mod/uexport.php b/mod/uexport.php
index b00f9bdf9..d00cb14ec 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function uexport_init(App $a) {
 	if (!local_user()) {
diff --git a/mod/videos.php b/mod/videos.php
index 2ee73c211..d340cad61 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index a35e86a52..36d4db53d 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -10,6 +10,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 require_once 'include/Photo.php';
diff --git a/mod/xrd.php b/mod/xrd.php
index acde4d9f3..78e3fbc96 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('include/crypto.php');
 
diff --git a/src/Core/System.php b/src/Core/System.php
new file mode 100644
index 000000000..152546a61
--- /dev/null
+++ b/src/Core/System.php
@@ -0,0 +1,75 @@
+<?php
+namespace Friendica\Core;
+
+use dba;
+use dbm;
+use Friendica\App;
+
+/**
+ * @file include/Core/System.php
+ *
+ * @brief Contains the class with system relevant stuff
+ */
+
+
+/**
+ * @brief System methods
+ */
+class System {
+
+	private static $a;
+
+	/**
+	 * @brief Initializes the static class variable
+	 */
+	private static function init() {
+		global $a;
+
+		if (!is_object(self::$a)) {
+			self::$a = $a;
+		}
+	}
+
+	/**
+	 * @brief Retrieves the Friendica instance base URL
+	 *
+	 * @param bool $ssl Whether to append http or https under SSL_POLICY_SELFSIGN
+	 * @return string Friendica server base URL
+	 */
+	public static function baseUrl($ssl = false) {
+		self::init();
+		return self::$a->get_baseurl($ssl);
+	}
+
+	/**
+	 * @brief Removes the baseurl from an url. This avoids some mixed content problems.
+	 *
+	 * @param string $orig_url
+	 *
+	 * @return string The cleaned url
+	 */
+        function removedBaseUrl($orig_url) {
+		self::init();
+		return self::$a->remove_baseurl($orig_url);
+	}
+
+	/// @todo Move the following functions from boot.php
+	/*
+	function get_guid($size = 16, $prefix = "")
+	function killme()
+	function goaway($s)
+	function local_user()
+	function public_contact()
+	function remote_user()
+	function notice($s)
+	function info($s)
+	function is_site_admin()
+	function random_digits($digits)
+	function get_server()
+	function get_temppath()
+	function get_cachefile($file, $writemode = true)
+	function get_itemcachepath()
+	function get_spoolpath()
+	function current_load()
+	*/
+}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 5168e4c26..a8e9e642a 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -9,6 +9,7 @@ namespace Friendica\Network;
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 use Friendica\Core\Config;
 
 use dbm;
diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index b1ec4bae5..c2bb1a070 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function theme_content(App $a) {
 	if (!local_user()) {
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 229e863e9..eaa2585ad 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once('view/theme/frio/php/Image.php');
 
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 517223d10..c926d210d 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 $frio = "view/theme/frio";
 
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 24f41073e..934f50386 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -10,6 +10,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function frost_mobile_init(App $a) {
 	$a->sourcename = 'Friendica mobile web';
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index b09153876..a3f4e011d 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -10,6 +10,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function frost_init(App $a) {
 	$a->videowidth = 400;
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 47210012c..9b3a65e3d 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function theme_content(App $a) {
 	if (!local_user()) {
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 5647fd493..624e86904 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function quattro_init(App $a) {
 	$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 00f114721..ab049b03b 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -11,6 +11,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function smoothly_init(App $a) {
 	set_template_engine($a, 'smarty3');
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 0747770d3..5a20e131b 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function theme_content(App $a) {
 	if (!local_user()) {
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 298f0df57..ee1751e4a 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -10,6 +10,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once "include/plugin.php";
 require_once "include/socgraph.php";