diff --git a/xs/lib/Slic3r/XS.pm b/xs/lib/Slic3r/XS.pm
index 8131fb6f1..c504fac16 100644
--- a/xs/lib/Slic3r/XS.pm
+++ b/xs/lib/Slic3r/XS.pm
@@ -181,14 +181,21 @@ use overload
 package main;
 for my $class (qw(
         Slic3r::Config
+        Slic3r::Config::Full
         Slic3r::Config::Print
+        Slic3r::Config::PrintObject
         Slic3r::Config::PrintRegion
         Slic3r::ExPolygon
+        Slic3r::ExPolygon::Collection
+        Slic3r::Extruder
         Slic3r::ExtrusionLoop
         Slic3r::ExtrusionPath
         Slic3r::ExtrusionPath::Collection
-        Slic3r::Geometry::BoundingBoxf3
+        Slic3r::Flow
         Slic3r::GCode::PlaceholderParser
+        Slic3r::Geometry::BoundingBox
+        Slic3r::Geometry::BoundingBoxf
+        Slic3r::Geometry::BoundingBoxf3
         Slic3r::Layer
         Slic3r::Layer::Region
         Slic3r::Layer::Support
@@ -204,10 +211,13 @@ for my $class (qw(
         Slic3r::Pointf3
         Slic3r::Polygon
         Slic3r::Polyline
+        Slic3r::Polyline::Collection
         Slic3r::Print
         Slic3r::Print::Object
         Slic3r::Print::Region
+        Slic3r::Print::State
         Slic3r::Surface
+        Slic3r::Surface::Collection
         Slic3r::TriangleMesh
     ))
 {
diff --git a/xs/xsp/typemap.xspt b/xs/xsp/typemap.xspt
index 4ade7182a..c3577f451 100644
--- a/xs/xsp/typemap.xspt
+++ b/xs/xsp/typemap.xspt
@@ -79,22 +79,17 @@
 %typemap{Clone<PrintState>}{simple};
 %typemap{PrintRegion*};
 %typemap{Ref<PrintRegion>}{simple};
-%typemap{Clone<PrintRegion>}{simple};
 %typemap{PrintObject*};
 %typemap{Ref<PrintObject>}{simple};
-%typemap{Clone<PrintObject>}{simple};
 %typemap{Print*};
 %typemap{Ref<Print>}{simple};
 %typemap{Clone<Print>}{simple};
 %typemap{LayerRegion*};
 %typemap{Ref<LayerRegion>}{simple};
-%typemap{Clone<LayerRegion>}{simple};
 %typemap{Layer*};
 %typemap{Ref<Layer>}{simple};
-%typemap{Clone<Layer>}{simple};
 %typemap{SupportLayer*};
 %typemap{Ref<SupportLayer>}{simple};
-%typemap{Clone<SupportLayer>}{simple};
 %typemap{PlaceholderParser*};
 %typemap{Ref<PlaceholderParser>}{simple};
 %typemap{Clone<PlaceholderParser>}{simple};