diff --git a/include/boost/geometry/multi/algorithms/append.hpp b/include/boost/geometry/multi/algorithms/append.hpp
index e72be036a..bb97af1aa 100644
--- a/include/boost/geometry/multi/algorithms/append.hpp
+++ b/include/boost/geometry/multi/algorithms/append.hpp
@@ -17,6 +17,7 @@
 #include <boost/geometry/algorithms/append.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/area.hpp b/include/boost/geometry/multi/algorithms/area.hpp
index 7d0206109..333499748 100644
--- a/include/boost/geometry/multi/algorithms/area.hpp
+++ b/include/boost/geometry/multi/algorithms/area.hpp
@@ -18,7 +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/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 e990f4eff..82e6a8af8 100644
--- a/include/boost/geometry/multi/algorithms/centroid.hpp
+++ b/include/boost/geometry/multi/algorithms/centroid.hpp
@@ -18,7 +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/multi/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/clear.hpp b/include/boost/geometry/multi/algorithms/clear.hpp
index 0b14b6ce9..ea32ee8b4 100644
--- a/include/boost/geometry/multi/algorithms/clear.hpp
+++ b/include/boost/geometry/multi/algorithms/clear.hpp
@@ -16,6 +16,7 @@
 
 
 #include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/convert.hpp b/include/boost/geometry/multi/algorithms/convert.hpp
index 474579113..1712964d4 100644
--- a/include/boost/geometry/multi/algorithms/convert.hpp
+++ b/include/boost/geometry/multi/algorithms/convert.hpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/algorithms/convert.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/correct.hpp b/include/boost/geometry/multi/algorithms/correct.hpp
index d0c3e1075..d28d1e78e 100644
--- a/include/boost/geometry/multi/algorithms/correct.hpp
+++ b/include/boost/geometry/multi/algorithms/correct.hpp
@@ -21,6 +21,7 @@
 #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/covered_by.hpp b/include/boost/geometry/multi/algorithms/covered_by.hpp
index ba398c0f4..c957c485b 100644
--- a/include/boost/geometry/multi/algorithms/covered_by.hpp
+++ b/include/boost/geometry/multi/algorithms/covered_by.hpp
@@ -19,6 +19,7 @@
 #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/multi/algorithms/within.hpp>
 
 
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 08ab14bd6..0938d6a2e 100644
--- a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
@@ -21,6 +21,7 @@
 #include <boost/geometry/algorithms/detail/for_each_range.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/detail/overlay/copy_segment_point.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
index 72be5ddbf..940480b3c 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
@@ -13,6 +13,7 @@
 #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>
 
 
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 f474b12fd..f3a0532ac 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
@@ -17,6 +17,7 @@
 
 #include <boost/geometry/multi/core/ring_type.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/detail/overlay/get_ring.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
index e23acf99b..2d04f7ccd 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
@@ -15,6 +15,8 @@
 
 #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>
 
 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 1ee03cc4d..6bc0aae25 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
@@ -11,6 +11,8 @@
 
 
 #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>
 
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 463618788..acb91f7dd 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
@@ -12,6 +12,9 @@
 
 #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>
 
 
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 57d5ff92c..d9820837b 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
@@ -11,6 +11,7 @@
 
 
 #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>
 
 
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 ac462ed4c..dd3bcd5d1 100644
--- a/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
@@ -17,6 +17,7 @@
 #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>
 
 
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 28a4805ed..47bc8a863 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
@@ -19,6 +19,7 @@
 #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>
 
diff --git a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
index 16f70c193..1e1056f37 100644
--- a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
@@ -20,6 +20,8 @@
 #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>
 
 
diff --git a/include/boost/geometry/multi/algorithms/disjoint.hpp b/include/boost/geometry/multi/algorithms/disjoint.hpp
index 7d1bed794..c01e520f5 100644
--- a/include/boost/geometry/multi/algorithms/disjoint.hpp
+++ b/include/boost/geometry/multi/algorithms/disjoint.hpp
@@ -15,6 +15,9 @@
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/multi/algorithms/covered_by.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/distance.hpp b/include/boost/geometry/multi/algorithms/distance.hpp
index 8acb3f900..32b41fcef 100644
--- a/include/boost/geometry/multi/algorithms/distance.hpp
+++ b/include/boost/geometry/multi/algorithms/distance.hpp
@@ -21,6 +21,7 @@
 #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/algorithms/distance.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
diff --git a/include/boost/geometry/multi/algorithms/envelope.hpp b/include/boost/geometry/multi/algorithms/envelope.hpp
index 026fc71e6..b70aab41e 100644
--- a/include/boost/geometry/multi/algorithms/envelope.hpp
+++ b/include/boost/geometry/multi/algorithms/envelope.hpp
@@ -22,7 +22,9 @@
 #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>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/algorithms/equals.hpp b/include/boost/geometry/multi/algorithms/equals.hpp
index 8c47672d9..54cd07504 100644
--- a/include/boost/geometry/multi/algorithms/equals.hpp
+++ b/include/boost/geometry/multi/algorithms/equals.hpp
@@ -17,6 +17,7 @@
 
 #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>
 
