diff --git a/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp b/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
index 05f264602..140d87daf 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
@@ -22,7 +22,6 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_AREAL_AREAL_HPP
 
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
 
 #include <boost/geometry/algorithms/within.hpp>
 #include <boost/geometry/algorithms/detail/for_each_range.hpp>
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
index c0ab55578..d4f2bff28 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
@@ -32,7 +32,6 @@
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/algorithms/covered_by.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
index 0eab4c649..52f114edd 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
@@ -30,7 +30,6 @@
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp b/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
index 5dd69cbcd..363439d20 100644
--- a/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
@@ -25,7 +25,6 @@
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp b/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
index 7b032a19c..57c908d38 100644
--- a/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
@@ -12,7 +12,6 @@
 
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp b/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp
index faa1f20a8..078aba793 100644
--- a/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp
@@ -19,7 +19,6 @@
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/iterators/point_iterator.hpp>
 #include <boost/geometry/iterators/has_one_element.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/interface.hpp b/include/boost/geometry/algorithms/detail/distance/interface.hpp
index 506dffbc9..ace6df8ee 100644
--- a/include/boost/geometry/algorithms/detail/distance/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/interface.hpp
@@ -24,7 +24,6 @@
 #include <boost/concept_check.hpp>
 
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
 
 #include <boost/geometry/algorithms/num_points.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
@@ -32,7 +31,6 @@
 #include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/default_distance_result.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp b/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp
index 1e6e3c77f..29ceb96be 100644
--- a/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp
@@ -24,7 +24,6 @@
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp b/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp
index 5a800175c..1774fab72 100644
--- a/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp
@@ -12,9 +12,8 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
 
 #include <boost/geometry/algorithms/dispatch/distance.hpp>
 
@@ -22,6 +21,8 @@
 #include <boost/geometry/algorithms/detail/distance/multi_to_multi.hpp>
 #include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
 
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 #include <boost/geometry/iterators/point_iterator.hpp>
 
 
diff --git a/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp b/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
index edaba1252..8d02e1cce 100644
--- a/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
@@ -16,7 +16,6 @@
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
diff --git a/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
index f0c18476d..d462a66a5 100644
--- a/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
@@ -23,18 +23,15 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
 
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/tags.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/util/select_coordinate_type.hpp>
 #include <boost/geometry/util/math.hpp>
 
@@ -42,6 +39,8 @@
 
 #include <boost/geometry/algorithms/dispatch/distance.hpp>
 
+#include <boost/geometry/views/detail/range_type.hpp>
+
 // includes needed from multi.hpp -- start
 #include <boost/geometry/multi/algorithms/covered_by.hpp>
 #include <boost/geometry/multi/algorithms/disjoint.hpp>
@@ -52,7 +51,6 @@
 #include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
 #include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
 
-#include <boost/geometry/multi/views/detail/range_type.hpp>
 // includes needed from multi.hpp -- end
 
 #include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
diff --git a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
index 807848fa0..53de99629 100644
--- a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+++ b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
@@ -20,10 +20,10 @@
 #include <boost/range.hpp>
 #include <boost/typeof/typeof.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
+
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/util/math.hpp>
diff --git a/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
index 6407706cb..e93978bb4 100644
--- a/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -19,7 +19,6 @@
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 #include <boost/geometry/algorithms/detail/overlay/follow.hpp>
diff --git a/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp b/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
index 74b9e0134..944c8fd56 100644
--- a/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
@@ -18,7 +18,6 @@
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/algorithms/detail/relate/turns.hpp>
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp b/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
index 157f1993a..0af062d27 100644
--- a/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
@@ -17,10 +17,9 @@
 #include <boost/assert.hpp>
 #include <boost/range.hpp>
 
+#include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/core/point_type.hpp>
 
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
diff --git a/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
index a9cb49452..8da05e58f 100644
--- a/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
+++ b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
@@ -134,8 +134,6 @@ struct within_no_turns<Geometry1, Geometry2, polygon_tag, polygon_tag>
     }
 };
 
-// TODO: later move it to directory boost/geometry/multi/algorithms/detail/within
-
 template <typename Geometry1,
           typename Geometry2,
           typename Tag1 = typename geometry::tag<Geometry1>::type,
