diff --git a/include/api.php b/include/api.php
index 57bbd6399..86fd106f5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -31,6 +31,7 @@ use Friendica\Model\User;
 use Friendica\Network\FKOAuth1;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
+use Friendica\Network\HTTPException\ExpectationFailedException;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\MethodNotAllowedException;
diff --git a/include/text.php b/include/text.php
index 40265eae3..0b8bcacba 100644
--- a/include/text.php
+++ b/include/text.php
@@ -4,31 +4,14 @@
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Feature;
 use Friendica\Content\Smilies;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Event;
-use Friendica\Model\Item;
-use Friendica\Render\FriendicaSmarty;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Map;
-use Friendica\Util\Proxy as ProxyUtils;
 
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Model\FileTag;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
-use Friendica\Content\Text\HTML;
 
 /**
  * Turn user/group ACLs stored as angle bracketed text into arrays
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 67bc5e3ba..9d2a7e22e 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -8,7 +8,6 @@ namespace Friendica\Core;
 use Exception;
 use Friendica\BaseObject;
 use Friendica\Render\FriendicaSmarty;
-use Friendica\Render\ITemplateEngine;
 
 /**
  * @brief This class handles Renderer related functions.
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 3b195cbdb..a9413e1de 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -8,6 +8,7 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Hook;
diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index e5cbfb785..9f5fcdcc5 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,6 +5,7 @@
 
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;