diff --git a/include/boost/geometry/multi/algorithms/for_each.hpp b/include/boost/geometry/multi/algorithms/for_each.hpp
index adf12dbba..9712b9c45 100644
--- a/include/boost/geometry/multi/algorithms/for_each.hpp
+++ b/include/boost/geometry/multi/algorithms/for_each.hpp
@@ -20,7 +20,7 @@
 
 #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>
 
diff --git a/include/boost/geometry/multi/algorithms/intersection.hpp b/include/boost/geometry/multi/algorithms/intersection.hpp
index 0027a4e15..ddb9aed81 100644
--- a/include/boost/geometry/multi/algorithms/intersection.hpp
+++ b/include/boost/geometry/multi/algorithms/intersection.hpp
@@ -14,6 +14,9 @@
 #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/multi/algorithms/covered_by.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
diff --git a/include/boost/geometry/multi/algorithms/length.hpp b/include/boost/geometry/multi/algorithms/length.hpp
index ef5fb3c97..e18cbe3d9 100644
--- a/include/boost/geometry/multi/algorithms/length.hpp
+++ b/include/boost/geometry/multi/algorithms/length.hpp
@@ -19,6 +19,7 @@
 
 #include <boost/geometry/algorithms/length.hpp>
 #include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/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 cc59655be..a102d08f2 100644
--- a/include/boost/geometry/multi/algorithms/num_geometries.hpp
+++ b/include/boost/geometry/multi/algorithms/num_geometries.hpp
@@ -21,6 +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>
 
 
 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 8390fe77a..e43b31d16 100644
--- a/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
@@ -20,6 +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/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 1cc82b2f0..294c08603 100644
--- a/include/boost/geometry/multi/algorithms/num_points.hpp
+++ b/include/boost/geometry/multi/algorithms/num_points.hpp
@@ -19,6 +19,7 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/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 6a13f90e3..5b37525b8 100644
--- a/include/boost/geometry/multi/algorithms/perimeter.hpp
+++ b/include/boost/geometry/multi/algorithms/perimeter.hpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/algorithms/perimeter.hpp>
 
 #include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/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/reverse.hpp b/include/boost/geometry/multi/algorithms/reverse.hpp
index 910f1e3d1..7a4938ef8 100644
--- a/include/boost/geometry/multi/algorithms/reverse.hpp
+++ b/include/boost/geometry/multi/algorithms/reverse.hpp
@@ -21,7 +21,7 @@
 #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 1706c69f4..2c7461b66 100644
--- a/include/boost/geometry/multi/algorithms/simplify.hpp
+++ b/include/boost/geometry/multi/algorithms/simplify.hpp
@@ -18,7 +18,7 @@
 
 #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/multi/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
diff --git a/include/boost/geometry/multi/algorithms/transform.hpp b/include/boost/geometry/multi/algorithms/transform.hpp
index 110e96958..13c53e615 100644
--- a/include/boost/geometry/multi/algorithms/transform.hpp
+++ b/include/boost/geometry/multi/algorithms/transform.hpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/algorithms/transform.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/unique.hpp b/include/boost/geometry/multi/algorithms/unique.hpp
index bda2234a6..64c56aafb 100644
--- a/include/boost/geometry/multi/algorithms/unique.hpp
+++ b/include/boost/geometry/multi/algorithms/unique.hpp
@@ -19,6 +19,7 @@
 
 #include <boost/geometry/algorithms/unique.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/within.hpp b/include/boost/geometry/multi/algorithms/within.hpp
index a3ec7514b..4094dcc2d 100644
--- a/include/boost/geometry/multi/algorithms/within.hpp
+++ b/include/boost/geometry/multi/algorithms/within.hpp
@@ -21,6 +21,7 @@
 #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>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/multi/io/dsv/write.hpp b/include/boost/geometry/multi/io/dsv/write.hpp
index be40b5da5..1a054659a 100644
--- a/include/boost/geometry/multi/io/dsv/write.hpp
+++ b/include/boost/geometry/multi/io/dsv/write.hpp
@@ -16,6 +16,9 @@
 
 #include <boost/range.hpp>
 
+#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/geometries/concepts/check.hpp>
+
 #include <boost/geometry/io/dsv/write.hpp>
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/multi/io/wkt/read.hpp b/include/boost/geometry/multi/io/wkt/read.hpp
index 218ddf999..2bfa830cf 100644
--- a/include/boost/geometry/multi/io/wkt/read.hpp
+++ b/include/boost/geometry/multi/io/wkt/read.hpp
@@ -19,6 +19,7 @@
 #include <boost/geometry/core/mutable_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/multi/io/wkt/detail/prefix.hpp>
 #include <boost/geometry/io/wkt/read.hpp>
 
diff --git a/include/boost/geometry/multi/io/wkt/write.hpp b/include/boost/geometry/multi/io/wkt/write.hpp
index 707e07ce1..47087e944 100644
--- a/include/boost/geometry/multi/io/wkt/write.hpp
+++ b/include/boost/geometry/multi/io/wkt/write.hpp
@@ -15,6 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
 
 #include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/multi/io/wkt/detail/prefix.hpp>
 #include <boost/geometry/io/wkt/write.hpp>