diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
index 203d10f5f..b6fdecb73 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
@@ -18,9 +18,9 @@ OBSOLETE
 #include <boost/geometry/multi/multi.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
+#include <boost/geometry/io/svg/write_svg_multi.hpp>
 
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 
 
 static const int wkt_countries_count = 1;
diff --git a/doc/src/examples/algorithms/create_svg_overlay.hpp b/doc/src/examples/algorithms/create_svg_overlay.hpp
index d9bc73f5e..53d81d6d6 100644
--- a/doc/src/examples/algorithms/create_svg_overlay.hpp
+++ b/doc/src/examples/algorithms/create_svg_overlay.hpp
@@ -17,7 +17,7 @@
 #include <boost/algorithm/string.hpp>
 
 #if defined(HAVE_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 template <typename Geometry, typename Range>
diff --git a/doc/src/examples/algorithms/create_svg_two.hpp b/doc/src/examples/algorithms/create_svg_two.hpp
index 84526fdca..6dbdb60d9 100644
--- a/doc/src/examples/algorithms/create_svg_two.hpp
+++ b/doc/src/examples/algorithms/create_svg_two.hpp
@@ -15,7 +15,7 @@
 #include <boost/algorithm/string.hpp>
 
 #if defined(HAVE_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 template <typename Geometry1, typename Geometry2>
diff --git a/example/05_a_overlay_polygon_example.cpp b/example/05_a_overlay_polygon_example.cpp
index 97682eec0..26fdd1e1e 100644
--- a/example/05_a_overlay_polygon_example.cpp
+++ b/example/05_a_overlay_polygon_example.cpp
@@ -24,7 +24,7 @@
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
 #if defined(HAVE_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
diff --git a/example/05_b_overlay_linestring_polygon_example.cpp b/example/05_b_overlay_linestring_polygon_example.cpp
index be5170f24..49e54b443 100644
--- a/example/05_b_overlay_linestring_polygon_example.cpp
+++ b/example/05_b_overlay_linestring_polygon_example.cpp
@@ -29,7 +29,7 @@
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
 #if defined(HAVE_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian);
diff --git a/example/06_b_transformation_example.cpp b/example/06_b_transformation_example.cpp
index a406f6099..5dd972548 100644
--- a/example/06_b_transformation_example.cpp
+++ b/example/06_b_transformation_example.cpp
@@ -24,7 +24,7 @@
 #include <boost/geometry/io/wkt/read.hpp>
 
 #if defined(HAVE_SVG)
-#  include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#  include <boost/geometry/io/svg/write_svg.hpp>
 #endif
 
 #include <boost/bind.hpp>
diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp
index 1c3e59d32..735d2dfa7 100644
--- a/example/07_a_graph_route_example.cpp
+++ b/example/07_a_graph_route_example.cpp
@@ -28,17 +28,15 @@
 #include <boost/geometry/io/wkt/read.hpp>
 
 
+// For output:
+#include <boost/geometry/io/svg/svg_mapper.hpp>
+
+// Yes, this example currently uses an extension:
+
+// For distance-calculations over the Earth:
+//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
 // Yes, this example currently uses some extensions:
 
-    // For output:
-    #if defined(HAVE_SVG)
-    #  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
-    #endif
-
-    // For distance-calculations over the Earth:
-    //#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
-
-
 
 // Read an ASCII file containing WKT's, fill a vector of tuples
 // The tuples consist of at least <0> a geometry and <1> an identifying string
diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp
index 0886883d8..843a84e6f 100644
--- a/example/07_b_graph_route_example.cpp
+++ b/example/07_b_graph_route_example.cpp
@@ -31,16 +31,13 @@
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/io/wkt/read.hpp>
 
+// For output:
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 
-// Yes, this example currently uses some extensions:
+// Yes, this example currently uses an extension:
 
-    // For output:
-    #if defined(HAVE_SVG)
-    #  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
-    #endif
-
-    // For distance-calculations over the Earth:
-    //#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
+// For distance-calculations over the Earth:
+//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
 
 
 
