diff --git a/Applications/DataExplorer/DataView/GeoMapper.cpp b/Applications/DataExplorer/DataView/GeoMapper.cpp
index b26e915ecae2b79cd03a932456dd12ff31252e1d..125d837586597cd2038a6e2fed2eb11ea8b88b3a 100644
--- a/Applications/DataExplorer/DataView/GeoMapper.cpp
+++ b/Applications/DataExplorer/DataView/GeoMapper.cpp
@@ -94,7 +94,7 @@ void GeoMapper::mapData()
 	double min_val(0), max_val(0);
 	if (_mesh)
 	{
-		GeoLib::AABB<GeoLib::Point> bounding_box (_mesh->getNodes().begin(), _mesh->getNodes().end());
+		GeoLib::AABB<MeshLib::Node> bounding_box (_mesh->getNodes().begin(), _mesh->getNodes().end());
 		min_val = bounding_box.getMinPoint()[2];
 		max_val = bounding_box.getMaxPoint()[2];
 	}
@@ -302,7 +302,7 @@ void GeoMapper::advancedMapOnMesh(const MeshLib::Mesh* mesh, const std::string &
 	this->mapOnMesh(mesh);
 }
 
-GeoLib::Point* GeoMapper::calcIntersection(GeoLib::Point const*const p1, GeoLib::Point const*const p2, GeoLib::Point const*const q1, GeoLib::Point const*const q2) const
+GeoLib::Point* GeoMapper::calcIntersection(MathLib::MathPoint const*const p1, MathLib::MathPoint const*const p2, GeoLib::Point const*const q1, GeoLib::Point const*const q2) const
 {
 	const double x1 = (*p1)[0], x2 = (*p2)[0], x3 = (*q1)[0], x4 = (*q2)[0];
 	const double y1 = (*p1)[1], y2 = (*p2)[1], y3 = (*q1)[1], y4 = (*q2)[1];
diff --git a/Applications/DataExplorer/DataView/GeoMapper.h b/Applications/DataExplorer/DataView/GeoMapper.h
index b6f2e596adc9a6cf4fa3fde0aae582dec972d850..8f90a4070c662e15caad07aec7b8914b28319b62 100644
--- a/Applications/DataExplorer/DataView/GeoMapper.h
+++ b/Applications/DataExplorer/DataView/GeoMapper.h
@@ -22,6 +22,9 @@
 #include "Point.h"
 #include "Grid.h"
 
+// MathLib
+#include "MathLib/MathPoint.h"
+
 namespace MeshLib {
 	class Mesh;
 }
@@ -60,7 +63,7 @@ private:
 	float getDemElevation(GeoLib::Point const& pnt) const;
 
 	// Calculates the intersection of two lines embedded in the xy-plane
-	GeoLib::Point* calcIntersection(GeoLib::Point const*const p1, GeoLib::Point const*const p2, GeoLib::Point const*const q1, GeoLib::Point const*const q2) const;
+	GeoLib::Point* calcIntersection(MathLib::MathPoint const*const p1, MathLib::MathPoint const*const p2, GeoLib::Point const*const q1, GeoLib::Point const*const q2) const;
 
 	// Returns the position of a point within a line-segment
 	unsigned getPointPosInLine(GeoLib::Polyline const*const line, unsigned start, unsigned end, GeoLib::Point const*const point, double eps) const;