diff --git a/include/boost/geometry/core/closure.hpp b/include/boost/geometry/core/closure.hpp
index 3185626c5..b61e352e9 100644
--- a/include/boost/geometry/core/closure.hpp
+++ b/include/boost/geometry/core/closure.hpp
@@ -14,10 +14,9 @@
 #ifndef BOOST_GEOMETRY_CORE_CLOSURE_HPP
 #define BOOST_GEOMETRY_CORE_CLOSURE_HPP
 
-
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/size_t.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -139,7 +138,7 @@ struct closure<ring_tag, Ring>
         = geometry::traits::closure<Ring>::value;
 };
 
-// Specialization for polygon: the closure is the closure of its rings
+// Specialization for Polygon: the closure is the closure of its rings
 template <typename Polygon>
 struct closure<polygon_tag, Polygon>
 {
@@ -150,6 +149,24 @@ struct closure<polygon_tag, Polygon>
         >::value ;
 };
 
+template <typename MultiPoint>
+struct closure<multi_point_tag, MultiPoint>
+    : public core_detail::closure::closed {};
+
+template <typename MultiLinestring>
+struct closure<multi_linestring_tag, MultiLinestring>
+    : public core_detail::closure::closed {};
+
+// Specialization for MultiPolygon: the closure is the closure of Polygon's rings
+template <typename MultiPolygon>
+struct closure<multi_polygon_tag, MultiPolygon>
+{
+    static const closure_selector value = core_dispatch::closure
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::value ;
+};
 
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
diff --git a/include/boost/geometry/core/geometry_id.hpp b/include/boost/geometry/core/geometry_id.hpp
index 3fb2c11be..5fc5a8005 100644
--- a/include/boost/geometry/core/geometry_id.hpp
+++ b/include/boost/geometry/core/geometry_id.hpp
@@ -18,8 +18,6 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/type_traits.hpp>
-
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -45,29 +43,40 @@ struct geometry_id
 
 
 template <>
-struct geometry_id<point_tag>      : boost::mpl::int_<1> {};
+struct geometry_id<point_tag>            : boost::mpl::int_<1> {};
 
 
 template <>
-struct geometry_id<linestring_tag> : boost::mpl::int_<2> {};
+struct geometry_id<linestring_tag>       : boost::mpl::int_<2> {};
 
 
 template <>
-struct geometry_id<polygon_tag>    : boost::mpl::int_<3> {};
+struct geometry_id<polygon_tag>          : boost::mpl::int_<3> {};
 
 
 template <>
-struct geometry_id<segment_tag>    : boost::mpl::int_<92> {};
+struct geometry_id<multi_point_tag>      : boost::mpl::int_<4> {};
 
 
 template <>
-struct geometry_id<ring_tag>       : boost::mpl::int_<93> {};
+struct geometry_id<multi_linestring_tag> : boost::mpl::int_<5> {};
 
 
 template <>
-struct geometry_id<box_tag>        : boost::mpl::int_<94> {};
+struct geometry_id<multi_polygon_tag>    : boost::mpl::int_<6> {};
 
 
+template <>
+struct geometry_id<segment_tag>          : boost::mpl::int_<92> {};
+
+
+template <>
+struct geometry_id<ring_tag>             : boost::mpl::int_<93> {};
+
+
+template <>
+struct geometry_id<box_tag>              : boost::mpl::int_<94> {};
+
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/core/interior_rings.hpp b/include/boost/geometry/core/interior_rings.hpp
index 10af2ae4e..798f41577 100644
--- a/include/boost/geometry/core/interior_rings.hpp
+++ b/include/boost/geometry/core/interior_rings.hpp
@@ -17,7 +17,7 @@
 #include <cstddef>
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/tag.hpp>
@@ -85,6 +85,17 @@ struct interior_rings<polygon_tag, Polygon>
 };
 
 
+template <typename MultiPolygon>
+struct interior_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename core_dispatch::interior_type
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::type type;
+};
+
+
 } // namespace core_dispatch
 #endif
 