diff --git a/example_extensions/gis/projections/p03_projmap_example.cpp b/example_extensions/gis/projections/p03_projmap_example.cpp
index b3d628eae..2d81b7732 100644
--- a/example_extensions/gis/projections/p03_projmap_example.cpp
+++ b/example_extensions/gis/projections/p03_projmap_example.cpp
@@ -15,7 +15,7 @@
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 #include <boost/geometry/extensions/gis/projections/project_transformer.hpp>
 
diff --git a/example_extensions/gis/projections/p04_example.cpp b/example_extensions/gis/projections/p04_example.cpp
index fcb1bae40..4ad0b1603 100644
--- a/example_extensions/gis/projections/p04_example.cpp
+++ b/example_extensions/gis/projections/p04_example.cpp
@@ -17,7 +17,7 @@
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 
 #include <boost/geometry/extensions/gis/projections/parameters.hpp>
diff --git a/example_extensions/gis/projections/p05_example.cpp b/example_extensions/gis/projections/p05_example.cpp
index a9214f9ff..35d9cd63f 100644
--- a/example_extensions/gis/projections/p05_example.cpp
+++ b/example_extensions/gis/projections/p05_example.cpp
@@ -16,7 +16,7 @@
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 
 #include <boost/geometry/extensions/gis/projections/parameters.hpp>
diff --git a/include/boost/geometry/geometry.hpp b/include/boost/geometry/geometry.hpp
index b696b652c..dce17e260 100644
--- a/include/boost/geometry/geometry.hpp
+++ b/include/boost/geometry/geometry.hpp
@@ -87,5 +87,6 @@
 #include <boost/geometry/views/segment_view.hpp>
 
 #include <boost/geometry/io/io.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 
 #endif // BOOST_GEOMETRY_GEOMETRY_HPP
diff --git a/include/boost/geometry/extensions/io/svg/svg_mapper.hpp b/include/boost/geometry/io/svg/svg_mapper.hpp
similarity index 99%
rename from include/boost/geometry/extensions/io/svg/svg_mapper.hpp
rename to include/boost/geometry/io/svg/svg_mapper.hpp
index de96796a5..40aa6561b 100644
--- a/include/boost/geometry/extensions/io/svg/svg_mapper.hpp
+++ b/include/boost/geometry/io/svg/svg_mapper.hpp
@@ -41,7 +41,7 @@
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
 
 // Helper geometries (all points are transformed to integer-points)
 #include <boost/geometry/geometries/geometries.hpp>
diff --git a/include/boost/geometry/extensions/io/svg/write_svg.hpp b/include/boost/geometry/io/svg/write_svg.hpp
similarity index 100%
rename from include/boost/geometry/extensions/io/svg/write_svg.hpp
rename to include/boost/geometry/io/svg/write_svg.hpp
diff --git a/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp b/include/boost/geometry/io/svg/write_svg_multi.hpp
similarity index 96%
rename from include/boost/geometry/extensions/io/svg/write_svg_multi.hpp
rename to include/boost/geometry/io/svg/write_svg_multi.hpp
index 3ca2c62a0..a794120c0 100644
--- a/include/boost/geometry/extensions/io/svg/write_svg_multi.hpp
+++ b/include/boost/geometry/io/svg/write_svg_multi.hpp
@@ -13,7 +13,7 @@
 #define BOOST_GEOMETRY_IO_SVG_WRITE_SVG_MULTI_HPP
 
 
-#include <boost/geometry/extensions/io/svg/write_svg.hpp>
+#include <boost/geometry/io/svg/write_svg.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/test/algorithms/detail/partition.cpp b/test/algorithms/detail/partition.cpp
index 74efb1530..4bf75529b 100644
--- a/test/algorithms/detail/partition.cpp
+++ b/test/algorithms/detail/partition.cpp
@@ -21,7 +21,7 @@
 #include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 #if defined(TEST_WITH_SVG)
-# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+# include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 #include <boost/random/linear_congruential.hpp>
diff --git a/test/algorithms/detail/sections/sectionalize.cpp b/test/algorithms/detail/sections/sectionalize.cpp
index 531a30128..762190704 100644
--- a/test/algorithms/detail/sections/sectionalize.cpp
+++ b/test/algorithms/detail/sections/sectionalize.cpp
@@ -30,7 +30,7 @@
 #include <test_common/test_point.hpp>
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #  include <boost/geometry/algorithms/buffer.hpp>
 #  include <boost/geometry/algorithms/centroid.hpp>
 #endif
diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp
index 667e03d1b..f63e3b5ac 100644
--- a/test/algorithms/overlay/assemble.cpp
+++ b/test/algorithms/overlay/assemble.cpp
@@ -34,7 +34,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 template <typename Geometry>
diff --git a/test/algorithms/overlay/ccw_traverse.cpp b/test/algorithms/overlay/ccw_traverse.cpp
index dc7f73400..bc7341b18 100644
--- a/test/algorithms/overlay/ccw_traverse.cpp
+++ b/test/algorithms/overlay/ccw_traverse.cpp
@@ -21,7 +21,7 @@
 #include <boost/geometry/io/wkt/wkt.hpp>
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
diff --git a/test/algorithms/overlay/dissolver.cpp b/test/algorithms/overlay/dissolver.cpp
index 2a8451e0b..41f4c60f7 100644
--- a/test/algorithms/overlay/dissolver.cpp
+++ b/test/algorithms/overlay/dissolver.cpp
@@ -20,7 +20,6 @@
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/multi/io/wkt/read.hpp>
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
 
 
 #include <test_common/test_point.hpp>
@@ -28,7 +27,8 @@
 
 //#define TEST_WITH_SVG
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/write_svg_multi.hpp>
 #endif
 
 // Collection might be a multi-geometry, or std::vector<ring>
diff --git a/test/algorithms/overlay/enrich_intersection_points.cpp b/test/algorithms/overlay/enrich_intersection_points.cpp
index 07068ea18..5c37a4be5 100644
--- a/test/algorithms/overlay/enrich_intersection_points.cpp
+++ b/test/algorithms/overlay/enrich_intersection_points.cpp
@@ -32,7 +32,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 struct test_enrich_intersection_points
diff --git a/test/algorithms/overlay/get_turn_info.cpp b/test/algorithms/overlay/get_turn_info.cpp
index 476e719e4..979252e4d 100644
--- a/test/algorithms/overlay/get_turn_info.cpp
+++ b/test/algorithms/overlay/get_turn_info.cpp
@@ -21,7 +21,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/algorithms/overlay/get_turns.cpp b/test/algorithms/overlay/get_turns.cpp
index cfeb4ca07..ccada3485 100644
--- a/test/algorithms/overlay/get_turns.cpp
+++ b/test/algorithms/overlay/get_turns.cpp
@@ -33,7 +33,7 @@
 #include <boost/geometry/io/wkt/write.hpp>
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 #include <algorithms/overlay/overlay_cases.hpp>
diff --git a/test/algorithms/overlay/overlay_common.hpp b/test/algorithms/overlay/overlay_common.hpp
index 359415d32..01fd109e5 100644
--- a/test/algorithms/overlay/overlay_common.hpp
+++ b/test/algorithms/overlay/overlay_common.hpp
@@ -30,7 +30,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
diff --git a/test/algorithms/overlay/relative_order.cpp b/test/algorithms/overlay/relative_order.cpp
index 1c57d97b2..18c51e2b3 100644
--- a/test/algorithms/overlay/relative_order.cpp
+++ b/test/algorithms/overlay/relative_order.cpp
@@ -23,7 +23,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
index 85729b165..b13084982 100644
--- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
+++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
@@ -28,7 +28,7 @@
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 #include <boost/geometry/algorithms/intersects.hpp>
diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp
index e60625266..91ee4bb34 100644
--- a/test/algorithms/overlay/self_intersection_points.cpp
+++ b/test/algorithms/overlay/self_intersection_points.cpp
@@ -36,7 +36,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/algorithms/overlay/split_rings.cpp b/test/algorithms/overlay/split_rings.cpp
index 9a281da16..00cf9f85b 100644
--- a/test/algorithms/overlay/split_rings.cpp
+++ b/test/algorithms/overlay/split_rings.cpp
@@ -30,7 +30,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp
index 403b2f1f0..f3705ca03 100644
--- a/test/algorithms/overlay/traverse.cpp
+++ b/test/algorithms/overlay/traverse.cpp
@@ -21,7 +21,7 @@
 #include <boost/type_traits/is_same.hpp>
 
 #ifdef HAVE_TTMATH
