diff --git a/test/algorithms/distance/distance_brute_force.hpp b/test/algorithms/distance/distance_brute_force.hpp
index 82d0015b8..1e5b8b998 100644
--- a/test/algorithms/distance/distance_brute_force.hpp
+++ b/test/algorithms/distance/distance_brute_force.hpp
@@ -1,10 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2014, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2014-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -16,7 +17,9 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/or.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/value_type.hpp>
 
 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/tag.hpp>
diff --git a/test/algorithms/distance/distance_geo_linear_box.cpp b/test/algorithms/distance/distance_geo_linear_box.cpp
index 4b6aacf30..0d22b5eb4 100644
--- a/test/algorithms/distance/distance_geo_linear_box.cpp
+++ b/test/algorithms/distance/distance_geo_linear_box.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_areal
 #endif
 
-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/test/included/unit_test.hpp>
diff --git a/test/algorithms/distance/distance_se_geo_ar_ar.cpp b/test/algorithms/distance/distance_se_geo_ar_ar.cpp
index 4e25d7eac..d00517ddc 100644
--- a/test/algorithms/distance/distance_se_geo_ar_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_ar_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -12,7 +13,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_areal_areal
 #endif
 
-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/test/included/unit_test.hpp>
diff --git a/test/algorithms/distance/distance_se_geo_l_ar.cpp b/test/algorithms/distance/distance_se_geo_l_ar.cpp
index ae332a0da..a3263ea71 100644
--- a/test/algorithms/distance/distance_se_geo_l_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_l_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2017, 2018 Oracle and/or its affiliates.
+// Copyright (c) 2017-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_areal
 #endif
 
-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/test/included/unit_test.hpp>
diff --git a/test/algorithms/distance/distance_se_geo_l_l.cpp b/test/algorithms/distance/distance_se_geo_l_l.cpp
index f287f5264..9ab18ebd5 100644
--- a/test/algorithms/distance/distance_se_geo_l_l.cpp
+++ b/test/algorithms/distance/distance_se_geo_l_l.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2018 Oracle and/or its affiliates.
+// Copyright (c) 2018-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_linear_linear
 #endif
 
-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/test/included/unit_test.hpp>
diff --git a/test/algorithms/distance/distance_se_geo_pl_ar.cpp b/test/algorithms/distance/distance_se_geo_pl_ar.cpp
index 3a9d5f277..e51b4b7cf 100644
--- a/test/algorithms/distance/distance_se_geo_pl_ar.cpp
+++ b/test/algorithms/distance/distance_se_geo_pl_ar.cpp
@@ -1,9 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2017-2018, Oracle and/or its affiliates.
+// Copyright (c) 2017-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -14,7 +15,6 @@
 #define BOOST_TEST_MODULE test_distance_geographic_pointlike_areal
 #endif
 
-#include <boost/range.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/test/included/unit_test.hpp>
diff --git a/test/algorithms/distance/distance_se_pl_pl.cpp b/test/algorithms/distance/distance_se_pl_pl.cpp
index 56c0a6e46..f06bd9a2e 100644
--- a/test/algorithms/distance/distance_se_pl_pl.cpp
+++ b/test/algorithms/distance/distance_se_pl_pl.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2014-2018, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
@@ -16,8 +16,6 @@
 #define BOOST_TEST_MODULE test_distance_spherical_equatorial_pointlike_pointlike
 #endif
 
-#include <boost/range.hpp>
-
 #include <boost/test/included/unit_test.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test/algorithms/set_operations/check_turn_less.hpp b/test/algorithms/set_operations/check_turn_less.hpp
index 147342a22..88f25ce23 100644
--- a/test/algorithms/set_operations/check_turn_less.hpp
+++ b/test/algorithms/set_operations/check_turn_less.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2015, 2019, Oracle and/or its affiliates.
+// Copyright (c) 2015-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -11,7 +11,9 @@
 #ifndef BOOST_GEOMETRY_TEST_CHECK_TURN_LESS_HPP
 #define BOOST_GEOMETRY_TEST_CHECK_TURN_LESS_HPP
 
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
 
 #include "test_set_ops_linear_linear.hpp"
 