diff --git a/include/boost/geometry/core/is_areal.hpp b/include/boost/geometry/core/is_areal.hpp
index 5ddfa753b..23858605f 100644
--- a/include/boost/geometry/core/is_areal.hpp
+++ b/include/boost/geometry/core/is_areal.hpp
@@ -16,8 +16,7 @@
 #define BOOST_GEOMETRY_CORE_IS_AREAL_HPP
 
 
-#include <boost/type_traits.hpp>
-
+#include <boost/type_traits/integral_constant.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -36,7 +35,7 @@ template <typename GeometryTag> struct is_areal : boost::false_type {};
 template <> struct is_areal<ring_tag> : boost::true_type {};
 template <> struct is_areal<box_tag> : boost::true_type {};
 template <> struct is_areal<polygon_tag> : boost::true_type {};
-
+template <> struct is_areal<multi_polygon_tag> : boost::true_type {};
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/core/point_order.hpp b/include/boost/geometry/core/point_order.hpp
index 4442afc72..501dda777 100644
--- a/include/boost/geometry/core/point_order.hpp
+++ b/include/boost/geometry/core/point_order.hpp
@@ -16,7 +16,7 @@
 
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -135,6 +135,26 @@ struct point_order<polygon_tag, Polygon>
         >::value ;
 };
 
+template <typename MultiPoint>
+struct point_order<multi_point_tag, MultiPoint>
+    : public detail::point_order::clockwise {};
+
+template <typename MultiLinestring>
+struct point_order<multi_linestring_tag, MultiLinestring>
+    : public detail::point_order::clockwise {};
+
+
+// Specialization for multi_polygon: the order is the order of its polygons
+template <typename MultiPolygon>
+struct point_order<multi_polygon_tag, MultiPolygon>
+{
+    static const order_selector value = core_dispatch::point_order
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::value ;
+};
+
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
diff --git a/include/boost/geometry/core/point_type.hpp b/include/boost/geometry/core/point_type.hpp
index ebb8eeeca..f70e1fedd 100644
--- a/include/boost/geometry/core/point_type.hpp
+++ b/include/boost/geometry/core/point_type.hpp
@@ -16,7 +16,7 @@
 
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -102,6 +102,38 @@ struct point_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiPoint>
+struct point_type<multi_point_tag, MultiPoint>
+{
+    typedef typename boost::range_value
+        <
+            MultiPoint
+        >::type type;
+};
+
+
+template <typename MultiLinestring>
+struct point_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename point_type
+        <
+            linestring_tag,
+            typename boost::range_value<MultiLinestring>::type
+        >::type type;
+};
+
+
+template <typename MultiPolygon>
+struct point_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename point_type
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::type type;
+};
+
+
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
diff --git a/include/boost/geometry/core/ring_type.hpp b/include/boost/geometry/core/ring_type.hpp
index 9b984faf3..fe551f060 100644
--- a/include/boost/geometry/core/ring_type.hpp
+++ b/include/boost/geometry/core/ring_type.hpp
@@ -18,8 +18,10 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/range/value_type.hpp>
+#include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
-
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -102,6 +104,38 @@ struct ring_return_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiLinestring>
+struct ring_return_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename ring_return_type
+        <
+            linestring_tag,
+            typename mpl::if_
+                <
+                    boost::is_const<MultiLinestring>,
+                    typename boost::range_value<MultiLinestring>::type const,
+                    typename boost::range_value<MultiLinestring>::type
+                >::type
+        >::type type;
+};
+
+
+template <typename MultiPolygon>
+struct ring_return_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename ring_return_type
+        <
+            polygon_tag,
+            typename mpl::if_
+                <
+                    boost::is_const<MultiPolygon>,
+                    typename boost::range_value<MultiPolygon>::type const,
+                    typename boost::range_value<MultiPolygon>::type
+                >::type
+        >::type type;
+};
+
+
 template <typename GeometryTag, typename Geometry>
 struct ring_type
 {};
@@ -124,8 +158,25 @@ struct ring_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiLinestring>
+struct ring_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename boost::remove_reference
+        <
+            typename ring_return_type<multi_linestring_tag, MultiLinestring>::type
+        >::type type;
+};
 
 
+template <typename MultiPolygon>
+struct ring_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename boost::remove_reference
+        <
+            typename ring_return_type<multi_polygon_tag, MultiPolygon>::type
+        >::type type;
+};
+
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/core/tags.hpp b/include/boost/geometry/core/tags.hpp
index adaecd64a..160477b8c 100644
--- a/include/boost/geometry/core/tags.hpp
+++ b/include/boost/geometry/core/tags.hpp
@@ -88,6 +88,49 @@ struct box_tag : single_tag, areal_tag {};
 struct segment_tag : single_tag, linear_tag {};
 
 
+/// OGC Multi point identifying tag
+struct multi_point_tag : multi_tag, pointlike_tag  {};
+
+/// OGC Multi linestring identifying tag
+struct multi_linestring_tag : multi_tag, linear_tag {};
+
+/// OGC Multi polygon identifying tag
+struct multi_polygon_tag : multi_tag, polygonal_tag {};
+
+/// OGC Geometry Collection identifying tag
+struct geometry_collection_tag : multi_tag {};
+
+
+/*!
+\brief Meta-function to get for a tag of a multi-geometry
+    the tag of the corresponding single-geometry
+*/
+template <typename Tag>
+struct single_tag_of
+{};
+
+#ifndef DOXYGEN_NO_DETAIL
+
+template <>
+struct single_tag_of<multi_point_tag>
+{
+    typedef point_tag type;
+};
+
+template <>
+struct single_tag_of<multi_linestring_tag>
+{
+    typedef linestring_tag type;
+};
+
+template <>
+struct single_tag_of<multi_polygon_tag>
+{
+    typedef polygon_tag type;
+};
+
+#endif
+
 
 }} // namespace boost::geometry
 
diff --git a/include/boost/geometry/core/topological_dimension.hpp b/include/boost/geometry/core/topological_dimension.hpp
index 02f1ed341..22ed676fc 100644
--- a/include/boost/geometry/core/topological_dimension.hpp
+++ b/include/boost/geometry/core/topological_dimension.hpp
@@ -49,10 +49,12 @@ struct top_dim<segment_tag>    : boost::mpl::int_<1> {};
 
 
 // ring: topological dimension of two, but some people say: 1 !!
+// NOTE: This is not OGC LinearRing!
 template <>
 struct top_dim<ring_tag>       : boost::mpl::int_<2> {};
 
 
+// TODO: This is wrong! Boxes may have various topological dimensions
 template <>
 struct top_dim<box_tag>        : boost::mpl::int_<2> {};
 
@@ -61,6 +63,17 @@ template <>
 struct top_dim<polygon_tag>    : boost::mpl::int_<2> {};
 
 
+template <>
+struct top_dim<multi_point_tag> : boost::mpl::int_<0> {};
+
+
+template <>
+struct top_dim<multi_linestring_tag> : boost::mpl::int_<1> {};
+
+
+template <>
+struct top_dim<multi_polygon_tag> : boost::mpl::int_<2> {};
+
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/multi/core/closure.hpp b/include/boost/geometry/multi/core/closure.hpp
index 3964db256..9e7cf3c24 100644
--- a/include/boost/geometry/multi/core/closure.hpp
+++ b/include/boost/geometry/multi/core/closure.hpp
@@ -14,45 +14,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 
-
-#include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
 #include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename Multi>
-struct closure<multi_point_tag, Multi> : public core_detail::closure::closed {};
-
-template <typename Multi>
-struct closure<multi_linestring_tag, Multi> : public core_detail::closure::closed {};
-
-// Specialization for polygon: the closure is the closure of its rings
-template <typename MultiPolygon>
-struct closure<multi_polygon_tag, MultiPolygon>
-{
-    static const closure_selector value = core_dispatch::closure
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::value ;
-};
-
-
-} // namespace core_dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
diff --git a/include/boost/geometry/multi/core/geometry_id.hpp b/include/boost/geometry/multi/core/geometry_id.hpp
index 9d69cb20d..7d5e888ba 100644
--- a/include/boost/geometry/multi/core/geometry_id.hpp
+++ b/include/boost/geometry/multi/core/geometry_id.hpp
@@ -15,42 +15,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 
-
-#include <boost/mpl/int.hpp>
-#include <boost/type_traits.hpp>
-
-
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <>
-struct geometry_id<multi_point_tag>      : boost::mpl::int_<4> {};
-
-
-template <>
-struct geometry_id<multi_linestring_tag> : boost::mpl::int_<5> {};
-
-
-template <>
-struct geometry_id<multi_polygon_tag>    : boost::mpl::int_<6> {};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
diff --git a/include/boost/geometry/multi/core/interior_rings.hpp b/include/boost/geometry/multi/core/interior_rings.hpp
index 5a200d486..deeeff81d 100644
--- a/include/boost/geometry/multi/core/interior_rings.hpp
+++ b/include/boost/geometry/multi/core/interior_rings.hpp
@@ -16,40 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
 
 
-#include <cstddef>
-
-#include <boost/range.hpp>
-
 #include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-
-template <typename MultiPolygon>
-struct interior_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename core_dispatch::interior_type
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::type type;
-};
-
-
-} // namespace core_dispatch
-#endif
-
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
diff --git a/include/boost/geometry/multi/core/is_areal.hpp b/include/boost/geometry/multi/core/is_areal.hpp
index ad8daeb49..30f98527a 100644
--- a/include/boost/geometry/multi/core/is_areal.hpp
+++ b/include/boost/geometry/multi/core/is_areal.hpp
@@ -16,28 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
 
 
-#include <boost/type_traits.hpp>
-
-
 #include <boost/geometry/core/is_areal.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <> struct is_areal<multi_polygon_tag> : boost::true_type {};
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
diff --git a/include/boost/geometry/multi/core/point_order.hpp b/include/boost/geometry/multi/core/point_order.hpp
index 6b08468e8..119e55c3b 100644
--- a/include/boost/geometry/multi/core/point_order.hpp
+++ b/include/boost/geometry/multi/core/point_order.hpp
@@ -15,43 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
 
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename Multi>
-struct point_order<multi_point_tag, Multi>
-    : public detail::point_order::clockwise {};
-
-template <typename Multi>
-struct point_order<multi_linestring_tag, Multi>
-    : public detail::point_order::clockwise {};
-
-
-// Specialization for multi_polygon: the order is the order of its polygons
-template <typename MultiPolygon>
-struct point_order<multi_polygon_tag, MultiPolygon>
-{
-    static const order_selector value = core_dispatch::point_order
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::value ;
-};
-
-} // namespace core_dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
diff --git a/include/boost/geometry/multi/core/point_type.hpp b/include/boost/geometry/multi/core/point_type.hpp
index 3c77e973b..a7277d09a 100644
--- a/include/boost/geometry/multi/core/point_type.hpp
+++ b/include/boost/geometry/multi/core/point_type.hpp
@@ -16,49 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename MultiPoint>
-struct point_type<multi_point_tag, MultiPoint>
-{
-    typedef typename boost::range_value<MultiPoint>::type type;
-};
-
-
-template <typename MultiLinestring>
-struct point_type<multi_linestring_tag, MultiLinestring>
-{
-    typedef typename point_type<linestring_tag,
-        typename boost::range_value<MultiLinestring>::type>::type type;
-};
-
-
-
-template <typename MultiPolygon>
-struct point_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename point_type<polygon_tag,
-        typename boost::range_value<MultiPolygon>::type>::type type;
-};
-
-
-}
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
diff --git a/include/boost/geometry/multi/core/ring_type.hpp b/include/boost/geometry/multi/core/ring_type.hpp
index f03564dde..b27b5527c 100644
--- a/include/boost/geometry/multi/core/ring_type.hpp
+++ b/include/boost/geometry/multi/core/ring_type.hpp
@@ -19,75 +19,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename MultiPolygon>
-struct ring_return_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename ring_return_type
-        <
-            polygon_tag,
-            typename mpl::if_
-                <
-                    boost::is_const<MultiPolygon>,
-                    typename boost::range_value<MultiPolygon>::type const,
-                    typename boost::range_value<MultiPolygon>::type
-                >::type
-        >::type type;
-};
-
-template <typename MultiLinestring>
-struct ring_return_type<multi_linestring_tag, MultiLinestring>
-{
-    typedef typename ring_return_type
-        <
-            linestring_tag,
-            typename mpl::if_
-                <
-                    boost::is_const<MultiLinestring>,
-                    typename boost::range_value<MultiLinestring>::type const,
-                    typename boost::range_value<MultiLinestring>::type
-                >::type
-        >::type type;
-};
-
-
-template <typename MultiPolygon>
-struct ring_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename boost::remove_reference
-        <
-            typename ring_return_type<multi_polygon_tag, MultiPolygon>::type
-        >::type type;
-};
-
-template <typename MultiLinestring>
-struct ring_type<multi_linestring_tag, MultiLinestring>
-{
-    typedef typename boost::remove_reference
-        <
-            typename ring_return_type<multi_linestring_tag, MultiLinestring>::type
-        >::type type;
-};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
diff --git a/include/boost/geometry/multi/core/tags.hpp b/include/boost/geometry/multi/core/tags.hpp
index dcfca65b2..fb0758d95 100644
--- a/include/boost/geometry/multi/core/tags.hpp
+++ b/include/boost/geometry/multi/core/tags.hpp
@@ -15,57 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 
+
 #include <boost/geometry/core/tags.hpp>
 
-namespace boost { namespace geometry
-{
-
-/// OGC Multi point identifying tag
-struct multi_point_tag : multi_tag, pointlike_tag  {};
-
-/// OGC Multi linestring identifying tag
-struct multi_linestring_tag : multi_tag, linear_tag {};
-
-/// OGC Multi polygon identifying tag
-struct multi_polygon_tag : multi_tag, polygonal_tag {};
-
-/// OGC Geometry Collection identifying tag
-struct geometry_collection_tag : multi_tag {};
-
-
-
-
-/*!
-\brief Meta-function to get for a tag of a multi-geometry
-    the tag of the corresponding single-geometry
-*/
-template <typename Tag>
-struct single_tag_of
-{};
-
-#ifndef DOXYGEN_NO_DETAIL
-
-template <>
-struct single_tag_of<multi_point_tag>
-{
-    typedef point_tag type;
-};
-
-template <>
-struct single_tag_of<multi_linestring_tag>
-{
-    typedef linestring_tag type;
-};
-
-template <>
-struct single_tag_of<multi_polygon_tag>
-{
-    typedef polygon_tag type;
-};
-
-#endif
-
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
diff --git a/include/boost/geometry/multi/core/topological_dimension.hpp b/include/boost/geometry/multi/core/topological_dimension.hpp
index 55118f1c7..b4f1e89ae 100644
--- a/include/boost/geometry/multi/core/topological_dimension.hpp
+++ b/include/boost/geometry/multi/core/topological_dimension.hpp
@@ -16,37 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_TOPOLOGICAL_DIMENSION_HPP
 
 
-#include <boost/mpl/int.hpp>
-
-
 #include <boost/geometry/core/topological_dimension.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <>
-struct top_dim<multi_point_tag> : boost::mpl::int_<0> {};
-
-
-template <>
-struct top_dim<multi_linestring_tag> : boost::mpl::int_<1> {};
-
-
-template <>
-struct top_dim<multi_polygon_tag> : boost::mpl::int_<2> {};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif