diff --git a/src/libslic3r/ExtrusionEntity.hpp b/src/libslic3r/ExtrusionEntity.hpp
index 1553d40b6e..d7c9367ef5 100644
--- a/src/libslic3r/ExtrusionEntity.hpp
+++ b/src/libslic3r/ExtrusionEntity.hpp
@@ -63,8 +63,10 @@ class ExtrusionEntityReference final
 {
 public:
     ExtrusionEntityReference() = delete;
-    ExtrusionEntityReference(const ExtrusionEntity &extrusion_entity, bool flipped) : m_extrusion_entity(&extrusion_entity), m_flipped(flipped) {}
-    ExtrusionEntityReference operator=(const ExtrusionEntityReference &rhs) { m_extrusion_entity = rhs.m_extrusion_entity; m_flipped = rhs.m_flipped; }
+    ExtrusionEntityReference(const ExtrusionEntity &extrusion_entity, bool flipped) : 
+        m_extrusion_entity(&extrusion_entity), m_flipped(flipped) {}
+    ExtrusionEntityReference operator=(const ExtrusionEntityReference &rhs) 
+        { m_extrusion_entity = rhs.m_extrusion_entity; m_flipped = rhs.m_flipped; return *this; }
 
     const ExtrusionEntity& extrusion_entity() const { return *m_extrusion_entity; }
     template<typename Type>
diff --git a/src/libslic3r/Geometry/Circle.hpp b/src/libslic3r/Geometry/Circle.hpp
index 7b85916f5a..c05263fe08 100644
--- a/src/libslic3r/Geometry/Circle.hpp
+++ b/src/libslic3r/Geometry/Circle.hpp
@@ -11,7 +11,7 @@ namespace Slic3r { namespace Geometry {
 // Circumcenter coordinates, Cartesian coordinates
 // In case the three points are collinear, returns their centroid.
 template<typename Derived, typename Derived2, typename Derived3>
-Eigen::Matrix<typename Derived::Scalar, 2, 1, Eigen::DontAlign> circle_center(const Derived &a, const Derived2 &bsrc, const Derived3 &csrc, typename typename Derived::Scalar epsilon)
+Eigen::Matrix<typename Derived::Scalar, 2, 1, Eigen::DontAlign> circle_center(const Derived &a, const Derived2 &bsrc, const Derived3 &csrc, typename Derived::Scalar epsilon)
 {
     static_assert(Derived ::IsVectorAtCompileTime && int(Derived ::SizeAtCompileTime) == 2, "circle_center(): 1st point is not a 2D vector");
     static_assert(Derived2::IsVectorAtCompileTime && int(Derived2::SizeAtCompileTime) == 2, "circle_center(): 2nd point is not a 2D vector");
diff --git a/src/libslic3r/MultiPoint.hpp b/src/libslic3r/MultiPoint.hpp
index ece2ce2d90..3c750af752 100644
--- a/src/libslic3r/MultiPoint.hpp
+++ b/src/libslic3r/MultiPoint.hpp
@@ -19,7 +19,6 @@ inline OutputIterator douglas_peucker(InputIterator begin, InputIterator end, Ou
 {
     using InputIteratorCategory = typename std::iterator_traits<InputIterator>::iterator_category;
     static_assert(std::is_base_of_v<std::input_iterator_tag, InputIteratorCategory>);
-    using Point  = typename InputIterator::value_type;
     using Vector = Eigen::Matrix<SquareLengthType, 2, 1, Eigen::DontAlign>;
     if (begin != end) {
         // Supporting in-place reduction and the data type may be generic, thus we are always making a copy of the point value before there is a chance