diff --git a/xs/MANIFEST b/xs/MANIFEST
index a803710ff..d17ec8ac8 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -1,40 +1,68 @@
 Build.PL
-buildtmp/main.xs
-buildtmp/typemap
-buildtmp/XS.c
-buildtmp/XS.o
 lib/Slic3r/XS.pm
 MANIFEST			This list of files
 src/admesh/connect.c
-src/admesh/connect.o
 src/admesh/normals.c
-src/admesh/normals.o
 src/admesh/shared.c
-src/admesh/shared.o
 src/admesh/stl.h
 src/admesh/stl_io.c
-src/admesh/stl_io.o
 src/admesh/stlinit.c
-src/admesh/stlinit.o
 src/admesh/util.c
-src/admesh/util.o
+src/clipper.cpp
+src/clipper.hpp
+src/ClipperUtils.cpp
+src/ClipperUtils.hpp
+src/ExPolygon.cpp
 src/ExPolygon.hpp
+src/ExPolygonCollection.cpp
+src/ExPolygonCollection.hpp
+src/ExtrusionEntity.cpp
+src/ExtrusionEntity.hpp
+src/ExtrusionEntityCollection.hpp
+src/Line.cpp
+src/Line.hpp
+src/MultiPoint.cpp
+src/MultiPoint.hpp
 src/myinit.h
+src/Point.cpp
 src/Point.hpp
+src/Polygon.cpp
+src/Polygon.hpp
+src/Polyline.cpp
+src/Polyline.hpp
 src/ppport.h
+src/Surface.hpp
+src/SurfaceCollection.hpp
 src/TriangleMesh.cpp
 src/TriangleMesh.hpp
-src/TriangleMesh.o
 src/ZTable.hpp
 t/01_trianglemesh.t
 t/02_object.t
 t/03_point.t
 t/04_expolygon.t
+t/05_surface.t
+t/06_polygon.t
+t/07_extrusionpath.t
+t/08_extrusionloop.t
+t/09_polyline.t
+t/10_line.t
+t/11_clipper.t
+t/12_extrusionpathcollection.t
+xsp/Clipper.xsp
 xsp/ExPolygon.xsp
+xsp/ExPolygonCollection.xsp
+xsp/ExtrusionEntityCollection.xsp
+xsp/ExtrusionLoop.xsp
+xsp/ExtrusionPath.xsp
+xsp/Line.xsp
 xsp/my.map
 xsp/mytype.map
 xsp/Object.xsp
 xsp/Point.xsp
+xsp/Polygon.xsp
+xsp/Polyline.xsp
+xsp/Surface.xsp
+xsp/SurfaceCollection.xsp
 xsp/TriangleMesh.xsp
 xsp/typemap.xspt
 xsp/XS.xsp
diff --git a/xs/MANIFEST.SKIP b/xs/MANIFEST.SKIP
new file mode 100644
index 000000000..0123bf375
--- /dev/null
+++ b/xs/MANIFEST.SKIP
@@ -0,0 +1,73 @@
+
+#!start included /Library/Perl/Updates/5.12.4/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$         # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
+~$
+\.old$
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+ 
+# Avoid MYMETA files
+^MYMETA\.
+#!end included /Library/Perl/Updates/5.12.4/ExtUtils/MANIFEST.SKIP
+
+# Avoid configuration metadata file
+^MYMETA\.
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\bBuild.bat$
+\b_build
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+^MANIFEST\.SKIP
+
+# Avoid archives of this distribution
+\bSlic3r-XS-[\d\.\_]+
diff --git a/xs/MANIFEST.SKIP.bak b/xs/MANIFEST.SKIP.bak
deleted file mode 100644
index 87d34ec10..000000000
--- a/xs/MANIFEST.SKIP.bak
+++ /dev/null
@@ -1,15 +0,0 @@
-#!include_default
-# Avoid configuration metadata file
-^MYMETA\.
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\bBuild.bat$
-\b_build
-\bBuild.COM$
-\bBUILD.COM$
-\bbuild.com$
-^MANIFEST\.SKIP
-
-# Avoid archives of this distribution
-\bSlic3r-XS-[\d\.\_]+