diff --git a/xs/MANIFEST b/xs/MANIFEST
index a14d989ce..ce172ec0d 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -381,6 +381,11 @@ src/libslic3r/GCode/PressureEqualizer.cpp
 src/libslic3r/GCode/PressureEqualizer.hpp
 src/libslic3r/GCode/SpiralVase.cpp
 src/libslic3r/GCode/SpiralVase.hpp
+src/libslic3r/GCode/ToolOrdering.cpp
+src/libslic3r/GCode/ToolOrdering.hpp
+src/libslic3r/GCode/WipeTower.hpp
+src/libslic3r/GCode/WipeTowerPrusaMM.cpp
+src/libslic3r/GCode/WipeTowerPrusaMM.hpp
 src/libslic3r/Geometry.cpp
 src/libslic3r/Geometry.hpp
 src/libslic3r/Layer.cpp
@@ -430,8 +435,6 @@ src/libslic3r/TriangleMesh.cpp
 src/libslic3r/TriangleMesh.hpp
 src/libslic3r/utils.cpp
 src/libslic3r/Utils.hpp
-src/libslic3r/WipeTower.cpp
-src/libslic3r/WipeTower.hpp
 src/perlglue.cpp
 src/poly2tri/common/shapes.cc
 src/poly2tri/common/shapes.h
diff --git a/xs/src/libslic3r/GCode/CoolingBuffer.cpp b/xs/src/libslic3r/GCode/CoolingBuffer.cpp
index 7de2a49c0..0ddc6a75d 100644
--- a/xs/src/libslic3r/GCode/CoolingBuffer.cpp
+++ b/xs/src/libslic3r/GCode/CoolingBuffer.cpp
@@ -9,7 +9,7 @@ namespace Slic3r {
 std::string CoolingBuffer::append(const std::string &gcode, size_t object_id, size_t layer_id, bool is_support)
 {
     std::string out;
-    size_t signature = object_id * 2 + is_support ? 1 : 0;
+    size_t signature = object_id * 2 + (is_support ? 1 : 0);
     if (m_object_ids_visited.find(signature) != m_object_ids_visited.end())
         // For a single print_z, a combination of (object_id, is_support) could repeat once only.
         // If the combination of (object_id, is_support) reappears, this must be for another print_z,
diff --git a/xs/src/libslic3r/SupportMaterial.cpp b/xs/src/libslic3r/SupportMaterial.cpp
index e36eb4cdb..c1bb841c0 100644
--- a/xs/src/libslic3r/SupportMaterial.cpp
+++ b/xs/src/libslic3r/SupportMaterial.cpp
@@ -2322,7 +2322,7 @@ void modulate_extrusion_by_overlapping_layers(
                 (fragment_end.is_start ? &polyline.points.front() : &polyline.points.back());
         }
     private:
-        ExtrusionPathFragmentEndPointAccessor& operator=(const ExtrusionPathFragmentEndPointAccessor&) {}
+        ExtrusionPathFragmentEndPointAccessor& operator=(const ExtrusionPathFragmentEndPointAccessor&);
         const std::vector<ExtrusionPathFragment> &m_path_fragments;
     };
     const coord_t search_radius = 7;