diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception.php b/typo3/sysext/extbase/Classes/Configuration/Exception.php
index c86406e48572aab7fc3827d04a6b9a6f0856dcbf..8d0768dd6461d9d2244bfa78c2bdd8a9f337e994 100644
--- a/typo3/sysext/extbase/Classes/Configuration/Exception.php
+++ b/typo3/sysext/extbase/Classes/Configuration/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Configuration;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Configuration;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic Configuration Exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php b/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
index 2353b37d9336becc3c786a83594b29c409d7c56a..5e2888b0c698ebe3568387bdbabbcccf4739e73c 100644
--- a/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
+++ b/typo3/sysext/extbase/Classes/Configuration/Exception/InvalidConfigurationTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Configuration\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Configuration\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Configuration\Exception;
+
 /**
  * An Invalid Configuration Type Exception
  */
-class InvalidConfigurationTypeException extends \TYPO3\CMS\Extbase\Configuration\Exception
+class InvalidConfigurationTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php b/typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
index bfbe1abdaac8f144af585d9f7d88de6662cb6a41..42a51f9a44e365662448d714137c3f53b8851168 100644
--- a/typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
+++ b/typo3/sysext/extbase/Classes/Configuration/Exception/ParseErrorException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Configuration\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Configuration\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Configuration\Exception;
+
 /**
  * A Parse Error exception
  */
-class ParseErrorException extends \TYPO3\CMS\Extbase\Configuration\Exception
+class ParseErrorException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Exception.php b/typo3/sysext/extbase/Classes/Exception.php
index 2f07c1f309e0598d6f966ffff8aba35e5212a885..716a087c0639e5725742b7ab9c350b4eac83d53e 100644
--- a/typo3/sysext/extbase/Classes/Exception.php
+++ b/typo3/sysext/extbase/Classes/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase;
 
 /*
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Exception/RequiredArgumentMissingException.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Exception/RequiredArgumentMissingException.php
index 34ab52b848530be36a206df5803b4d42f8d09482..e317ad0d899c22284d190b270a0cc6d777e52e87 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Exception/RequiredArgumentMissingException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Exception/RequiredArgumentMissingException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Controller\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Controller\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Argument Name" exception
  */
-class RequiredArgumentMissingException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class RequiredArgumentMissingException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception.php b/typo3/sysext/extbase/Classes/Mvc/Exception.php
index ebefc600ab3b252a0d097553c0929c7352c570ae..9f51f32ab08b965dc8d5be9d3d69a8a675d6ba52 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic MVC exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php
index 805c0a3440fb02720cf44102981b04a84562ece0..509bb949b3ecfdd5d3766c86ee1d6d46978ed05f 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InfiniteLoopException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Infinite Loop" exception
  */
-class InfiniteLoopException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InfiniteLoopException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php
index 376a09fdbba5808870ab97a626805d365107c4af..de9fa6151d2f178c9a84abf55d317fae853e4a4b 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidActionNameException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "invalid action name" exception
  */
-class InvalidActionNameException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidActionNameException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php
index 8e474a9b41be814e004837270364d2abc69684bd..df3edec5cc47e14aece57aeb70069d548baa8766 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentMixingException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Argument Name" exception
  */
-class InvalidArgumentMixingException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidArgumentMixingException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php
index 326c89360819980910907eac32745b5cbb642014..36ee614fbc5a532d6a7483248ffd99dad8fd50a3 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentNameException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Argument Name" exception
  */
-class InvalidArgumentNameException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidArgumentNameException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php
index fcac4d5af48d18722d428b4d9251f2b6016a24d4..3fa5e03f2546e2e1d82d11d6349f2c3054c0a473 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Argument Type" exception
  */
-class InvalidArgumentTypeException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidArgumentTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php
index 7ae450e5068970ad8b30ff0fd0184f9fa6261369..b8d226160b548f9c974d5f26c9f1d0e04d5facb1 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidArgumentValueException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Argument Value" exception
  */
-class InvalidArgumentValueException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidArgumentValueException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php
index 92598b4ba5f594b661e6addee159c14bcfdc2ff6..1d549fc1f1a8433bc4dd48bfc9fc60026133fdfe 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Controller" exception
  */
-class InvalidControllerException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidControllerException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php
index 6a1b74f8cd3d94321f1afd854e1fdf6c645e299c..46a07da2d683e153a5b0f8a1d2e76cd0f61772c2 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidControllerNameException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Controller Name" exception
  */
-class InvalidControllerNameException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidControllerNameException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php
index 208104cf1b37944a3733305d093655cf91f5db1c..d4f443374482b6c44a1bf24a823730804495b687 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidExtensionNameException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Extension Name" exception
  */
-class InvalidExtensionNameException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidExtensionNameException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php
index 74a7fa66b32ae618a4c1882a328e62721fdba41e..236ab82043399d96b79fd9df19382ebb5b5b44ce 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/InvalidRequestMethodException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Invalid Request Method" exception
  */
-class InvalidRequestMethodException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class InvalidRequestMethodException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php
index 383bd4e7625fc2f432d6f64fd49e1f2114757e18..9b5b364652cf7635807d4b921c8ce357a79e9d5c 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchActionException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * A "No Such Action" exception
  */
-class NoSuchActionException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class NoSuchActionException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php
index 3c6c5f92a3a94338db9cc83b6d974da3b91bd32a..fe84d456c331fced94e1634c82887c619b167173 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchArgumentException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * A "No Such Argument" exception
  */
-class NoSuchArgumentException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class NoSuchArgumentException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php
index 325ed8310f74665c91ec7457dc68cfc77512c77d..6a650e9b499c6ed8aef3d8353d483bff7aee981d 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/NoSuchControllerException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * A "No Such Controller" exception
  */
-class NoSuchControllerException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class NoSuchControllerException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php
index ea329bfc581b805a90e350a3c4fcdaef2528a933..3e858b5b7ff8c7fb4f912ebf2ab6c96e13ce462b 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/StopActionException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,6 +16,8 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * This exception is thrown by a controller to stop the execution of the current
  * action and return the control to the dispatcher. The dispatcher catches this
@@ -22,6 +26,6 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  *
  * See the Action Controller's forward() and redirectToUri() methods for more information.
  */
-class StopActionException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class StopActionException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestTypeException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestTypeException.php
index b90ef191fc76c37dc1ca607457fc8f204ce69af4..3a158116edb5c2eb9e74f3daecaa7bf996787f84 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestTypeException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/UnsupportedRequestTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Mvc\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Mvc\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Mvc\Exception;
+
 /**
  * An "Unsupported Request Type" exception
  */
-class UnsupportedRequestTypeException extends \TYPO3\CMS\Extbase\Mvc\Exception
+class UnsupportedRequestTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Object/Container/Exception/UnknownObjectException.php b/typo3/sysext/extbase/Classes/Object/Container/Exception/UnknownObjectException.php
index f698a78f6e15ca739244c56ff05bca91d91a9d15..fbc3498343ccb911068f2b0cfebf43bff0e19845 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/Exception/UnknownObjectException.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/Exception/UnknownObjectException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Object\Container\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Object\Container\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Object\Exception;
+
 /**
  * "Unknown Object" Exception
  */
-class UnknownObjectException extends \TYPO3\CMS\Extbase\Object\Exception
+class UnknownObjectException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Object/Exception.php b/typo3/sysext/extbase/Classes/Object/Exception.php
index 9766b4565dedb9048ab26c32f4512db87663bacd..73938424b86a2c5147661a208948bc4d2f88516b 100644
--- a/typo3/sysext/extbase/Classes/Object/Exception.php
+++ b/typo3/sysext/extbase/Classes/Object/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Object;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Object;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic Object Exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php b/typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php
index af75582cf2c2a05c06230c95f318cee149f22e99..a7078345184c3de049157d9ca835966109c47141 100644
--- a/typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php
+++ b/typo3/sysext/extbase/Classes/Object/Exception/CannotBuildObjectException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Object\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Object\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Object\Exception;
+
 /**
  * "Cannot build object" Exception
  */
-class CannotBuildObjectException extends \TYPO3\CMS\Extbase\Object\Exception
+class CannotBuildObjectException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php b/typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php
index e5eafe29befd4bfebc432314277b556b7485b73d..0d01f387c329c6294ef3e850380a10d62a10382a 100644
--- a/typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php
+++ b/typo3/sysext/extbase/Classes/Object/Exception/CannotReconstituteObjectException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Object\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Object\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Object\Exception;
+
 /**
  * "Cannot reconstitute object" Exception
  */
-class CannotReconstituteObjectException extends \TYPO3\CMS\Extbase\Object\Exception
+class CannotReconstituteObjectException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Exception.php b/typo3/sysext/extbase/Classes/Persistence/Exception.php
index e69f3d0b1e1fa04a6092ce9d7ff6f874141d4cb5..dcb2990800b7d2e481b9f66f1e2737f9ba71976a 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Exception.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic Persistence exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php b/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
index cb749e41a33c72b8dd9e9babfc11bbdbc68539f4..1f70c0ab00face26e9b1ba170cb44fbecb2e602c 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalObjectTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Exception;
+
 /**
  * An "Invalid Object Type" exception
  */
-class IllegalObjectTypeException extends \TYPO3\CMS\Extbase\Persistence\Exception
+class IllegalObjectTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalRelationTypeException.php b/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalRelationTypeException.php
index aa94e8e3b05a00fbf92c3888f2a7109df7fc767d..c970646a7fd9b92104f2995b6cbe31b8c96b1ded 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalRelationTypeException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Exception/IllegalRelationTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Exception;
+
 /**
  * An "Illegal Relation Type" exception
  */
-class IllegalRelationTypeException extends \TYPO3\CMS\Extbase\Persistence\Exception
+class IllegalRelationTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Exception/InvalidQueryException.php b/typo3/sysext/extbase/Classes/Persistence/Exception/InvalidQueryException.php
index c768a33a3b69812714dbc5d19ccecf7c98f340c3..5760be662cb224ecd42cc8999b2a0cb6a6fa7fcf 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Exception/InvalidQueryException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Exception/InvalidQueryException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception;
+
 /**
  * An "Invalid Query" Exception
  */
-class InvalidQueryException extends \TYPO3\CMS\Extbase\Exception
+class InvalidQueryException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php b/typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php
index a751be9892a2075e81a12a9531f6d835eaad8c9b..980878369cb93f6b3b353a734eac6defcfceb44e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Exception/UnknownObjectException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Exception;
+
 /**
  * An "Unknown Object" exception
  */
-class UnknownObjectException extends \TYPO3\CMS\Extbase\Persistence\Exception
+class UnknownObjectException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception.php
index a89d599af67086abb5040b049f9fd78d37337977..71a4d3d382c54cf66720b7af9942117d276dc7a9 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic;
 
 /*
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
index 3f101a49a067148098f95a1b1c6aa9b56d585608..393212da85d83300a82c748ebd256343ad6829da 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InconsistentQuerySettingsException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * Thrown if a setting set is not available in the current context.
  */
-class InconsistentQuerySettingsException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class InconsistentQuerySettingsException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
index 7ea69a4daee32c4a7de3b9c0403ba9de7493c5b0..d561e0feb9f067f01da4315c86a7b9f54bef9712 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidClassException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Invalid Class" exception
  */
-class InvalidClassException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class InvalidClassException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
index 8b15385208b6112dc84417e26ceb10e6e35596e5..b8c95f79bd5b12019340396db1f2d276e2d3eee2 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidNumberOfConstraintsException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Invalid Number of Constraints" exception.
  */
-class InvalidNumberOfConstraintsException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class InvalidNumberOfConstraintsException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidRelationConfigurationException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidRelationConfigurationException.php
index c8545f03c2706e8624e152763cc25e28d499a673..c1a3451b11c07460d119397b831f964d19d855c0 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidRelationConfigurationException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/InvalidRelationConfigurationException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "InvalidRelationConfigurationException" exception
  */
-class InvalidRelationConfigurationException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class InvalidRelationConfigurationException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingColumnMapException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingColumnMapException.php
index b3f42b4ad8ab7bfd50541d633cf9ab7eec1aae1c..d80efd520f02695b5cc489c47ea7bb21f5301965 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingColumnMapException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/MissingColumnMapException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * A "Missing ColumnMap" exception
  */
-class MissingColumnMapException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class MissingColumnMapException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/NotImplementedException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/NotImplementedException.php
index fef60b291fc1bb43bd5cab696480dfc58155ad2c..0777aaccf86ea73067b2316302966de53ebefb77 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/NotImplementedException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/NotImplementedException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,17 +16,22 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Exception;
+
 /**
  * An "NotImplementedException" exception
  */
-class NotImplementedException extends \TYPO3\CMS\Extbase\Persistence\Exception
+class NotImplementedException extends Exception
 {
     /**
      * @param string $method
      * @param int $exceptionCode
      */
-    public function __construct($method, int $exceptionCode = null)
+    public function __construct(string $method, int $exceptionCode = null)
     {
-        parent::__construct(sprintf('Method %s is not supported by generic persistence"', $method), $exceptionCode ?? 1350213237);
+        parent::__construct(
+            sprintf('Method %s is not supported by generic persistence"', $method),
+            $exceptionCode ?? 1350213237
+        );
     }
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/RepositoryException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/RepositoryException.php
index f4de5e87f02462000a238e36fcada4bbbfefb231..5909bfce6768a3d12fbdfb6f99d1d775a45a45cb 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/RepositoryException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/RepositoryException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,10 +16,12 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use RuntimeException;
+
 /**
  * Main exception thrown by classes in this package. May contain an error
  * message and/or another nested exception.
  */
-class RepositoryException extends \RuntimeException
+class RepositoryException extends RuntimeException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php
index cc7288e6ae324a8cc414397bc9c3317abb91dae5..1042bc96612a19a0c7ad8abd8f2297a08c1ab709 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/TooDirtyException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * A "Too Dirty" exception
  */
-class TooDirtyException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class TooDirtyException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnexpectedTypeException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnexpectedTypeException.php
index beeaacd720ebb3f8288f68b5be8c3dfc390ee5d2..a35d104ca70429339f7121a195e38ec71321b437 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnexpectedTypeException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnexpectedTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Unexpected Type" exception.
  */
-class UnexpectedTypeException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class UnexpectedTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
index c1dba2e73082a47411b5f3be35bd7f8ef6099d06..edad088fd1a3a5ea0833a254fecfff6613e28823 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedMethodException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Unsupported Method" exception
  */
-class UnsupportedMethodException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class UnsupportedMethodException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
index 83b15a5080b0e96c3dd2d45b6b35456b3f52d01b..895dab3b55cb53402076ff88c949a0d64c584c2b 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedOrderException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Unsupported Order" exception: The order you specified in the query is not supported by now.
  */
-class UnsupportedOrderException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class UnsupportedOrderException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php
index c9d8c0febd61442f2dba315b054699f3dbd817cb..0dbcb580289113342cacfe56e271180f7c5db384 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Exception/UnsupportedRelationException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An "Unsupported Order" exception: The order you specified in the query is not supported by now.
  */
-class UnsupportedRelationException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class UnsupportedRelationException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraintException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraintException.php
index cffd0881194975db95df77353b21ecb89400dbbb..9506c3e87eec44891d6cff001549d08db054d1c6 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraintException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/BadConstraintException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An Bad Constraint exception
  */
-class BadConstraintException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class BadConstraintException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlErrorException.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlErrorException.php
index deb0b66bd0a628642a726062610756eacf24cacf..3768ffb7f8789d7b0dbe33d3b83b0088cbb685b3 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlErrorException.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Exception/SqlErrorException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
+
 /**
  * An SQL exception
  */
-class SqlErrorException extends \TYPO3\CMS\Extbase\Persistence\Generic\Exception
+class SqlErrorException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception.php b/typo3/sysext/extbase/Classes/Property/Exception.php
index f06eb755458fb34ae3fa574edf32dbc7613c5b74..0c4ef3d882ff378a7d807c9eb8e4199df3a2b196 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * An generic Property related exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/DuplicateObjectException.php b/typo3/sysext/extbase/Classes/Property/Exception/DuplicateObjectException.php
index 1139432bd299ab915640dc177f4a32d8ff736654..b99df7913f98a25d4292f2c9fe3bc38a95d24cce 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/DuplicateObjectException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/DuplicateObjectException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * A "Duplicate Object" Exception
  */
-class DuplicateObjectException extends \TYPO3\CMS\Extbase\Property\Exception
+class DuplicateObjectException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/DuplicateTypeConverterException.php b/typo3/sysext/extbase/Classes/Property/Exception/DuplicateTypeConverterException.php
index 77f1def84d84b3b7bac2be2268038ac3d667e111..f16d618168eb3024f5fb70ebf7f71447210ffcca 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/DuplicateTypeConverterException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/DuplicateTypeConverterException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * A "Duplicate Type Converter" Exception
  */
-class DuplicateTypeConverterException extends \TYPO3\CMS\Extbase\Property\Exception
+class DuplicateTypeConverterException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/InvalidDataTypeException.php b/typo3/sysext/extbase/Classes/Property/Exception/InvalidDataTypeException.php
index 9787cc6a58db0292b36d2c36264c2fa557fd3404..f51594a61a48f3f75f180a3c17fe45e83b1782ee 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/InvalidDataTypeException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/InvalidDataTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * An "Invalid Data Type" Exception
  */
-class InvalidDataTypeException extends \TYPO3\CMS\Extbase\Property\Exception
+class InvalidDataTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyMappingConfigurationException.php b/typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyMappingConfigurationException.php
index b5aac1552e499575c2733ed6c7d1069d57b2385f..e600dea4c768a8d61416dfc3e195675a22f610ef 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyMappingConfigurationException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/InvalidPropertyMappingConfigurationException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * An "Invalid Property Mapping Configuration" Exception
  */
-class InvalidPropertyMappingConfigurationException extends \TYPO3\CMS\Extbase\Property\Exception
+class InvalidPropertyMappingConfigurationException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php b/typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php
index 88f61c3c7dcee06b7a8d58891f59f5021f58a78d..d18d8b048f5edcf1827834da794252bd06546c49 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/InvalidSourceException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * An "Invalid Source" Exception
  */
-class InvalidSourceException extends \TYPO3\CMS\Extbase\Property\Exception
+class InvalidSourceException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php b/typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php
index 1738acac1a938eaec9dd3f82057655b4717e26eb..1d0fd4bc09940d4c06e2f02c5d349605d03eb667 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/InvalidTargetException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * An "Invalid Target" Exception
  */
-class InvalidTargetException extends \TYPO3\CMS\Extbase\Property\Exception
+class InvalidTargetException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/TargetNotFoundException.php b/typo3/sysext/extbase/Classes/Property/Exception/TargetNotFoundException.php
index e95af95c0107be3eef2b45d6cd886dea4fa21edb..4df3169ccbda25e37800b9810ee56ca59dd2e994 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/TargetNotFoundException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/TargetNotFoundException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * A "TargetNotFound" Exception
  */
-class TargetNotFoundException extends \TYPO3\CMS\Extbase\Property\Exception
+class TargetNotFoundException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Property/Exception/TypeConverterException.php b/typo3/sysext/extbase/Classes/Property/Exception/TypeConverterException.php
index c27da3ecc2b7dc1ea0607e2465d100cc7710e986..1d00a19d3039087befafc23a1f35f516c225377b 100644
--- a/typo3/sysext/extbase/Classes/Property/Exception/TypeConverterException.php
+++ b/typo3/sysext/extbase/Classes/Property/Exception/TypeConverterException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Property\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Property\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Property\Exception;
+
 /**
  * A "Type Converter" Exception
  */
-class TypeConverterException extends \TYPO3\CMS\Extbase\Property\Exception
+class TypeConverterException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Reflection/Exception.php b/typo3/sysext/extbase/Classes/Reflection/Exception.php
index bbeaa097badf1e207c9e8a21c22d3c9699fb7a79..aada1c6b3957c52d953c5a39951e807a4bc8db66 100644
--- a/typo3/sysext/extbase/Classes/Reflection/Exception.php
+++ b/typo3/sysext/extbase/Classes/Reflection/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Reflection;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Reflection;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic Reflection Exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php b/typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php
index 41c0d92a88f8471311c1b45b47a7eae8d6058329..8a8a0f094966556b363ce4892450751d2b977558 100644
--- a/typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php
+++ b/typo3/sysext/extbase/Classes/Reflection/Exception/PropertyNotAccessibleException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Reflection\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Reflection\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Reflection\Exception;
+
 /**
  * An "Property not accessible" exception
  */
-class PropertyNotAccessibleException extends \TYPO3\CMS\Extbase\Reflection\Exception
+class PropertyNotAccessibleException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClassException.php b/typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClassException.php
index df68308fb70af136ca36a5ac66ded2d5eb9c7414..0289701826c4abb9ed37d6f573d4dccd7aabfe83 100644
--- a/typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClassException.php
+++ b/typo3/sysext/extbase/Classes/Reflection/Exception/UnknownClassException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Reflection\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Reflection\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Reflection\Exception;
+
 /**
  * An "Unknown Class" exception
  */
-class UnknownClassException extends \TYPO3\CMS\Extbase\Reflection\Exception
+class UnknownClassException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Security/Exception.php b/typo3/sysext/extbase/Classes/Security/Exception.php
index edd9820498bf7dbc8868fff9993d5fc64b9c1122..1ca6613bd1853dd471952dc5bdc2574aa0515445 100644
--- a/typo3/sysext/extbase/Classes/Security/Exception.php
+++ b/typo3/sysext/extbase/Classes/Security/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Security;
 
 /*
@@ -14,11 +16,13 @@ namespace TYPO3\CMS\Extbase\Security;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A hash service which should be used to generate and validate hashes.
  *
  * It will use some salt / encryption key in the future.
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php b/typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php
index bd4840430303cc8aff76d71507db616ed4f0e80d..dbe8bf43cac46402e0a32f6df78b2fc7528a37bf 100644
--- a/typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php
+++ b/typo3/sysext/extbase/Classes/Security/Exception/InvalidArgumentForHashGenerationException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Security\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Security\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Security\Exception;
+
 /**
  * An "InvalidArgumentForHashGeneration" exception
  */
-class InvalidArgumentForHashGenerationException extends \TYPO3\CMS\Extbase\Security\Exception
+class InvalidArgumentForHashGenerationException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php b/typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php
index c925481e17323cfb3cf0a563cac716cf34c52347..dafb838eb96b0d4e5578b0204f0ad0cf6b584378 100644
--- a/typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php
+++ b/typo3/sysext/extbase/Classes/Security/Exception/InvalidHashException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Security\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Security\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Security\Exception;
+
 /**
  * A "InvalidHash" Exception, thrown when a HMAC validation failed.
  */
-class InvalidHashException extends \TYPO3\CMS\Extbase\Security\Exception
+class InvalidHashException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotException.php b/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotException.php
index de4232a36d2b76059c6542c8cf341dcf75c9fea7..327308fa82a90ce0e9d87088f03fc9ca930c233b 100644
--- a/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotException.php
+++ b/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\SignalSlot\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\SignalSlot\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Object\Exception;
+
 /**
  * "Invalid Slot" Exception
  */
-class InvalidSlotException extends \TYPO3\CMS\Extbase\Object\Exception
+class InvalidSlotException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotReturnException.php b/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotReturnException.php
index 93867bf649e5e87fd1adc8a966aa61d80968ee87..7999a5eb48c2fa90c866ad8edea429f05c085453 100644
--- a/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotReturnException.php
+++ b/typo3/sysext/extbase/Classes/SignalSlot/Exception/InvalidSlotReturnException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\SignalSlot\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\SignalSlot\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Object\Exception;
+
 /**
  * "Invalid Slot Return" Exception
  */
-class InvalidSlotReturnException extends \TYPO3\CMS\Extbase\Object\Exception
+class InvalidSlotReturnException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php b/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
index 10ff1b7f51211d8ec39970618fa23e17b3398c86..dc701898e8ac512bf202d042aa058a9ed0c0cee7 100644
--- a/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
+++ b/typo3/sysext/extbase/Classes/Utility/Exception/InvalidTypeException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Utility\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Utility\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception;
+
 /**
  * An Invalid Type Exception
  */
-class InvalidTypeException extends \TYPO3\CMS\Extbase\Exception
+class InvalidTypeException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Validation/Exception.php b/typo3/sysext/extbase/Classes/Validation/Exception.php
index 196508829372d7dc3b6312c054fb99f60df4406b..1ee99151f7af85f62f6817a9535c6ba9ce3aff94 100644
--- a/typo3/sysext/extbase/Classes/Validation/Exception.php
+++ b/typo3/sysext/extbase/Classes/Validation/Exception.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Validation;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Validation;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Exception as ExtbaseException;
+
 /**
  * A generic validation exception
  */
-class Exception extends \TYPO3\CMS\Extbase\Exception
+class Exception extends ExtbaseException
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidTypeHintException.php b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidTypeHintException.php
index abb4d27d7e8a3d24729796071571c9414ad755b3..e3afd2bd5cf9f9e5185e989f7f5652b6f5d1f3f4 100644
--- a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidTypeHintException.php
+++ b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidTypeHintException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Validation\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Validation\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Validation\Exception;
+
 /**
  * An "Invalid TypeHint" Exception
  */
-class InvalidTypeHintException extends \TYPO3\CMS\Extbase\Validation\Exception
+class InvalidTypeHintException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php
index d46c302c0f37749f9165891ccb8ca7705c17830e..7048e83dccda3a81fe7a00b65bbcbd8496702f5c 100644
--- a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php
+++ b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationConfigurationException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Validation\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Validation\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Validation\Exception;
+
 /**
  * A "InvalidValidationConfiguration" Exception
  */
-class InvalidValidationConfigurationException extends \TYPO3\CMS\Extbase\Validation\Exception
+class InvalidValidationConfigurationException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php
index dbcaa09f061930a807c08b5a9ddd590ab4941616..6f8f8478476617483b6c3d47ee91eb184d99687b 100644
--- a/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php
+++ b/typo3/sysext/extbase/Classes/Validation/Exception/InvalidValidationOptionsException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Validation\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Validation\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Validation\Exception;
+
 /**
  * A "InvalidValidationOptions" Exception
  */
-class InvalidValidationOptionsException extends \TYPO3\CMS\Extbase\Validation\Exception
+class InvalidValidationOptionsException extends Exception
 {
 }
diff --git a/typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php b/typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php
index 6b9390c8d5447c03eb831ce6bd11a5019efecf20..3e9ba37478b2e2ca8927313353fe87a5ac2a9ab4 100644
--- a/typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php
+++ b/typo3/sysext/extbase/Classes/Validation/Exception/NoSuchValidatorException.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types = 1);
+
 namespace TYPO3\CMS\Extbase\Validation\Exception;
 
 /*
@@ -14,9 +16,11 @@ namespace TYPO3\CMS\Extbase\Validation\Exception;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Extbase\Validation\Exception;
+
 /**
  * A "NoSuchValidator" Exception
  */
-class NoSuchValidatorException extends \TYPO3\CMS\Extbase\Validation\Exception
+class NoSuchValidatorException extends Exception
 {
 }