-#  include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#  include <boost/geometry/contrib/ttmath_stub.hpp>
 #endif
 
 #include <geometry_test_common.hpp>
@@ -62,7 +62,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 #include <boost/geometry/strategies/strategies.hpp>
diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp
index b4568e7f4..46da653d8 100644
--- a/test/algorithms/overlay/traverse_gmp.cpp
+++ b/test/algorithms/overlay/traverse_gmp.cpp
@@ -48,7 +48,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/test_difference.hpp
index 1ea583fb8..c3e34206d 100644
--- a/test/algorithms/test_difference.hpp
+++ b/test/algorithms/test_difference.hpp
@@ -40,7 +40,7 @@
 #if defined(TEST_WITH_SVG)
 #  define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
 #  define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #  include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 #endif
 
diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp
index aff527cfd..4594cb19e 100644
--- a/test/algorithms/test_intersection.hpp
+++ b/test/algorithms/test_intersection.hpp
@@ -28,7 +28,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 #include <geometry_test_common.hpp>
diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp
index ec4b0d10c..c449c66e3 100644
--- a/test/algorithms/test_union.hpp
+++ b/test/algorithms/test_union.hpp
@@ -30,7 +30,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test/robustness/convex_hull/random_multi_points.cpp b/test/robustness/convex_hull/random_multi_points.cpp
index 90ea7e2cd..a0d3efb54 100644
--- a/test/robustness/convex_hull/random_multi_points.cpp
+++ b/test/robustness/convex_hull/random_multi_points.cpp
@@ -24,7 +24,7 @@
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_geometries.hpp>
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 
 struct settings_type
 {
diff --git a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
index e54260f3b..5dc2be518 100644
--- a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
+++ b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
@@ -28,7 +28,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_geometries.hpp>
 
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 #include <boost/geometry/extensions/algorithms/midpoints.hpp>
 
 #include <boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp>
diff --git a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
index 3e5e88bd3..6585a227e 100644
--- a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
+++ b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
@@ -28,7 +28,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_geometries.hpp>
 
-#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
 #include <boost/geometry/extensions/algorithms/midpoints.hpp>
 
 #include <common/common_settings.hpp>
diff --git a/test_extensions/algorithms/buffer/test_buffer.hpp b/test_extensions/algorithms/buffer/test_buffer.hpp
index 67394376d..c7543dca8 100644
--- a/test_extensions/algorithms/buffer/test_buffer.hpp
+++ b/test_extensions/algorithms/buffer/test_buffer.hpp
@@ -48,7 +48,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test_extensions/algorithms/connect.cpp b/test_extensions/algorithms/connect.cpp
index 79b9e8785..f8766806b 100644
--- a/test_extensions/algorithms/connect.cpp
+++ b/test_extensions/algorithms/connect.cpp
@@ -30,7 +30,7 @@
 
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/multi/algorithms/envelope.hpp>
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 
diff --git a/test_extensions/algorithms/dissolve.cpp b/test_extensions/algorithms/dissolve.cpp
index 2c9fd9a0f..0c9a6417c 100644
--- a/test_extensions/algorithms/dissolve.cpp
+++ b/test_extensions/algorithms/dissolve.cpp
@@ -34,15 +34,10 @@
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
-#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
-
-
-
-
-
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/write_svg_multi.hpp>
 #endif
 
 template <typename Mapper>
diff --git a/test_extensions/algorithms/mark_spikes.cpp b/test_extensions/algorithms/mark_spikes.cpp
index 09c81eabd..985c7be51 100644
--- a/test_extensions/algorithms/mark_spikes.cpp
+++ b/test_extensions/algorithms/mark_spikes.cpp
@@ -29,7 +29,7 @@
 
 
 #if defined(TEST_WITH_SVG)
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
 // BSG 2011/08/05
diff --git a/test_extensions/algorithms/offset.cpp b/test_extensions/algorithms/offset.cpp
index 768ea3ea6..713ef82b8 100644
--- a/test_extensions/algorithms/offset.cpp
+++ b/test_extensions/algorithms/offset.cpp
@@ -30,7 +30,7 @@
 
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/multi/algorithms/envelope.hpp>
-#  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif