diff --git a/xs/xsp/Clipper.xsp b/xs/xsp/Clipper.xsp
index a39db6140..c4640dcf4 100644
--- a/xs/xsp/Clipper.xsp
+++ b/xs/xsp/Clipper.xsp
@@ -20,10 +20,10 @@ _constant()
   OUTPUT: RETVAL
 
 Polygons
-offset(polygons, delta, joinType = ClipperLib::jtMiter, miterLimit = 3)
+offset(polygons, delta, joinType = Slic3r::ClipperLib::jtMiter, miterLimit = 3)
     Polygons                polygons
     const float             delta
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         RETVAL = offset(polygons, delta, joinType, miterLimit);
@@ -31,10 +31,10 @@ offset(polygons, delta, joinType = ClipperLib::jtMiter, miterLimit = 3)
         RETVAL
 
 ExPolygons
-offset_ex(polygons, delta, joinType = ClipperLib::jtMiter, miterLimit = 3)
+offset_ex(polygons, delta, joinType = Slic3r::ClipperLib::jtMiter, miterLimit = 3)
     Polygons                polygons
     const float             delta
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         RETVAL = offset_ex(polygons, delta, joinType, miterLimit);
@@ -42,11 +42,11 @@ offset_ex(polygons, delta, joinType = ClipperLib::jtMiter, miterLimit = 3)
         RETVAL
 
 Polygons
-offset2(polygons, delta1, delta2, joinType = ClipperLib::jtMiter, miterLimit = 3)
+offset2(polygons, delta1, delta2, joinType = Slic3r::ClipperLib::jtMiter, miterLimit = 3)
     Polygons                polygons
     const float             delta1
     const float             delta2
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         RETVAL = offset2(polygons, delta1, delta2, joinType, miterLimit);
@@ -54,11 +54,11 @@ offset2(polygons, delta1, delta2, joinType = ClipperLib::jtMiter, miterLimit = 3
         RETVAL
 
 ExPolygons
-offset2_ex(polygons, delta1, delta2, joinType = ClipperLib::jtMiter, miterLimit = 3)
+offset2_ex(polygons, delta1, delta2, joinType = Slic3r::ClipperLib::jtMiter, miterLimit = 3)
     Polygons                polygons
     const float             delta1
     const float             delta2
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         RETVAL = offset2_ex(polygons, delta1, delta2, joinType, miterLimit);
diff --git a/xs/xsp/Polyline.xsp b/xs/xsp/Polyline.xsp
index 0dbd0e572..10bbb263f 100644
--- a/xs/xsp/Polyline.xsp
+++ b/xs/xsp/Polyline.xsp
@@ -79,9 +79,9 @@ Polyline::rotate(angle, center_sv)
         THIS->rotate(angle, center);
 
 Polygons
-Polyline::grow(delta, joinType = ClipperLib::jtSquare, miterLimit = 3)
+Polyline::grow(delta, joinType = Slic3r::ClipperLib::jtSquare, miterLimit = 3)
     const float             delta
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         RETVAL = offset(*THIS, delta, joinType, miterLimit);
diff --git a/xs/xsp/Surface.xsp b/xs/xsp/Surface.xsp
index 379774f0a..49d988333 100644
--- a/xs/xsp/Surface.xsp
+++ b/xs/xsp/Surface.xsp
@@ -85,7 +85,7 @@ Surface::polygons()
 Surfaces
 Surface::offset(delta, joinType = ClipperLib::jtMiter, miterLimit = 3)
     const float             delta
-    ClipperLib::JoinType    joinType
+    Slic3r::ClipperLib::JoinType    joinType
     double                  miterLimit
     CODE:
         surfaces_append(RETVAL, offset_ex(THIS->expolygon, delta, joinType, miterLimit), *THIS);
diff --git a/xs/xsp/my.map b/xs/xsp/my.map
index 2ecff6e3f..54e686ae3 100644
--- a/xs/xsp/my.map
+++ b/xs/xsp/my.map
@@ -211,8 +211,8 @@ FlowRole     T_UV
 PrintStep     T_UV
 PrintObjectStep     T_UV
 SurfaceType     T_UV
-ClipperLib::JoinType		T_UV
-ClipperLib::PolyFillType		T_UV
+Slic3r::ClipperLib::JoinType		T_UV
+Slic3r::ClipperLib::PolyFillType		T_UV
 
 # we return these types whenever we want the items to be cloned
 Points          T_ARRAYREF