diff --git a/test/algorithms/set_operations/difference/test_difference.hpp b/test/algorithms/set_operations/difference/test_difference.hpp
index fdbd7d797..3c9ce08a5 100644
--- a/test/algorithms/set_operations/difference/test_difference.hpp
+++ b/test/algorithms/set_operations/difference/test_difference.hpp
@@ -4,8 +4,8 @@
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2016, 2017, 2019.
-// Modifications copyright (c) 2016-2019, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2020.
+// Modifications copyright (c) 2016-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -28,6 +28,7 @@
 #include <boost/foreach.hpp>
 
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/size.hpp>
 
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/difference.hpp>
diff --git a/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp b/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
index 14f6b039a..36e5459d7 100644
--- a/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/difference/test_difference_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -13,6 +13,8 @@
 
 #include <limits>
 
+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include "../check_turn_less.hpp"
diff --git a/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp b/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp
index c83c794c0..9a648f996 100644
--- a/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp
+++ b/test/algorithms/set_operations/intersection/intersection_areal_areal_linear.cpp
@@ -1,13 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit test
 
-// Copyright (c) 2015, Oracle and/or its affiliates.
+// Copyright (c) 2015-2020, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
 
-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
-
 #ifndef BOOST_TEST_MODULE
 #define BOOST_TEST_MODULE test_intersection_linear_linear_areal
 #endif
@@ -19,8 +20,6 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/multi_linestring.hpp>
 #include <boost/geometry/geometries/ring.hpp>
diff --git a/test/algorithms/set_operations/intersection/test_intersection.hpp b/test/algorithms/set_operations/intersection/test_intersection.hpp
index 49c8aa4b0..12071d1b6 100644
--- a/test/algorithms/set_operations/intersection/test_intersection.hpp
+++ b/test/algorithms/set_operations/intersection/test_intersection.hpp
@@ -3,8 +3,8 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2016, 2017.
-// Modifications copyright (c) 2016-2017, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2016-2020.
+// Modifications copyright (c) 2016-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -18,6 +18,7 @@
 #include <iomanip>
 
 #include <boost/foreach.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/variant/variant.hpp>
 
 #include <boost/geometry/algorithms/intersection.hpp>
diff --git a/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp b/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
index f916b023c..0b47c4f75 100644
--- a/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
+++ b/test/algorithms/set_operations/intersection/test_intersection_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -13,6 +13,7 @@
 
 #include <limits>
 
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/geometry/geometry.hpp>
diff --git a/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp b/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
index 843345247..c850df8df 100644
--- a/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
+++ b/test/algorithms/set_operations/sym_difference/test_sym_difference_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -13,6 +13,8 @@
 
 #include <limits>
 
+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include <from_wkt.hpp>
diff --git a/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp b/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
index 3fdc3a575..73253c3ac 100644
--- a/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
+++ b/test/algorithms/set_operations/test_get_turns_ll_invariance.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, 2019, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -13,6 +13,10 @@
 
 #include <vector>
 
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
+
 #include <boost/geometry/algorithms/reverse.hpp>
 
 #include <boost/geometry/algorithms/detail/signed_size_type.hpp>
diff --git a/test/algorithms/set_operations/test_set_ops_linear_linear.hpp b/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
index a8749b42b..d9bf57c2c 100644
--- a/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
+++ b/test/algorithms/set_operations/test_set_ops_linear_linear.hpp
@@ -1,12 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2015, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
 
-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
-
 #ifndef BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
 #define BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
 
@@ -17,7 +18,11 @@
 #include <algorithm>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator.hpp>
+#include <boost/range/size.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/policies/compare.hpp>
diff --git a/test/algorithms/set_operations/test_set_ops_pointlike.hpp b/test/algorithms/set_operations/test_set_ops_pointlike.hpp
index 6908aa552..1cbe5de84 100644
--- a/test/algorithms/set_operations/test_set_ops_pointlike.hpp
+++ b/test/algorithms/set_operations/test_set_ops_pointlike.hpp
@@ -22,6 +22,9 @@ namespace bg = ::boost::geometry;
 #include <algorithm>
 #include <fstream>
 #include <boost/core/ignore_unused.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
 #include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/policies/compare.hpp>