diff --git a/include/boost/geometry/algorithms/not_implemented.hpp b/include/boost/geometry/algorithms/not_implemented.hpp
index 008f111cc..cd40a2772 100644
--- a/include/boost/geometry/algorithms/not_implemented.hpp
+++ b/include/boost/geometry/algorithms/not_implemented.hpp
@@ -18,7 +18,6 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/io/svg/svg_mapper.hpp b/include/boost/geometry/io/svg/svg_mapper.hpp
index fbe0a37da..b53fef2ce 100644
--- a/include/boost/geometry/io/svg/svg_mapper.hpp
+++ b/include/boost/geometry/io/svg/svg_mapper.hpp
@@ -37,7 +37,6 @@
 #include <boost/geometry/strategies/transform/map_transformer.hpp>
 #include <boost/geometry/views/segment_view.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
diff --git a/include/boost/geometry/io/wkt/detail/wkt_multi.hpp b/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
index 0e5abbca8..2b2d1946a 100644
--- a/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+++ b/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
@@ -14,9 +14,8 @@
 #ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
 #define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
 
-
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/domains/gis/io/wkt/write.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/iterators/point_iterator.hpp b/include/boost/geometry/iterators/point_iterator.hpp
index aa01a0eaa..09134b6cd 100644
--- a/include/boost/geometry/iterators/point_iterator.hpp
+++ b/include/boost/geometry/iterators/point_iterator.hpp
@@ -18,7 +18,6 @@
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/iterators/dispatch/point_iterator.hpp>
 #include <boost/geometry/iterators/point_iterator_type.hpp>
diff --git a/include/boost/geometry/iterators/point_iterator_type.hpp b/include/boost/geometry/iterators/point_iterator_type.hpp
index 0d6bfcc75..4991b2718 100644
--- a/include/boost/geometry/iterators/point_iterator_type.hpp
+++ b/include/boost/geometry/iterators/point_iterator_type.hpp
@@ -20,7 +20,6 @@
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 #include <boost/geometry/iterators/flatten_iterator.hpp>
 #include <boost/geometry/iterators/concatenate_iterator.hpp>
diff --git a/include/boost/geometry/multi/algorithms/append.hpp b/include/boost/geometry/multi/algorithms/append.hpp
index 3eb606e6c..2a2596c54 100644
--- a/include/boost/geometry/multi/algorithms/append.hpp
+++ b/include/boost/geometry/multi/algorithms/append.hpp
@@ -21,8 +21,8 @@
 
 #include <boost/geometry/algorithms/append.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/area.hpp b/include/boost/geometry/multi/algorithms/area.hpp
index 333499748..1a9598747 100644
--- a/include/boost/geometry/multi/algorithms/area.hpp
+++ b/include/boost/geometry/multi/algorithms/area.hpp
@@ -18,9 +18,9 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/area.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
diff --git a/include/boost/geometry/multi/algorithms/centroid.hpp b/include/boost/geometry/multi/algorithms/centroid.hpp
index 82e6a8af8..dcf426de5 100644
--- a/include/boost/geometry/multi/algorithms/centroid.hpp
+++ b/include/boost/geometry/multi/algorithms/centroid.hpp
@@ -18,9 +18,9 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/algorithms/centroid.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/clear.hpp b/include/boost/geometry/multi/algorithms/clear.hpp
index ea32ee8b4..e00bd01aa 100644
--- a/include/boost/geometry/multi/algorithms/clear.hpp
+++ b/include/boost/geometry/multi/algorithms/clear.hpp
@@ -15,9 +15,9 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CLEAR_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/convert.hpp b/include/boost/geometry/multi/algorithms/convert.hpp
index ccc1835af..1ade9138f 100644
--- a/include/boost/geometry/multi/algorithms/convert.hpp
+++ b/include/boost/geometry/multi/algorithms/convert.hpp
@@ -18,9 +18,8 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/convert.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/correct.hpp b/include/boost/geometry/multi/algorithms/correct.hpp
index d28d1e78e..7821b924c 100644
--- a/include/boost/geometry/multi/algorithms/correct.hpp
+++ b/include/boost/geometry/multi/algorithms/correct.hpp
@@ -18,10 +18,10 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/correct.hpp>
-#include <boost/geometry/multi/algorithms/detail/modify.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/multi/algorithms/detail/modify.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/covered_by.hpp b/include/boost/geometry/multi/algorithms/covered_by.hpp
index 034304c91..dffd9bd1b 100644
--- a/include/boost/geometry/multi/algorithms/covered_by.hpp
+++ b/include/boost/geometry/multi/algorithms/covered_by.hpp
@@ -22,10 +22,10 @@
 
 
 #include <boost/geometry/algorithms/covered_by.hpp>
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp b/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
index 6bf997ed3..5c08f61d2 100644
--- a/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
@@ -17,11 +17,10 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/detail/extreme_points.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
index 0938d6a2e..5f5b9a7ec 100644
--- a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
@@ -20,8 +20,8 @@
 
 #include <boost/geometry/algorithms/detail/for_each_range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
