diff --git a/dav/friendica/main.php b/dav/friendica/main.php
index 05f6f714..940f3d55 100644
--- a/dav/friendica/main.php
+++ b/dav/friendica/main.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Util\Emailer;
+
 require_once('include/security.php');
 
 function dav_install()
@@ -285,7 +287,6 @@ function dav_cron(&$a, &$b)
 						'textVersion'          => $text_text,
 						'additionalMailHeader' => "",
 					);
-					require_once('include/Emailer.php');
 					Emailer::send($params);
 				}
 				break;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 3f2cdc89..4fd5b958 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,7 +9,7 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
 
-require_once('include/Emailer.php');
+use Friendica\Util\Emailer;
 
 function notifyall_install() {
 	logger("installed notifyall");
@@ -42,7 +42,7 @@ function notifyall_post(&$a) {
 		$sender_name = sprintf(t('%s Administrator'), $sitename);
 	else
 		$sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
-	
+
 	if (! x($a->config['sender_email']))
 		$sender_email = 'noreply@' . $a->get_hostname();
 	else
@@ -54,7 +54,7 @@ function notifyall_post(&$a) {
 	$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"),array( "", "\n"), $text))),ENT_QUOTES,'UTF-8'));
 
 	$htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$text)));
-	
+
 	// if this is a test, send it only to the admin(s)
 	// admin_email might be a comma separated list, but we need "a@b','c@d','e@f
 	if ( intval($_REQUEST['test'])) {
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 95376696..011e60da 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -8,8 +8,7 @@
 
 use Friendica\App;
 use Friendica\Core\PConfig;
-
-require_once 'include/Emailer.php';
+use Friendica\Util\Emailer;
 
 /* because the fraking openpgp-php is in composer, require libs in composer
  * and then don't use autoloader to load classes... */