2 files changed, 5 insertions, 8 deletions
diff --git a/phpBB/phpbb/files/types/base.php b/phpBB/phpbb/files/types/base.php
index 686ce6f695..77ebdb4f32 100644
--- a/phpBB/phpbb/files/types/base.php
+++ b/phpBB/phpbb/files/types/base.php
@@ -13,8 +13,6 @@
 
 namespace phpbb\files\types;
 
-use \phpbb\files\filespec;
-use \phpbb\files\upload;
 use \phpbb\language\language;
 
 abstract class base implements type_interface
@@ -22,15 +20,15 @@ abstract class base implements type_interface
 	/** @var language */
 	protected $language;
 
-	/** @var upload */
+	/** @var \phpbb\files\upload */
 	protected $upload;
 
 	/**
 	 * Check if upload exceeds maximum file size
 	 *
-	 * @param filespec $file Filespec object
+	 * @param \phpbb\files\filespec $file Filespec object
 	 *
-	 * @return filespec Returns same filespec instance
+	 * @return \phpbb\files\filespec Returns same filespec instance
 	 */
 	public function check_upload_size($file)
 	{
@@ -57,7 +55,7 @@ abstract class base implements type_interface
 	/**
 	 * {@inheritdoc}
 	 */
-	public function set_upload(upload $upload)
+	public function set_upload(\phpbb\files\upload $upload)
 	{
 		$this->upload = $upload;
 
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
index 04263f9cba..f2db6c798c 100644
--- a/phpBB/phpbb/files/types/remote.php
+++ b/phpBB/phpbb/files/types/remote.php
@@ -15,7 +15,6 @@ namespace phpbb\files\types;
 
 use \phpbb\files\factory;
 use \phpbb\files\filespec;
-use \phpbb\files\upload;
 use \phpbb\language\language;
 use \phpbb\request\request_interface;
 
@@ -30,7 +29,7 @@ class remote extends base
 	/** @var request_interface */
 	protected $request;
 
-	/** @var upload */
+	/** @var \phpbb\files\upload */
 	protected $upload;
 
 	/**