index 3f0eea575..2f744e6a1 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
@@ -15,10 +15,10 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
index e6d62dffb..a856813e0 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
@@ -15,9 +15,9 @@
 
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
index 2d04f7ccd..bd3acf1bc 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
@@ -14,9 +14,9 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
index 0affcff98..f2d67e3c1 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
@@ -9,14 +9,13 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 
-
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 
-#include <boost/geometry/multi/views/detail/range_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/views/detail/range_type.hpp>
 
 #include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
 #include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
index acb91f7dd..7c5040b40 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
@@ -12,11 +12,11 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
index 165ead6f7..acb0d3246 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
@@ -10,10 +10,11 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp b/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
index bbf958571..8585c2f23 100644
--- a/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
@@ -17,12 +17,14 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 
+
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp b/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
index b5b041c1f..ecdcbe6c5 100644
--- a/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
@@ -21,11 +21,12 @@
 #include <boost/assert.hpp>
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/core/ring_type.hpp>
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
 
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
index 1778fe9eb..4eecc4a4c 100644
--- a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
@@ -23,10 +23,11 @@
 #include <boost/concept/requires.hpp>
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/envelope.hpp b/include/boost/geometry/multi/algorithms/envelope.hpp
index b70aab41e..2e3e92bc6 100644
--- a/include/boost/geometry/multi/algorithms/envelope.hpp
+++ b/include/boost/geometry/multi/algorithms/envelope.hpp
@@ -18,13 +18,12 @@
 
 #include <boost/range/metafunctions.hpp>
 
-
-#include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/algorithms/envelope.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/equals.hpp b/include/boost/geometry/multi/algorithms/equals.hpp
index 54cd07504..295223e58 100644
--- a/include/boost/geometry/multi/algorithms/equals.hpp
+++ b/include/boost/geometry/multi/algorithms/equals.hpp
@@ -15,12 +15,12 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_EQUALS_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/equals.hpp>
 
+#include <boost/geometry/core/geometry_id.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/for_each.hpp b/include/boost/geometry/multi/algorithms/for_each.hpp
index 9712b9c45..e1780e8ea 100644
--- a/include/boost/geometry/multi/algorithms/for_each.hpp
+++ b/include/boost/geometry/multi/algorithms/for_each.hpp
@@ -18,12 +18,11 @@
 #include <boost/range.hpp>
 #include <boost/typeof/typeof.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/for_each.hpp>
 
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/intersection.hpp b/include/boost/geometry/multi/algorithms/intersection.hpp
index 3b7f9d572..e21067eb0 100644
--- a/include/boost/geometry/multi/algorithms/intersection.hpp
+++ b/include/boost/geometry/multi/algorithms/intersection.hpp
@@ -10,12 +10,12 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 
 
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/is_areal.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
+#include <boost/geometry/core/is_areal.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/multi/algorithms/covered_by.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
diff --git a/include/boost/geometry/multi/algorithms/length.hpp b/include/boost/geometry/multi/algorithms/length.hpp
index e18cbe3d9..7e4ddbae0 100644
--- a/include/boost/geometry/multi/algorithms/length.hpp
+++ b/include/boost/geometry/multi/algorithms/length.hpp
@@ -18,8 +18,8 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/length.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
diff --git a/include/boost/geometry/multi/algorithms/num_geometries.hpp b/include/boost/geometry/multi/algorithms/num_geometries.hpp
index a102d08f2..1336b3c94 100644
--- a/include/boost/geometry/multi/algorithms/num_geometries.hpp
+++ b/include/boost/geometry/multi/algorithms/num_geometries.hpp
@@ -21,8 +21,8 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/algorithms/num_geometries.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/num_interior_rings.hpp b/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
index e43b31d16..5b52508b7 100644
--- a/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
@@ -20,8 +20,7 @@
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/num_interior_rings.hpp>
 
