diff --git a/src/svgfill/src/arrange_polygons.cpp b/src/svgfill/src/arrange_polygons.cpp
index ba8785a267..4ffaa29068 100644
--- a/src/svgfill/src/arrange_polygons.cpp
+++ b/src/svgfill/src/arrange_polygons.cpp
@@ -135,9 +135,9 @@ T take_first_if_single_item(const std::vector<T>& vec) {
 }
 
 template <typename T>
-boost::optional<T> maybe_take_first_if_single_item(const std::vector<T>& vec) {
+std::optional<T> maybe_take_first_if_single_item(const std::vector<T>& vec) {
     if (vec.size() == 0) {
-        return boost::none;
+        return std::nullopt;
     }
     if (true || vec.size() == 1) {
         return vec.front();
@@ -145,9 +145,9 @@ boost::optional<T> maybe_take_first_if_single_item(const std::vector<T>& vec) {
 }
 
 template <typename T>
-boost::optional<Polygon_2> subtract_retain_largest(const T& lhs, const T& rhs) {
+std::optional<Polygon_2> subtract_retain_largest(const T& lhs, const T& rhs) {
     std::vector<Polygon_with_holes_2> result;
-    boost::optional<Polygon_2> mp;
+    std::optional<Polygon_2> mp;
 
     CGAL::difference(lhs, rhs, std::back_inserter(result));
 
@@ -157,12 +157,12 @@ boost::optional<Polygon_2> subtract_retain_largest(const T& lhs, const T& rhs) {
 
     if (result.size() > 0) {
         if (result.front().has_holes()) {
-            return boost::none;
+            return std::nullopt;
         }
         return result.front().outer_boundary();
     }
 
-    return boost::none;
+    return std::nullopt;
 }
 
 Polygon_2 circ_to_poly(typename Arrangement_2::Ccb_halfedge_const_circulator circ)
@@ -607,7 +607,7 @@ void eliminate_overlaps(DebugWriter& debug_writer, double OVERLAP_RESOLUTION_DIS
         {
             std::vector<Polygon_with_holes_2> result;
 
-            boost::optional<Polygon_2> mp1, mp2, mp3, mp4;
+            std::optional<Polygon_2> mp1, mp2, mp3, mp4;
             bool swap = false;
 
             swap = poly1->area() <= poly2->area();
@@ -1410,18 +1410,18 @@ Point_2 project_point_to_line_exact(const Point_2& p, const MergedBoxRecord& box
     return box.exact_start + d * t;
 }
 
-boost::optional<Point_2> intersect_infinite_lines_exact(const MergedBoxRecord& a, const MergedBoxRecord& b) {
+std::optional<Point_2> intersect_infinite_lines_exact(const MergedBoxRecord& a, const MergedBoxRecord& b) {
     if (a.exact_start == a.exact_end || b.exact_start == b.exact_end) {
-        return boost::none;
+        return std::nullopt;
     }
     auto x = CGAL::intersection(CGAL::Line_2<K>(a.exact_start, a.exact_end), CGAL::Line_2<K>(b.exact_start, b.exact_end));
     if (!x) {
-        return boost::none;
+        return std::nullopt;
     }
     if (auto* xp = variant_get<Point_2>(&*x)) {
         return *xp;
     }
-    return boost::none;
+    return std::nullopt;
 }
 
 double point_to_oriented_box_distance(const DPoint& p, const MergedBoxRecord& box) {
@@ -1811,8 +1811,8 @@ void edge_slide(Graph2D<K>& G) {
                     }
 
                     auto incoming = CGAL::Ray_2<K>(other, neighbour - other);
-                    boost::optional<CGAL::Segment_2<K>> closest_neighbouring_segment;
-                    boost::optional<CGAL::Point_2<K>> closest_intersection_point;
+                    std::optional<CGAL::Segment_2<K>> closest_neighbouring_segment;
+                    std::optional<CGAL::Point_2<K>> closest_intersection_point;
                     K::FT sq_distance_along_ray = std::numeric_limits<double>::infinity();
 
                     for (auto vlt = vit->second.begin(); vlt != vit->second.end(); ++vlt) {
@@ -1920,8 +1920,8 @@ std::list<std::pair<Point_2, Point_2>> extend_end_vertices_based_on_input(
                             CGAL::Ray_2<K> ray(incoming, M - incoming);
 
                             // intersect ray with boundary
-                            boost::optional<CGAL::Segment_2<K>> closest_segment;
-                            boost::optional<CGAL::Point_2<K>> closest_intersection_point;
+                            std::optional<CGAL::Segment_2<K>> closest_segment;
+                            std::optional<CGAL::Point_2<K>> closest_intersection_point;
                             K::FT sq_distance_along_ray = std::numeric_limits<double>::infinity();
                             for (auto jt = bnd.edges_begin(); jt != bnd.edges_end(); ++jt) {
                                 const auto& seg = *jt;
@@ -1989,7 +1989,7 @@ std::list<std::pair<Point_2, Point_2>> extend_end_vertices_based_on_input(
                                 
                                 // Loop over boundary segments, and project point onto it, take the closest
                                 K::FT closest_distance = std::numeric_limits<double>::infinity();
-                                boost::optional<CGAL::Point_2<K>> closest_point;
+                                std::optional<CGAL::Point_2<K>> closest_point;
                                 for (auto& poly : outer_perimiter) {
                                     for (auto jt = poly.edges_begin(); jt != poly.edges_end(); ++jt) {
                                         auto seg = *jt;
diff --git a/src/svgfill/src/main.cpp b/src/svgfill/src/main.cpp
index 93ecfb6462..3806209ca0 100644
--- a/src/svgfill/src/main.cpp
+++ b/src/svgfill/src/main.cpp
@@ -21,7 +21,6 @@
 #include "svgfill.h"
 #include "progress.h"
 
-#include <boost/optional.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
@@ -30,12 +29,13 @@
 #include <fstream>
 #include <iostream>
 #include <iterator>
+#include <optional>
 
 int main(int argc, char** argv) {
 	bool valid_command_line = false;
 	bool random_color = false;
 	double eps = 1.e-5;
-	boost::optional<std::string> class_name;
+	std::optional<std::string> class_name;
 	
 	std::vector<std::string> flags;
 	std::vector<std::string> args;
diff --git a/src/svgfill/src/svgfill.cpp b/src/svgfill/src/svgfill.cpp
index cf45881c93..ed1d725766 100644
--- a/src/svgfill/src/svgfill.cpp
+++ b/src/svgfill/src/svgfill.cpp
@@ -48,7 +48,7 @@ private:
 	svgfill::point_2 start_, xy_;
 
 public:
-	boost::optional<std::string> class_name;
+	std::optional<std::string> class_name;
 	std::vector<std::vector<svgfill::line_segment_2>> segments;
 
 	void on_enter_element(tag::element::any)
@@ -59,7 +59,7 @@ public:
 	void on_enter_element(tag::element::g)
 	{
 		++depth_;
-		if (enabled_at_ == -1 && !class_name.is_initialized()) {
+        if (enabled_at_ == -1 && !class_name.has_value()) {
 			enabled_at_ = depth_;
 			segments.emplace_back();
 		}
@@ -78,7 +78,7 @@ public:
 
 	template<class Str>
 	void set(tag::attribute::class_, Str const & s) {
-		if (enabled_at_ == -1 && class_name.is_initialized() && std::string(s.begin(), s.size()).find(*class_name) != std::string::npos) {
+		if (enabled_at_ == -1 && class_name.has_value() && std::string(s.begin(), s.size()).find(*class_name) != std::string::npos) {
 			enabled_at_ = depth_;
 			segments.emplace_back();
 		}
@@ -157,7 +157,7 @@ boost::mpl::fold<
 	boost::mpl::insert<boost::mpl::_1, boost::mpl::_2>
 >::type processed_attributes_t;
 
-bool svgfill::svg_to_line_segments(const std::string& data, const boost::optional<std::string>& class_name, std::vector<std::vector<line_segment_2>>& segments)
+bool svgfill::svg_to_line_segments(const std::string& data, const std::optional<std::string>& class_name, std::vector<std::vector<line_segment_2>>& segments)
 {
 	Context context;
 	context.class_name = class_name;
@@ -187,7 +187,7 @@ bool svgfill::line_segments_to_polygons(solver s, double eps, const std::vector<
 	return line_segments_to_polygons(s, eps, segments, polygons, fn);
 }
 
-bool svgfill::svg_to_polygons(const std::string& data, const boost::optional<std::string>& class_name, std::vector<polygon_2>& polygons) {
+bool svgfill::svg_to_polygons(const std::string& data, const std::optional<std::string>& class_name, std::vector<polygon_2>& polygons) {
 	Context context;
 	context.class_name = class_name;
 	xmlDoc* doc = xmlReadMemory(data.c_str(), data.size(), nullptr, nullptr, 0);
diff --git a/src/svgfill/src/svgfill.h b/src/svgfill/src/svgfill.h
index 2588636a8d..e7b9028d00 100644
--- a/src/svgfill/src/svgfill.h
+++ b/src/svgfill/src/svgfill.h
@@ -35,10 +35,11 @@
 #define SVGFILL_API
 #endif
 
-#include <boost/optional.hpp>
-
 #include <array>
+#include <string>
 #include <vector>
+#include <optional>
+#include <functional>
 
 namespace svgfill {
 	typedef std::array<double, 2> point_2;
@@ -109,12 +110,12 @@ namespace svgfill {
 		}
 	};
 
-	SVGFILL_API bool svg_to_line_segments(const std::string& data, const boost::optional<std::string>& class_name, std::vector<std::vector<line_segment_2>>& segments);
+	SVGFILL_API bool svg_to_line_segments(const std::string& data, const std::optional<std::string>& class_name, std::vector<std::vector<line_segment_2>>& segments);
 	SVGFILL_API bool line_segments_to_polygons(solver s, double eps, const std::vector<std::vector<line_segment_2>>& segments, std::vector<std::vector<polygon_2>>& polygons);
 	SVGFILL_API bool line_segments_to_polygons(solver s, double eps, const std::vector<std::vector<line_segment_2>>& segments, std::vector<std::vector<polygon_2>>& polygons, std::function<void(float)>& progress);
 	SVGFILL_API std::string polygons_to_svg(const std::vector<std::vector<polygon_2>>& polygons, bool random_color=false);
 	SVGFILL_API std::string polygons_to_svg(const std::vector<polygon_2>& polygons, bool random_color = false);
-	SVGFILL_API bool svg_to_polygons(const std::string& data, const boost::optional<std::string>& class_name, std::vector<polygon_2>& polygons);
+    SVGFILL_API bool svg_to_polygons(const std::string& data, const std::optional<std::string>& class_name, std::vector<polygon_2>& polygons);
 
 	struct SVGFILL_API arrange_polygon_settings {
         bool debug_output = false;