diff --git a/test/algorithms/set_operations/union/test_union.hpp b/test/algorithms/set_operations/union/test_union.hpp
index 5d762e2b5..e17012265 100644
--- a/test/algorithms/set_operations/union/test_union.hpp
+++ b/test/algorithms/set_operations/union/test_union.hpp
@@ -3,8 +3,8 @@
 
 // Copyright (c) 2007-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2015, 2016, 2017.
-// Modifications copyright (c) 2015-2017 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2015-2020.
+// Modifications copyright (c) 2015-2020 Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -26,6 +26,9 @@
 #include <boost/core/ignore_unused.hpp>
 #include <boost/foreach.hpp>
 #include <boost/range/algorithm/copy.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator.hpp>
 
 #include <boost/geometry/algorithms/union.hpp>
 
diff --git a/test/algorithms/set_operations/union/test_union_linear_linear.hpp b/test/algorithms/set_operations/union/test_union_linear_linear.hpp
index e4357b603..8f09dc1c5 100644
--- a/test/algorithms/set_operations/union/test_union_linear_linear.hpp
+++ b/test/algorithms/set_operations/union/test_union_linear_linear.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -13,6 +13,8 @@
 
 #include <limits>
 
+#include <boost/range/value_type.hpp>
+
 #include <boost/geometry/geometry.hpp>
 #include "../test_set_ops_linear_linear.hpp"
 #include <from_wkt.hpp>
diff --git a/test/algorithms/test_is_valid.hpp b/test/algorithms/test_is_valid.hpp
index df0be5b81..0b5f2aed5 100644
--- a/test/algorithms/test_is_valid.hpp
+++ b/test/algorithms/test_is_valid.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2014-2017, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -17,7 +17,10 @@
 #include <string>
 
 #include <boost/core/ignore_unused.hpp>
-#include <boost/range.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/size.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/variant/variant.hpp>
 
 #include <boost/geometry/core/closure.hpp>
diff --git a/test/geometries/initialization.cpp b/test/geometries/initialization.cpp
index 23dd11f52..c71ae302b 100644
--- a/test/geometries/initialization.cpp
+++ b/test/geometries/initialization.cpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2014-2015 Adam Wulkiewicz, Lodz, Poland.
 
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -10,7 +14,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/assign.hpp>
-#include <boost/range.hpp>
+#include <boost/range/size.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
diff --git a/test/test_geometries/all_custom_linestring.hpp b/test/test_geometries/all_custom_linestring.hpp
index 133fb29a2..a2a3c4a12 100644
--- a/test/test_geometries/all_custom_linestring.hpp
+++ b/test/test_geometries/all_custom_linestring.hpp
@@ -2,6 +2,11 @@
 // Unit Test
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -11,9 +16,6 @@
 
 #include <cstddef>
 
-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
diff --git a/test/test_geometries/all_custom_polygon.hpp b/test/test_geometries/all_custom_polygon.hpp
index 1ce9286eb..7e385f971 100644
--- a/test/test_geometries/all_custom_polygon.hpp
+++ b/test/test_geometries/all_custom_polygon.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -12,9 +16,6 @@
 
 #include <cstddef>
 
-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
diff --git a/test/test_geometries/all_custom_ring.hpp b/test/test_geometries/all_custom_ring.hpp
index aa1d37cfe..e49acea9b 100644
--- a/test/test_geometries/all_custom_ring.hpp
+++ b/test/test_geometries/all_custom_ring.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -12,9 +16,6 @@
 
 #include <cstddef>
 
-#include <boost/range.hpp>
-
-
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
diff --git a/test/test_geometries/wrapped_boost_array.hpp b/test/test_geometries/wrapped_boost_array.hpp
index 8f4d8e39b..9dc723589 100644
--- a/test/test_geometries/wrapped_boost_array.hpp
+++ b/test/test_geometries/wrapped_boost_array.hpp
@@ -3,6 +3,10 @@
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2020.
+// Modifications copyright (c) 2020 Oracle and/or its affiliates.
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -14,7 +18,7 @@
 #include <cstddef>
 
 #include <boost/array.hpp>
-#include <boost/range.hpp>
+#include <boost/range/iterator.hpp>
 
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag.hpp>