diff --git a/include/dbstructure.php b/include/dbstructure.php
index 05b2bc07cc..297ada0f80 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -94,8 +94,8 @@ function update_fail($update_id, $error_message) {
 		'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
 	));
 	$subject=sprintf(t('Update Error at %s'), System::baseUrl());
-	require_once('include/email.php');
-	$subject = Email::emailHeaderEncode($subject,'UTF-8');
+	
+	$subject = Email::emailHeaderEncode($subject,'UTF-8'); // use Friendica\Protocol\Email;
 	mail($a->config['admin_email'], $subject, $email_msg,
 		'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n"
 		.'Content-type: text/plain; charset=UTF-8'."\n"
diff --git a/include/enotify.php b/include/enotify.php
index dc030fa8b8..99d5ea0ab3 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -8,7 +8,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Util\Emailer;
 
-require_once 'include/email.php';
 require_once 'include/bbcode.php';
 require_once 'include/html2bbcode.php';
 
diff --git a/include/items.php b/include/items.php
index d446d2773d..7cbcfaaaf5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -22,7 +22,6 @@ require_once 'include/crypto.php';
 require_once 'include/tags.php';
 require_once 'include/files.php';
 require_once 'include/text.php';
-require_once 'include/email.php';
 require_once 'include/threads.php';
 require_once 'include/plaintext.php';
 require_once 'include/feed.php';
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 1a30effd4e..b3304fda12 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,12 +1,13 @@
 <?php
-
+/**
+ * @file mod/lostpass.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once('include/email.php');
-require_once('include/enotify.php');
-require_once('include/text.php');
+require_once 'include/enotify.php';
+require_once 'include/text.php';
 
 function lostpass_post(App $a) {
 
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index b261b32fc0..e64351f17d 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -19,7 +19,6 @@ require_once 'include/salmon.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
-require_once 'include/email.php';
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused