diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
index 0397c321182..2f5bcfe4a2a 100644
--- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
+++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp
@@ -20,23 +20,16 @@
 * Contact information: contact@sofa-framework.org                             *
 ******************************************************************************/
 #include <sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h>
-#include <sofa/core/visual/VisualParams.h>
 
 #include <sofa/core/ObjectFactory.h>
-
-#include <sofa/component/topology/container/dynamic/QuadSetTopologyModifier.h>
-#include <sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h>
-
 #include <sofa/core/topology/TopologyChange.h>
 
-#include <sofa/type/Vec.h>
-#include <map>
 #include <sofa/defaulttype/VecTypes.h>
-
-#include <cmath>
-
 #include <sofa/defaulttype/RigidTypes.h>
 
+#include <sofa/component/topology/container/dynamic/QuadSetTopologyModifier.h>
+#include <sofa/component/topology/container/dynamic/QuadSetTopologyContainer.h>
+
 
 namespace sofa::component::topology::mapping
 {
diff --git a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
index 7d85f56a145..cf838710074 100644
--- a/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
+++ b/Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.h
@@ -22,14 +22,11 @@
 #pragma once
 
 #include <sofa/component/topology/mapping/config.h>
-#include <sofa/core/topology/TopologicalMapping.h>
 
 #include <sofa/type/Vec.h>
-#include <sofa/defaulttype/RigidTypes.h>
-#include <map>
+#include <sofa/core/topology/TopologicalMapping.h>
+#include <sofa/core/State.h>
 
-#include <sofa/core/BaseMapping.h>
-#include <sofa/core/behavior/MechanicalState.h>
 
 
 namespace sofa::component::topology::container::dynamic
@@ -54,10 +51,7 @@ class SOFA_COMPONENT_TOPOLOGY_MAPPING_API Edge2QuadTopologicalMapping : public s
 {
 public:
     SOFA_CLASS(Edge2QuadTopologicalMapping,sofa::core::topology::TopologicalMapping);
-
-    using RigidCoord = sofa::core::State<defaulttype::Rigid3Types>::Coord;
-    using Vec3Coord = sofa::core::State<defaulttype::Vec3Types>::Coord;
-    
+        
     using Index = sofa::core::topology::BaseMeshTopology::Index;
     using Edge = sofa::core::topology::BaseMeshTopology::Edge;
     using Quad = sofa::core::topology::BaseMeshTopology::Quad;