diff --git a/src/Hydra/Serializer/ConstraintViolationListNormalizer.php b/src/Hydra/Serializer/ConstraintViolationListNormalizer.php
index 86c5d088930..9deb6c092ab 100644
--- a/src/Hydra/Serializer/ConstraintViolationListNormalizer.php
+++ b/src/Hydra/Serializer/ConstraintViolationListNormalizer.php
@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Hydra\Serializer;
 
-use ApiPlatform\Api\UrlGeneratorInterface;
+use ApiPlatform\Metadata\UrlGeneratorInterface;
 use ApiPlatform\Serializer\AbstractConstraintViolationListNormalizer;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
diff --git a/src/Symfony/Bundle/Resources/config/api.xml b/src/Symfony/Bundle/Resources/config/api.xml
index 7efa4318d10..be47bc92f63 100644
--- a/src/Symfony/Bundle/Resources/config/api.xml
+++ b/src/Symfony/Bundle/Resources/config/api.xml
@@ -133,7 +133,7 @@
         <service id="ApiPlatform\Api\IdentifiersExtractorInterface" alias="api_platform.api.identifiers_extractor" />
         <service id="ApiPlatform\Metadata\IdentifiersExtractorInterface" alias="api_platform.api.identifiers_extractor" />
 
-        <service id="api_platform.uri_variables.converter" class="ApiPlatform\Api\UriVariablesConverter" public="false">
+        <service id="api_platform.uri_variables.converter" class="ApiPlatform\Metadata\UriVariablesConverter" public="false">
             <argument type="service" id="api_platform.metadata.property.metadata_factory" />
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
             <argument type="tagged" tag="api_platform.uri_variables.transformer" />
diff --git a/src/Symfony/Controller/MainController.php b/src/Symfony/Controller/MainController.php
index b75d549b2db..e41f2c41848 100644
--- a/src/Symfony/Controller/MainController.php
+++ b/src/Symfony/Controller/MainController.php
@@ -13,13 +13,13 @@
 
 namespace ApiPlatform\Symfony\Controller;
 
-use ApiPlatform\Api\UriVariablesConverterInterface;
 use ApiPlatform\Exception\InvalidIdentifierException;
 use ApiPlatform\Exception\InvalidUriVariableException;
 use ApiPlatform\Metadata\Error;
 use ApiPlatform\Metadata\Exception\RuntimeException;
 use ApiPlatform\Metadata\HttpOperation;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Metadata\UriVariablesConverterInterface;
 use ApiPlatform\State\ProcessorInterface;
 use ApiPlatform\State\ProviderInterface;
 use ApiPlatform\State\UriVariablesResolverTrait;
diff --git a/src/Symfony/EventListener/ExceptionListener.php b/src/Symfony/EventListener/ExceptionListener.php
index 7aa50a5a995..d0b8b034d42 100644
--- a/src/Symfony/EventListener/ExceptionListener.php
+++ b/src/Symfony/EventListener/ExceptionListener.php
@@ -14,7 +14,7 @@
 namespace ApiPlatform\Symfony\EventListener;
 
 use ApiPlatform\Metadata\Error;
-use ApiPlatform\Util\RequestAttributesExtractor;
+use ApiPlatform\State\Util\RequestAttributesExtractor;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\EventListener\ErrorListener;
 
diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json
index 48fe9a2daa8..124318d3dcb 100644
--- a/src/Symfony/composer.json
+++ b/src/Symfony/composer.json
@@ -21,6 +21,7 @@
     "require": {
         "php": ">=8.1",
         "api-platform/documentation": "*@dev || ^3.1",
+        "api-platform/doctrine-common": "*@dev || ^3.1",
         "api-platform/elasticsearch": "*@dev || ^3.1",
         "api-platform/graphql": "*@dev || ^3.1",
         "api-platform/http-cache": "*@dev || ^3.1",