diff --git a/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp b/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
index d2f387bcab03731685cb21edcbe8e9e79c7e5b9f..541671545fbef5855133a9bfad0f68e7dd28af14 100644
--- a/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
+++ b/SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
@@ -2,6 +2,7 @@
 
 #include "Algo/Geometry/normal.h"
 #include "Algo/Geometry/laplacian.h"
+#include "Algo/LinearSolving/basic.h"
 
 #include "Algo/Topo/basic.h"
 
@@ -405,13 +406,13 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh)
 		nlBegin(NL_SYSTEM) ;
 	for (int coord = 0; coord < 3; ++coord)
 	{
-		LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
+		Algo::LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
 		nlBegin(NL_MATRIX);
-		LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord);
+		Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord);
 		nlEnd(NL_MATRIX);
 		nlEnd(NL_SYSTEM);
 		nlSolve();
-		LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
+		Algo::LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
 		nlReset(NL_TRUE);
 	}
 }
@@ -535,14 +536,14 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh)
 			nlBegin(NL_SYSTEM);
 		for (int coord = 0; coord < 3; ++coord)
 		{
-			LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
+			Algo::LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
 			nlBegin(NL_MATRIX);
 	//		LinearSolving::addRowsRHS_Laplacian_Cotan<PFP2>(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord);
-			LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord);
+			Algo::LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord);
 			nlEnd(NL_MATRIX);
 			nlEnd(NL_SYSTEM);
 			nlSolve();
-			LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
+			Algo::LinearSolving::getResult<PFP2>(*map, p.vIndex, p.positionAttribute, coord);
 			nlReset(NL_TRUE);
 		}
 	}
diff --git a/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp b/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
index 8b807c82fa25860cb59b7dae66d5d54065e059d8..109f2dae0edd57cc50bfbb360003273c1602fd54 100644
--- a/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
+++ b/SCHNApps/Plugins/surface_differentialProperties/src/surface_differentialProperties.cpp
@@ -281,7 +281,7 @@ void Surface_DifferentialProperties_Plugin::computeCurvature(
 	Algo::Surface::Geometry::computeAnglesBetweenNormalsOnEdges<PFP2>(*map, position, edgeAngle);
 	Algo::Surface::Geometry::computeAreaEdges<PFP2>(*map, position, edgeArea);
 
-	PFP2::REAL meanEdgeLength = Algo::Surface::Geometry::meanEdgeLength<PFP2>(*map, position);
+	PFP2::REAL meanEdgeLength = Algo::Geometry::meanEdgeLength<PFP2>(*map, position);
 
 	float radius = 2.0f * meanEdgeLength;
 	Algo::Surface::Geometry::computeCurvatureVertices_NormalCycles_Projected<PFP2>(*map, radius, position, normal, edgeAngle, edgeArea, kmax, kmin, Kmax, Kmin, Knormal);