diff --git a/xs/src/Geometry.cpp b/xs/src/Geometry.cpp
index 8da689b70..1b7cda080 100644
--- a/xs/src/Geometry.cpp
+++ b/xs/src/Geometry.cpp
@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <map>
 
-namespace Slic3r {
+namespace Slic3r { namespace Geometry {
 
 static bool
 sort_points (Point a, Point b)
@@ -80,4 +80,4 @@ chained_path(Points &points, std::vector<Points::size_type> &retval)
     chained_path(points, retval, points.front());
 }
 
-}
+} }
diff --git a/xs/src/Geometry.hpp b/xs/src/Geometry.hpp
index 0cd1a9bce..1a0aaced2 100644
--- a/xs/src/Geometry.hpp
+++ b/xs/src/Geometry.hpp
@@ -3,12 +3,12 @@
 
 #include "Polygon.hpp"
 
-namespace Slic3r {
+namespace Slic3r { namespace Geometry {
 
 void convex_hull(Points points, Polygon &hull);
 void chained_path(Points &points, std::vector<Points::size_type> &retval, Point start_near);
 void chained_path(Points &points, std::vector<Points::size_type> &retval);
 
-}
+} }
 
 #endif
diff --git a/xs/xsp/Geometry.xsp b/xs/xsp/Geometry.xsp
index 09724e368..e800e4eca 100644
--- a/xs/xsp/Geometry.xsp
+++ b/xs/xsp/Geometry.xsp
@@ -5,6 +5,7 @@
 #include "Geometry.hpp"
 %}
 
+
 %package{Slic3r::Geometry};
 
 %{
@@ -16,7 +17,7 @@ convex_hull(points)
         const char* CLASS = "Slic3r::Polygon";
     CODE:
         RETVAL = new Polygon ();
-        convex_hull(points, *RETVAL);
+        Slic3r::Geometry::convex_hull(points, *RETVAL);
     OUTPUT:
         RETVAL
 
@@ -24,7 +25,7 @@ std::vector<Points::size_type>
 chained_path(points)
     Points      points
     CODE:
-        chained_path(points, RETVAL);
+        Slic3r::Geometry::chained_path(points, RETVAL);
     OUTPUT:
         RETVAL
 
@@ -33,7 +34,7 @@ chained_path_from(points, start_from)
     Points      points
     Point*      start_from
     CODE:
-        chained_path(points, RETVAL, *start_from);
+        Slic3r::Geometry::chained_path(points, RETVAL, *start_from);
     OUTPUT:
         RETVAL