diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
index b3eba3b7e2d..820596d5fb7 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/do_intersect.h
@@ -238,8 +238,7 @@ inline bool do_intersect(const General_polygon_with_holes_2<Polygon_>& pgn1,
 template <typename InputIterator, typename Traits>
 inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits,
                          unsigned int k=5,
-                         typename boost::enable_if
-               <typename CGAL::is_iterator<InputIterator>>::type* = 0)
+                         std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0)
 { return r_do_intersect(begin, end, traits, k); }
 
 // Without Traits
@@ -247,8 +246,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end, Traits& traits,
 template <typename InputIterator>
 inline bool do_intersect(InputIterator begin, InputIterator end,
                          Tag_true = Tag_true(), unsigned int k=5,
-                         typename boost::enable_if
-                         <typename CGAL::is_iterator<InputIterator>>::type* = 0,
+                         std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
                          Enable_if_Polygon_2_iterator<InputIterator>* = 0)
 { return r_do_intersect(begin, end, k); }
 
@@ -256,8 +254,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end,
 template <typename InputIterator>
 inline bool do_intersect(InputIterator begin, InputIterator end,
                          Tag_false, unsigned int k=5,
-                         typename boost::enable_if
-                         <typename CGAL::is_iterator<InputIterator>>::type* = 0,
+                         std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
                          Enable_if_Polygon_2_iterator<InputIterator>* = 0)
 {
   typename Iterator_to_gps_traits<InputIterator>::Traits traits;
@@ -268,8 +265,7 @@ inline bool do_intersect(InputIterator begin, InputIterator end,
 template <typename InputIterator>
 inline bool do_intersect(InputIterator begin, InputIterator end,
                          unsigned int k=5,
-                         typename boost::enable_if
-                         <typename CGAL::is_iterator<InputIterator>>::type* = 0,
+                         std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
                          Disable_if_Polygon_2_iterator<InputIterator>* = 0)
 {
   typename Iterator_to_gps_traits<InputIterator>::Traits traits;
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
index 7599c835c5c..f961e507a0e 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/intersection.h
@@ -288,8 +288,7 @@ inline OutputIterator
 intersection(InputIterator begin, InputIterator end,
              OutputIterator oi, unsigned int k=5,
              // workaround to avoid ambiguous calls with kernel functions
-             typename boost::enable_if
-               <typename CGAL::is_iterator<InputIterator>>::type* = 0,
+             std::enable_if_t<CGAL::is_iterator<InputIterator>::value>* = 0,
              Disable_if_Polygon_2_iterator<InputIterator>* = 0)
 {
   typename Iterator_to_gps_traits<InputIterator>::Traits traits;