diff --git a/include/api.php b/include/api.php
index e0dc413c2..9f1ad44e5 100644
--- a/include/api.php
+++ b/include/api.php
@@ -23,6 +23,7 @@ use Friendica\Network\HTTPException\NotImplementedException;
 use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Network\HTTPException\TooManyRequestsException;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\XML;
 
@@ -32,7 +33,6 @@ require_once 'include/conversation.php';
 require_once 'include/oauth.php';
 require_once 'include/html2plain.php';
 require_once 'mod/share.php';
-require_once 'include/Photo.php';
 require_once 'mod/item.php';
 require_once 'include/security.php';
 require_once 'include/contact_selectors.php';
diff --git a/include/follow.php b/include/follow.php
index 7e8b25d79..54ea9981f 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -8,13 +8,13 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 
 require_once 'include/group.php';
 require_once 'include/salmon.php';
-require_once 'include/Photo.php';
 
 function update_contact($id) {
 	/*
diff --git a/include/items.php b/include/items.php
index cffa12728..938925cb9 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,9 +1,7 @@
 <?php
-
 /**
  * @file include/items.php
  */
-
 use Friendica\App;
 use Friendica\ParseUrl;
 use Friendica\Core\Config;
@@ -13,6 +11,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Lock;
@@ -21,7 +20,6 @@ require_once 'include/bbcode.php';
 require_once 'include/oembed.php';
 require_once 'include/salmon.php';
 require_once 'include/crypto.php';
-require_once 'include/Photo.php';
 require_once 'include/tags.php';
 require_once 'include/files.php';
 require_once 'include/text.php';
diff --git a/include/network.php b/include/network.php
index c11cdb2c6..775ed3eaa 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
  * @file include/network.php
  */
-
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Util\XML;
 
 /**
@@ -687,7 +686,6 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
 	$matches = null;
 	$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism', $s, $matches, PREG_SET_ORDER);
 	if ($c) {
-		require_once 'include/Photo.php';
 		foreach ($matches as $mtch) {
 			logger('scale_external_image: ' . $mtch[1]);
 
diff --git a/include/plaintext.php b/include/plaintext.php
index 8fa291744..13df9d1c8 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -1,17 +1,15 @@
 <?php
-
 /**
  * @file include/plaintext.php
  */
-
 use Friendica\App;
 use Friendica\ParseUrl;
 use Friendica\Core\PConfig;
+use Friendica\Object\Photo;
 
-require_once("include/Photo.php");
-require_once("include/bbcode.php");
-require_once("include/html2plain.php");
-require_once("include/network.php");
+require_once "include/bbcode.php";
+require_once "include/html2plain.php";
+require_once "include/network.php";
 
 /**
  * @brief Fetches attachment data that were generated the old way
diff --git a/include/uimport.php b/include/uimport.php
index 8554ba6f0..4e30eabe3 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,12 +1,14 @@
 <?php
-
+/**
+ * @file include/uimport.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
-require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
diff --git a/include/user.php b/include/user.php
index d82671b86..ff7e9c9c8 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,8 +1,11 @@
 <?php
-
+/**
+ * @file include/user.php
+ */
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 require_once 'include/network.php';
 require_once 'include/plugin.php';
@@ -283,7 +286,6 @@ function create_user($arr) {
 
 	// unless there is no avatar-plugin loaded
 	if(strlen($photo)) {
-		require_once('include/Photo.php');
 		$photo_failure = false;
 
 		$filename = basename($photo);
diff --git a/mod/contacts.php b/mod/contacts.php
index 35be8e79e..5de39005b 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/contacts.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
@@ -7,10 +9,10 @@ use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 
 require_once 'include/contact_selectors.php';
 require_once 'mod/proxy.php';
-require_once 'include/Photo.php';
 
 function contacts_init(App $a) {
 	if (! local_user()) {
diff --git a/mod/crepair.php b/mod/crepair.php
index 754078316..4474cec99 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 
 require_once 'include/contact_selectors.php';
 require_once 'mod/contacts.php';
@@ -86,7 +87,6 @@ function crepair_post(App $a) {
 
 	if($photo) {
 		logger('mod-crepair: updating photo from ' . $photo);
-		require_once("include/Photo.php");
 
 		update_contact_avatar($photo,local_user(),$contact['id']);
 	}
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 47871debd..c61e01329 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -25,6 +25,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 
 require_once 'include/enotify.php';
@@ -325,8 +326,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		 *
 		 */
 
-		require_once 'include/Photo.php';
-
 		update_contact_avatar($contact['photo'],$uid,$contact_id);
 
 		logger('dfrn_confirm: confirm - imported photos');
@@ -676,8 +675,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			$photo = System::baseUrl() . '/images/person-175.jpg';
 		}
 
-		require_once 'include/Photo.php';
-
 		update_contact_avatar($photo,$local_uid,$dfrn_record);
 
 		logger('dfrn_confirm: request - photos imported');
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 9c0b7bb5a..516be5298 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -7,8 +7,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once('include/Photo.php');
+use Friendica\Object\Photo;
 
 /**
  * @param App $a
diff --git a/mod/install.php b/mod/install.php
index 9c9d60eef..803d7f196 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,10 +1,11 @@
 <?php
-
+/**
+ * @file mod/install.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-
-require_once "include/Photo.php";
+use Friendica\Object\Photo;
 
 $install_wizard_pass = 1;
 
diff --git a/mod/photo.php b/mod/photo.php
index ece784bae..62a7350ed 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,10 +1,12 @@
 <?php
-
+/**
+ * @file mod/photo.php
+ */
 use Friendica\App;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
-require_once('include/security.php');
-require_once('include/Photo.php');
+require_once 'include/security.php';
 
 function photo_init(App $a) {
 	global $_SERVER;
diff --git a/mod/photos.php b/mod/photos.php
index 7b58bb645..84fffe8ba 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/photos.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
@@ -7,8 +9,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 
-require_once 'include/Photo.php';
 require_once 'include/photos.php';
 require_once 'include/items.php';
 require_once 'include/acl_selectors.php';
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e80b9ee84..b185817d0 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,12 +1,13 @@
 <?php
-
+/**
+ * @file mod/profile_photo.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
-
-require_once("include/Photo.php");
+use Friendica\Object\Photo;
 
 function profile_photo_init(App $a) {
 
diff --git a/mod/proxy.php b/mod/proxy.php
index 8b5f0834f..db9d7409d 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -1,10 +1,14 @@
 <?php
-// Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+/**
+ * @file mod/proxy.php
+ * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+ */
 
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
@@ -15,7 +19,6 @@ define('PROXY_SIZE_MEDIUM', 'medium');
 define('PROXY_SIZE_LARGE', 'large');
 
 require_once 'include/security.php';
-require_once 'include/Photo.php';
 
 function proxy_init(App $a) {
 	// Pictures are stored in one of the following ways:
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d6cb0c2e1..5b5598a46 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -13,8 +13,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
-
-require_once 'include/Photo.php';
+use Friendica\Object\Photo;
 
 function wall_upload_post(App $a, $desktopmode = true) {
 
diff --git a/src/Model/GlobalContact.php b/src/Model/GlobalContact.php
index be8b28260..f0ad8faa1 100644
--- a/src/Model/GlobalContact.php
+++ b/src/Model/GlobalContact.php
@@ -10,6 +10,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use Friendica\Protocol\PortableContact;
 use dba;
@@ -18,7 +19,6 @@ use Exception;
 require_once 'include/datetime.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/Photo.php';
 
 /**
  * @brief This class handles GlobalContact related functions
diff --git a/src/Object/Contact.php b/src/Object/Contact.php
index d7e785362..9f81b98c4 100644
--- a/src/Object/Contact.php
+++ b/src/Object/Contact.php
@@ -13,6 +13,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -643,8 +644,6 @@ class Contact extends BaseObject
 			}
 		}
 
-		require_once 'include/Photo.php';
-
 		update_contact_avatar($data["photo"], $uid, $contact_id);
 
 		$contact = dba::select('contact', array('url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date'), array('id' => $contact_id), array('limit' => 1));
diff --git a/include/Photo.php b/src/Object/Photo.php
similarity index 99%
rename from include/Photo.php
rename to src/Object/Photo.php
index 761abc770..b87a4b6e7 100644
--- a/include/Photo.php
+++ b/src/Object/Photo.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * @file include/Photo.php
+ * @file src/Object/Photo.php
  * @brief This file contains the Photo class for image processing
  */
+namespace Friendica\Object;
 
 use Friendica\App;
 use Friendica\Core\Cache;
@@ -10,7 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once("include/photos.php");
+require_once "include/photos.php";
 
 class Photo {
 
@@ -50,7 +51,8 @@ class Photo {
 		return $t;
 	}
 
-	public function __construct($data, $type=null) {
+	public function __construct($data, $type=null)
+	{
 		$this->imagick = class_exists('Imagick');
 		$this->types = static::supportedTypes();
 		if (!array_key_exists($type, $this->types)){
@@ -80,7 +82,8 @@ class Photo {
 		}
 	}
 
-	public function is_imagick() {
+	public function is_imagick()
+	{
 		return $this->imagick;
 	}
 
diff --git a/src/ParseUrl.php b/src/ParseUrl.php
index 0183fdb3f..c5c23d7d9 100644
--- a/src/ParseUrl.php
+++ b/src/ParseUrl.php
@@ -6,6 +6,7 @@
 namespace Friendica;
 
 use Friendica\Core\Config;
+use Friendica\Object\Photo;
 use Friendica\Util\XML;
 
 use dba;
@@ -13,7 +14,6 @@ use DomXPath;
 use DOMDocument;
 
 require_once "include/network.php";
-require_once "include/Photo.php";
 require_once "include/oembed.php";
 
 /**
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 4d91f8b1c..2ffaac642 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -19,6 +19,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use Friendica\Util\XML;
 
@@ -27,7 +28,6 @@ use SimpleXMLElement;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
-require_once 'include/Photo.php';
 require_once 'include/group.php';
 require_once 'include/datetime.php';
 require_once 'include/queue_fn.php';
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index ed762084c..206d188f5 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -12,6 +12,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Util\Lock;
 use Friendica\Util\XML;
 use dba;
@@ -24,7 +25,6 @@ require_once 'include/bbcode.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
-require_once 'include/Photo.php';
 require_once 'include/follow.php';
 require_once 'include/api.php';
 require_once 'mod/proxy.php';
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 59b3ad432..feb4dfdc8 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -14,6 +14,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use dba;
 use DOMDocument;
@@ -23,7 +24,6 @@ use Exception;
 require_once 'include/datetime.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
-require_once 'include/Photo.php';
 
 class PortableContact
 {
diff --git a/update.php b/update.php
index 21074c1d8..f228bf735 100644
--- a/update.php
+++ b/update.php
@@ -6,6 +6,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 /**
  *
@@ -146,8 +147,8 @@ function update_1013() {
 		AFTER `object` , ADD `target` TEXT NOT NULL AFTER `target-type`");
 }
 
-function update_1014() {
-	require_once('include/Photo.php');
+function update_1014()
+{
 	q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
 	$r = q("SELECT * FROM `photo` WHERE `scale` = 4");
 	if (DBM::is_result($r)) {
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 35e40aa96..0a6b48e4e 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -12,6 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
+use Friendica\Object\Photo;
 
 $frio = "view/theme/frio";
 
@@ -79,9 +80,8 @@ function frio_uninstall() {
  * @param App $a Unused but required by hook definition
  * @param array $body_info The item and its html output
  */
-function frio_item_photo_links(App $a, &$body_info) {
-	require_once('include/Photo.php');
-
+function frio_item_photo_links(App $a, &$body_info)
+{
 	$phototypes = Photo::supportedTypes();
 	$occurence = 1;
 	$p = bb_find_open_close($body_info['html'], "<a", ">");
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 5023aeb9b..5d5162cd3 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -11,6 +11,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Object\Photo;
 
 function frost_init(App $a) {
 	$a->videowidth = 400;
@@ -45,8 +46,8 @@ function frost_uninstall() {
 	logger("uninstalled theme frost");
 }
 
-function frost_item_photo_links(App $a, &$body_info) {
-	require_once('include/Photo.php');
+function frost_item_photo_links(App $a, &$body_info)
+{
 	$phototypes = Photo::supportedTypes();
 
 	$occurence = 1;