diff --git a/include/boost/geometry/multi/algorithms/num_points.hpp b/include/boost/geometry/multi/algorithms/num_points.hpp
index 294c08603..180523a98 100644
--- a/include/boost/geometry/multi/algorithms/num_points.hpp
+++ b/include/boost/geometry/multi/algorithms/num_points.hpp
@@ -18,8 +18,8 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/perimeter.hpp b/include/boost/geometry/multi/algorithms/perimeter.hpp
index df13f200e..6b651b3ab 100644
--- a/include/boost/geometry/multi/algorithms/perimeter.hpp
+++ b/include/boost/geometry/multi/algorithms/perimeter.hpp
@@ -19,8 +19,8 @@
 
 #include <boost/geometry/algorithms/perimeter.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
diff --git a/include/boost/geometry/multi/algorithms/remove_spikes.hpp b/include/boost/geometry/multi/algorithms/remove_spikes.hpp
index eb08ab11d..25076a2fd 100644
--- a/include/boost/geometry/multi/algorithms/remove_spikes.hpp
+++ b/include/boost/geometry/multi/algorithms/remove_spikes.hpp
@@ -13,10 +13,10 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
 
 
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/remove_spikes.hpp>
 
diff --git a/include/boost/geometry/multi/algorithms/reverse.hpp b/include/boost/geometry/multi/algorithms/reverse.hpp
index 7a4938ef8..70c37d50d 100644
--- a/include/boost/geometry/multi/algorithms/reverse.hpp
+++ b/include/boost/geometry/multi/algorithms/reverse.hpp
@@ -18,12 +18,12 @@
 #include <boost/range/metafunctions.hpp>
 
 #include <boost/geometry/algorithms/reverse.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 #include <boost/geometry/multi/algorithms/detail/modify.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
 namespace boost { namespace geometry
 {
 
diff --git a/include/boost/geometry/multi/algorithms/simplify.hpp b/include/boost/geometry/multi/algorithms/simplify.hpp
index 2c7461b66..30e45c5f1 100644
--- a/include/boost/geometry/multi/algorithms/simplify.hpp
+++ b/include/boost/geometry/multi/algorithms/simplify.hpp
@@ -14,14 +14,16 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 
+
 #include <boost/range.hpp>
 
+#include <boost/geometry/algorithms/simplify.hpp>
+
 #include <boost/geometry/core/mutable_range.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/multi/algorithms/clear.hpp>
-#include <boost/geometry/algorithms/simplify.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/transform.hpp b/include/boost/geometry/multi/algorithms/transform.hpp
index 13c53e615..d4c83f05c 100644
--- a/include/boost/geometry/multi/algorithms/transform.hpp
+++ b/include/boost/geometry/multi/algorithms/transform.hpp
@@ -16,11 +16,11 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/algorithms/unique.hpp b/include/boost/geometry/multi/algorithms/unique.hpp
index 64c56aafb..d20de8ab7 100644
--- a/include/boost/geometry/multi/algorithms/unique.hpp
+++ b/include/boost/geometry/multi/algorithms/unique.hpp
@@ -18,8 +18,9 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/algorithms/unique.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/within.hpp b/include/boost/geometry/multi/algorithms/within.hpp
index 8c3cc8a3a..9fdc5dd39 100644
--- a/include/boost/geometry/multi/algorithms/within.hpp
+++ b/include/boost/geometry/multi/algorithms/within.hpp
@@ -22,9 +22,4 @@
 
 #include <boost/geometry/algorithms/within.hpp>
 
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP