diff --git a/doc/doxy/Doxyfile b/doc/doxy/Doxyfile
index f6eda4d2c..8244b1b12 100644
--- a/doc/doxy/Doxyfile
+++ b/doc/doxy/Doxyfile
@@ -192,7 +192,6 @@ INPUT                  = . .. ../../../../boost/geometry/core \
 			../../../../boost/geometry/multi/geometries \
 			../../../../boost/geometry/multi/geometries/register \
 			../../../../boost/geometry/multi/geometries/concepts \
-			../../../../boost/geometry/multi/iterators \
 			../../../../boost/geometry/multi/strategies/cartesian \
 			../../../../boost/geometry/policies \
 			../../../../boost/geometry/policies/relate \
@@ -204,7 +203,6 @@ INPUT                  = . .. ../../../../boost/geometry/core \
 			../../../../boost/geometry/strategies/transform \
 			../../../../boost/geometry/util \
 			../../../../boost/geometry/views \
-			../../../../boost/geometry/extensions/io/svg \
 			./doxygen_input/pages \
 			./doxygen_input/groups
 INPUT_ENCODING         = UTF-8
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
index dd3594c7e..2f47e73a1 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_2.cpp
@@ -20,7 +20,7 @@ OBSOLETE
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/algorithms/overlaps.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/cartesian2d.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 #include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
index c78f99745..b837b1dce 100644
--- a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
+++ b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
@@ -13,6 +13,7 @@ OBSOLETE
 #include <fstream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/multi/multi.hpp>
 
diff --git a/doc/geometry.qbk b/doc/geometry.qbk
index b42891feb..0f62fa731 100644
--- a/doc/geometry.qbk
+++ b/doc/geometry.qbk
@@ -72,6 +72,7 @@ All algorithms in Boost.Geometry will check any geometry arguments against the c
 [def __boost_range__ Boost.Range]
 [def __boost_tuple__ Boost.Tuple]
 [def __boost_gil__ [@http://www.boost.org/libs/gil/ Boost.GIL]]
+[def __boost_bb__ Boost.Build]
 
 [def __ttmath__ [@http://www.ttmath.org/ ttmath]]
 [def __ogc__ [@http://www.opengeospatial.org OGC]]
@@ -91,6 +92,7 @@ Boost.Geometry contains contributions by:
 [include quickstart.qbk]
 
 [include design_rationale.qbk]
+[include compiling.qbk]
 [include matrix.qbk]
 [include reference.qbk]
 [include about_documentation.qbk]
diff --git a/doc/quickbook/misc.qbk b/doc/quickbook/misc.qbk
index e97074741..e446b543d 100644
--- a/doc/quickbook/misc.qbk
+++ b/doc/quickbook/misc.qbk
@@ -15,143 +15,6 @@
 ['TODO: about giving birth here...]
 [endsect] [/ end of Release Notes]
 
-[section Compilation]
-
-__boost_geometry__ is a headers-only library. Users only need to include the library
-headers in their programs in order to be able to access definitions and algorithms
-provided by the __boost_geometry__ library. No linking against any binaries is required.
-
-__boost_geometry__ is only dependant on headers-only __boost__ libraries.
-It does not introduce indirect dependencies on any binary libraries.
-
-In order to be able to use __boost_geometry__, the only thing users need to do is to
-install __boost_cpp_lib__  and specify location to include directories, so `include`
-directives of this scheme will work:
-
-    #include <boost/...>
-
-[heading Supported Compilers]
-
-__boost_geometry__ library has been successfully tested with the following compilers:
-
-* __msvc__ (including Express Edition)
-  *  9.0 (__msvs__ 2008)
-  *  8.0 (__msvs__ 2005)
-* __gcc__
-  * 4.x (confirmed versoins 4.1, 4.2, 4.4)
-  * 3.4
-
-For __msvs__, the examples contains some project files (for 2005). However, because the library
-is header only, it will be no problem to integrate it in your own project files.
-
-__boost_geometry__ uses __boost_bb__, a text-based system for developing and testing software, to 
-configure, build and execute unit tests and example programs. The build configuration is provided 
-as a collection of `Jamfile.v2` files.
-
-For __gcc__ , flag `-Wno-long-long` can be used to surpress some warnings originating from Boost.
-
-[heading Basic Includes]
-
-This section concentrates on how to include __boost_geometry__ headers efficiently.
-
-['TODO: link header names to files? --mloskot]
-
-The most convenient headerfile including all algorithms and strategies is `geometry.hpp`:
-
-    #include <boost/geometry/geometry.hpp>
-
-This is the main header of the __boost_geometry__ library and it is recommended to include this file.
-
-Alternatively, it is possible to include __boost_geometry__ header files separately. However,
-this may be inconvenient as header files might be renamed or moved occasionaly in future.
-
-Another often used header is `geometries.hpp`:
-
-    #include <boost/geometry/geometries/geometries.hpp>
-
-This includes definitions of all provided geometry tyoes: __model_point__, linestring, polygon,
-linear_ring, box. The `geometries.hpp` is not included in the `geometry.hpp` headerfile because
-users should be given the liberty to use their own geometries and not the provided ones.
-However, for the __boost_geometry__ users who want to use the provided geometries it is
-useful to include it.
-
-For users using only Cartesian points, with floating point coordinates (of C++ type `double`),
-in 2D or 3D, you can use instead:
-
-    #include <boost/geometry/geometries/cartesian2d.hpp>
-
-This includes all 2D Cartesian geometries: point_2d, linestring_2d, etc.
-Using this header file, the library seems to be a non-template library, so it is convenient
-for users who do not feel strong with using and specializing C++ templates on their own.
-
-For users using multi-geometries:
-
-    #include <boost/geometry/multi/multi.hpp>
-
-[heading Advanced Includes]
-
-This section is for users who have their own geometries and want to use algorithms from
-the __boost_geometry__ library.
-
-If you want to use your own points it makes sense to use the registration macro's:
-
-    #include <boost/geometry/geometries/register/point.hpp>
-
-Defines preprocessor macros for point geometry types registration.
-
-    #include <boost/geometry/geometries/register/box.hpp>
-
-Defines preprocessor macros for box geometry type registration.
-
-If you are using standard containers containing points and want to handle them as a linestring.
-
-    #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
-
-Allows you to use things like `std::vector<point_2d>` and put them as parameters into algorithms.
-
-If you are using boost tuples and want to handle them as Cartesian points
-
-    #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
-
-[heading Extensions]
-
-['TODO: Do we want this sub-section here? or moving completely to the Extensions node? --mloskot]
-
-[section Hints]
-
-[heading Performance]
-
-The enumeration below is not exhaustive but can contain hints to improve the performance:
-
-* For Microsoft __msvc__, set define `_SECURE_SCL=0` for preprocessor.
-* For Microsoft __msvc__, set define `_HAS_ITERATOR_DEBUGGING=0` for preprocessor.
-* Our measurements indicate that Visual C++ 8.0 generates faster code than Visual C++ 9.0
-* Use of __stlport__, a very popular open-source implementation of the STL, may result in
-  significantly faster code than use of the C++ standard library provided by __msvc__ compiler.
-* Turn on compiler optimizations, compile in release mode.
-
-[endsect] [/ end of Hints]
-
-[section:issues Known Problems]
-
-[heading Problems with Intellisense]
-
-Both versions of __msvs__, 2005 and 2008  (including Express Edition) can hang trying to resolve
-symbols and give [@http://en.wikipedia.org/wiki/IntelliSense IntelliSense] suggestions while
-typing in a bracket or angle bracket.
-This is not directly related to __boost_geometry__, but is caused by problems with handling by this
-IDE large C++ code base with intensively used templates, such as Boost and __boost_geometry__.
-If this is inconvenient, IntelliSense can easily be turned off:
-
-[:['["(...)disabling IntelliSense in VC++. There is a file called `feacp.dll` in
-`<VS8INSTALL>/VC/vcpackages` folder. Renaming this file will disable Intellisense feature.]]
-
--- [@http://blogs.msdn.com/yash/archive/2007/09/19/intellisense-issues-in-visual-c-2005.aspx Intellisense issues in Visual C++ 2005] 
-]
-
-[endsect] [/ end of Problems]
-
-[endsect] [/ end of Compilation]
 
 [section Performance (?)]
 ['TODO: how fast we are here...]
diff --git a/doc/src/examples/algorithms/append.cpp b/doc/src/examples/algorithms/append.cpp
index f4392d645..e3ccd1425 100644
--- a/doc/src/examples/algorithms/append.cpp
+++ b/doc/src/examples/algorithms/append.cpp
@@ -15,7 +15,7 @@
 #include <boost/assign.hpp>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/area.cpp b/doc/src/examples/algorithms/area.cpp
index 597bec3b4..5b5ef9179 100644
--- a/doc/src/examples/algorithms/area.cpp
+++ b/doc/src/examples/algorithms/area.cpp
@@ -11,7 +11,10 @@
 //` Calculate the area of a polygon
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 namespace bg = boost::geometry; /*< Convenient namespace alias >*/
diff --git a/doc/src/examples/algorithms/area_with_strategy.cpp b/doc/src/examples/algorithms/area_with_strategy.cpp
index cefbf39a2..d47120889 100644
--- a/doc/src/examples/algorithms/area_with_strategy.cpp
+++ b/doc/src/examples/algorithms/area_with_strategy.cpp
@@ -11,7 +11,10 @@
 //` Calculate the area of a polygon
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 namespace bg = boost::geometry; /*< Convenient namespace alias >*/
diff --git a/doc/src/examples/algorithms/assign.cpp b/doc/src/examples/algorithms/assign.cpp
index 94482adb4..aa45a3c58 100644
--- a/doc/src/examples/algorithms/assign.cpp
+++ b/doc/src/examples/algorithms/assign.cpp
@@ -13,6 +13,9 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/assign_2d_point.cpp b/doc/src/examples/algorithms/assign_2d_point.cpp
index f21f47e0e..84dbbe690 100644
--- a/doc/src/examples/algorithms/assign_2d_point.cpp
+++ b/doc/src/examples/algorithms/assign_2d_point.cpp
@@ -14,7 +14,7 @@
 #include <iomanip>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #if defined(HAVE_TTMATH)
 #  include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
diff --git a/doc/src/examples/algorithms/assign_3d_point.cpp b/doc/src/examples/algorithms/assign_3d_point.cpp
index 094b8869b..d7863ad7d 100644
--- a/doc/src/examples/algorithms/assign_3d_point.cpp
+++ b/doc/src/examples/algorithms/assign_3d_point.cpp
@@ -14,7 +14,7 @@
 #include <iomanip>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/assign_box_corners.cpp b/doc/src/examples/algorithms/assign_box_corners.cpp
index e74545bed..1cb8d40db 100644
--- a/doc/src/examples/algorithms/assign_box_corners.cpp
+++ b/doc/src/examples/algorithms/assign_box_corners.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/algorithms/assign_inverse.cpp b/doc/src/examples/algorithms/assign_inverse.cpp
index 27d1fdf11..06284fed5 100644
--- a/doc/src/examples/algorithms/assign_inverse.cpp
+++ b/doc/src/examples/algorithms/assign_inverse.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/algorithms/assign_point_from_index.cpp b/doc/src/examples/algorithms/assign_point_from_index.cpp
index 06a684afe..fb609cba5 100644
--- a/doc/src/examples/algorithms/assign_point_from_index.cpp
+++ b/doc/src/examples/algorithms/assign_point_from_index.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/segment.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/algorithms/assign_point_to_index.cpp b/doc/src/examples/algorithms/assign_point_to_index.cpp
index db73730ef..19ec66faa 100644
--- a/doc/src/examples/algorithms/assign_point_to_index.cpp
+++ b/doc/src/examples/algorithms/assign_point_to_index.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/algorithms/assign_points.cpp b/doc/src/examples/algorithms/assign_points.cpp
index d43321da2..aea224a62 100644
--- a/doc/src/examples/algorithms/assign_points.cpp
+++ b/doc/src/examples/algorithms/assign_points.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 #include <boost/assign.hpp>
diff --git a/doc/src/examples/algorithms/centroid.cpp b/doc/src/examples/algorithms/centroid.cpp
index 49bb80cde..ce4380072 100644
--- a/doc/src/examples/algorithms/centroid.cpp
+++ b/doc/src/examples/algorithms/centroid.cpp
@@ -14,7 +14,8 @@
 #include <list>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 /*<-*/ #include "create_svg_two.hpp" /*->*/
diff --git a/doc/src/examples/algorithms/clear.cpp b/doc/src/examples/algorithms/clear.cpp
index 20f9deba1..5a6de8694 100644
--- a/doc/src/examples/algorithms/clear.cpp
+++ b/doc/src/examples/algorithms/clear.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/comparable_distance.cpp b/doc/src/examples/algorithms/comparable_distance.cpp
index 64df6d56d..e4d6f7035 100644
--- a/doc/src/examples/algorithms/comparable_distance.cpp
+++ b/doc/src/examples/algorithms/comparable_distance.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/numeric/conversion/bounds.hpp>
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/convert.cpp b/doc/src/examples/algorithms/convert.cpp
index 6baf27c5a..6ca97d9ad 100644
--- a/doc/src/examples/algorithms/convert.cpp
+++ b/doc/src/examples/algorithms/convert.cpp
@@ -13,6 +13,9 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/convex_hull.cpp b/doc/src/examples/algorithms/convex_hull.cpp
index 2f826e148..df4d35f7f 100644
--- a/doc/src/examples/algorithms/convex_hull.cpp
+++ b/doc/src/examples/algorithms/convex_hull.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/correct.cpp b/doc/src/examples/algorithms/correct.cpp
index ec8753dd7..2fac51225 100644
--- a/doc/src/examples/algorithms/correct.cpp
+++ b/doc/src/examples/algorithms/correct.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/difference.cpp b/doc/src/examples/algorithms/difference.cpp
index 03f5cf954..2ec6ce5d4 100644
--- a/doc/src/examples/algorithms/difference.cpp
+++ b/doc/src/examples/algorithms/difference.cpp
@@ -14,7 +14,8 @@
 #include <list>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/difference_inserter.cpp b/doc/src/examples/algorithms/difference_inserter.cpp
index 60d8883ac..17d4f339b 100644
--- a/doc/src/examples/algorithms/difference_inserter.cpp
+++ b/doc/src/examples/algorithms/difference_inserter.cpp
@@ -14,7 +14,8 @@
 #include <vector>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/distance.cpp b/doc/src/examples/algorithms/distance.cpp
index bc77e9f0e..e2067772d 100644
--- a/doc/src/examples/algorithms/distance.cpp
+++ b/doc/src/examples/algorithms/distance.cpp
@@ -14,8 +14,11 @@
 #include <list>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/envelope.cpp b/doc/src/examples/algorithms/envelope.cpp
index fd310dae2..89f72a612 100644
--- a/doc/src/examples/algorithms/envelope.cpp
+++ b/doc/src/examples/algorithms/envelope.cpp
@@ -13,7 +13,9 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 /*<-*/ #include "create_svg_two.hpp" /*->*/
diff --git a/doc/src/examples/algorithms/equals.cpp b/doc/src/examples/algorithms/equals.cpp
index 4b8df5f34..414aa38d3 100644
--- a/doc/src/examples/algorithms/equals.cpp
+++ b/doc/src/examples/algorithms/equals.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/for_each_point.cpp b/doc/src/examples/algorithms/for_each_point.cpp
index f5a42ba55..138086413 100644
--- a/doc/src/examples/algorithms/for_each_point.cpp
+++ b/doc/src/examples/algorithms/for_each_point.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 
diff --git a/doc/src/examples/algorithms/for_each_point_const.cpp b/doc/src/examples/algorithms/for_each_point_const.cpp
index 8b29ef1e9..2654e519e 100644
--- a/doc/src/examples/algorithms/for_each_point_const.cpp
+++ b/doc/src/examples/algorithms/for_each_point_const.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 
diff --git a/doc/src/examples/algorithms/for_each_segment_const.cpp b/doc/src/examples/algorithms/for_each_segment_const.cpp
index c1ae26236..b17d7417c 100644
--- a/doc/src/examples/algorithms/for_each_segment_const.cpp
+++ b/doc/src/examples/algorithms/for_each_segment_const.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/assign.hpp>
 
diff --git a/doc/src/examples/algorithms/intersection_ls_ls_point.cpp b/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
index a4ef55ef6..44bb4d41d 100644
--- a/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
+++ b/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
@@ -15,6 +15,7 @@
 
 #include <boost/geometry.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp> /*< Adapts std::vector to linestring concept >*/
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/intersection_poly_poly.cpp b/doc/src/examples/algorithms/intersection_poly_poly.cpp
index 0966e1446..2274205fe 100644
--- a/doc/src/examples/algorithms/intersection_poly_poly.cpp
+++ b/doc/src/examples/algorithms/intersection_poly_poly.cpp
@@ -14,7 +14,8 @@
 #include <deque>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/intersection_segment.cpp b/doc/src/examples/algorithms/intersection_segment.cpp
index d9a902436..1c59c63b6 100644
--- a/doc/src/examples/algorithms/intersection_segment.cpp
+++ b/doc/src/examples/algorithms/intersection_segment.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp> /*< Adapts std::vector to linestring concept >*/
 
diff --git a/doc/src/examples/algorithms/intersects_linestring.cpp b/doc/src/examples/algorithms/intersects_linestring.cpp
index 536c649e7..4c72fcda5 100644
--- a/doc/src/examples/algorithms/intersects_linestring.cpp
+++ b/doc/src/examples/algorithms/intersects_linestring.cpp
@@ -13,6 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/intersects_segment.cpp b/doc/src/examples/algorithms/intersects_segment.cpp
index 9c98a3085..428b34c3f 100644
--- a/doc/src/examples/algorithms/intersects_segment.cpp
+++ b/doc/src/examples/algorithms/intersects_segment.cpp
@@ -13,6 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/length.cpp b/doc/src/examples/algorithms/length.cpp
index 506a3e6b5..0c6ec9140 100644
--- a/doc/src/examples/algorithms/length.cpp
+++ b/doc/src/examples/algorithms/length.cpp
@@ -12,6 +12,8 @@
 
 #include <iostream>
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 
diff --git a/doc/src/examples/algorithms/length_with_strategy.cpp b/doc/src/examples/algorithms/length_with_strategy.cpp
index 32eb6d39b..2c68f3ae8 100644
--- a/doc/src/examples/algorithms/length_with_strategy.cpp
+++ b/doc/src/examples/algorithms/length_with_strategy.cpp
@@ -12,6 +12,7 @@
 
 #include <iostream>
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/make_2d_point.cpp b/doc/src/examples/algorithms/make_2d_point.cpp
index 8c6189b3b..7e776ae77 100644
--- a/doc/src/examples/algorithms/make_2d_point.cpp
+++ b/doc/src/examples/algorithms/make_2d_point.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>
diff --git a/doc/src/examples/algorithms/make_3d_point.cpp b/doc/src/examples/algorithms/make_3d_point.cpp
index 4605bb81a..88349894b 100644
--- a/doc/src/examples/algorithms/make_3d_point.cpp
+++ b/doc/src/examples/algorithms/make_3d_point.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/make_inverse.cpp b/doc/src/examples/algorithms/make_inverse.cpp
index 20dd5fc37..660013655 100644
--- a/doc/src/examples/algorithms/make_inverse.cpp
+++ b/doc/src/examples/algorithms/make_inverse.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/algorithms/make_with_range.cpp b/doc/src/examples/algorithms/make_with_range.cpp
index faf97f707..19939f85c 100644
--- a/doc/src/examples/algorithms/make_with_range.cpp
+++ b/doc/src/examples/algorithms/make_with_range.cpp
@@ -13,6 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) /*< Necessary to register a C array like {1,2} as a point >*/
diff --git a/doc/src/examples/algorithms/num_geometries.cpp b/doc/src/examples/algorithms/num_geometries.cpp
index d66735de7..43aa29c8e 100644
--- a/doc/src/examples/algorithms/num_geometries.cpp
+++ b/doc/src/examples/algorithms/num_geometries.cpp
@@ -13,8 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/num_interior_rings.cpp b/doc/src/examples/algorithms/num_interior_rings.cpp
index b6edc4a67..9d8a54108 100644
--- a/doc/src/examples/algorithms/num_interior_rings.cpp
+++ b/doc/src/examples/algorithms/num_interior_rings.cpp
@@ -13,8 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/num_points.cpp b/doc/src/examples/algorithms/num_points.cpp
index be0c1492a..20a0df0e5 100644
--- a/doc/src/examples/algorithms/num_points.cpp
+++ b/doc/src/examples/algorithms/num_points.cpp
@@ -14,7 +14,8 @@
 
 #include <boost/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/return_envelope.cpp b/doc/src/examples/algorithms/return_envelope.cpp
index cb8914e5d..27701150c 100644
--- a/doc/src/examples/algorithms/return_envelope.cpp
+++ b/doc/src/examples/algorithms/return_envelope.cpp
@@ -14,7 +14,9 @@
 
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 
 #include <boost/assign.hpp>
 
diff --git a/doc/src/examples/algorithms/reverse.cpp b/doc/src/examples/algorithms/reverse.cpp
index f12c72281..ef45f9adf 100644
--- a/doc/src/examples/algorithms/reverse.cpp
+++ b/doc/src/examples/algorithms/reverse.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/simplify.cpp b/doc/src/examples/algorithms/simplify.cpp
index db4a97bfb..e44c11d0a 100644
--- a/doc/src/examples/algorithms/simplify.cpp
+++ b/doc/src/examples/algorithms/simplify.cpp
@@ -11,7 +11,10 @@
 //` Example showing how to simplify a linestring
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 /*< For this example we use Boost.Assign to add points >*/
 #include <boost/assign.hpp>
diff --git a/doc/src/examples/algorithms/simplify_insert.cpp b/doc/src/examples/algorithms/simplify_insert.cpp
index d93034dfd..d3cb0f2a4 100644
--- a/doc/src/examples/algorithms/simplify_insert.cpp
+++ b/doc/src/examples/algorithms/simplify_insert.cpp
@@ -11,7 +11,10 @@
 //` Simplify a linestring using a back inserter
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp b/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
index 3236fee0b..a662e27ff 100644
--- a/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
+++ b/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
@@ -11,7 +11,10 @@
 //` Simplify a linestring using an output iterator
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 #include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/sym_difference.cpp b/doc/src/examples/algorithms/sym_difference.cpp
index 7f0bf779f..7d122c42f 100644
--- a/doc/src/examples/algorithms/sym_difference.cpp
+++ b/doc/src/examples/algorithms/sym_difference.cpp
@@ -13,7 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/union.cpp b/doc/src/examples/algorithms/union.cpp
index 79c35298a..84ab620c6 100644
--- a/doc/src/examples/algorithms/union.cpp
+++ b/doc/src/examples/algorithms/union.cpp
@@ -14,7 +14,8 @@
 #include <vector>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/unique.cpp b/doc/src/examples/algorithms/unique.cpp
index 1c3511272..6c3455cea 100644
--- a/doc/src/examples/algorithms/unique.cpp
+++ b/doc/src/examples/algorithms/unique.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/algorithms/within.cpp b/doc/src/examples/algorithms/within.cpp
index 24d33bdcc..27217f748 100644
--- a/doc/src/examples/algorithms/within.cpp
+++ b/doc/src/examples/algorithms/within.cpp
@@ -14,7 +14,8 @@
 #include <list>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 /*<-*/ #include "create_svg_two.hpp" /*->*/
diff --git a/doc/src/examples/core/closure.cpp b/doc/src/examples/core/closure.cpp
index db4c5e406..e254f978c 100644
--- a/doc/src/examples/core/closure.cpp
+++ b/doc/src/examples/core/closure.cpp
@@ -11,7 +11,10 @@
 //` Examine if a polygon is defined as "should be closed"
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/coordinate_dimension.cpp b/doc/src/examples/core/coordinate_dimension.cpp
index 47fda0163..1ba7db439 100644
--- a/doc/src/examples/core/coordinate_dimension.cpp
+++ b/doc/src/examples/core/coordinate_dimension.cpp
@@ -11,7 +11,9 @@
 //` Examine the number of coordinates making up the points in a linestring type
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
diff --git a/doc/src/examples/core/coordinate_system.cpp b/doc/src/examples/core/coordinate_system.cpp
index 6969a27a2..cbae9e05e 100644
--- a/doc/src/examples/core/coordinate_system.cpp
+++ b/doc/src/examples/core/coordinate_system.cpp
@@ -12,7 +12,10 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/coordinate_type.cpp b/doc/src/examples/core/coordinate_type.cpp
index 3fffafa5f..ed7260478 100644
--- a/doc/src/examples/core/coordinate_type.cpp
+++ b/doc/src/examples/core/coordinate_type.cpp
@@ -12,7 +12,10 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/get_box.cpp b/doc/src/examples/core/get_box.cpp
index 181721267..b0d179a7a 100644
--- a/doc/src/examples/core/get_box.cpp
+++ b/doc/src/examples/core/get_box.cpp
@@ -11,7 +11,9 @@
 //` Get the coordinate of a box
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/get_point.cpp b/doc/src/examples/core/get_point.cpp
index cd0243e52..4af8c0e3c 100644
--- a/doc/src/examples/core/get_point.cpp
+++ b/doc/src/examples/core/get_point.cpp
@@ -11,7 +11,9 @@
 //` Get the coordinate of a point
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/interior_type.cpp b/doc/src/examples/core/interior_type.cpp
index 79b22a914..b9f577903 100644
--- a/doc/src/examples/core/interior_type.cpp
+++ b/doc/src/examples/core/interior_type.cpp
@@ -12,7 +12,10 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/adapted/boost_array.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
diff --git a/doc/src/examples/core/point_order.cpp b/doc/src/examples/core/point_order.cpp
index dede853cd..ff0922354 100644
--- a/doc/src/examples/core/point_order.cpp
+++ b/doc/src/examples/core/point_order.cpp
@@ -11,7 +11,10 @@
 //` Examine the expected point order of a polygon type
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/point_type.cpp b/doc/src/examples/core/point_type.cpp
index 51508511c..357749655 100644
--- a/doc/src/examples/core/point_type.cpp
+++ b/doc/src/examples/core/point_type.cpp
@@ -12,7 +12,11 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/ring_type.cpp b/doc/src/examples/core/ring_type.cpp
index cae4dfd2b..01446df01 100644
--- a/doc/src/examples/core/ring_type.cpp
+++ b/doc/src/examples/core/ring_type.cpp
@@ -12,7 +12,10 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/rings.cpp b/doc/src/examples/core/rings.cpp
index 30a32b86f..555370d88 100644
--- a/doc/src/examples/core/rings.cpp
+++ b/doc/src/examples/core/rings.cpp
@@ -15,7 +15,10 @@ Also shows the related ring_type and interior_type.
 */
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 int main()
diff --git a/doc/src/examples/core/set_box.cpp b/doc/src/examples/core/set_box.cpp
index 1c56572b1..ae1db4877 100644
--- a/doc/src/examples/core/set_box.cpp
+++ b/doc/src/examples/core/set_box.cpp
@@ -11,7 +11,9 @@
 //` Set the coordinate of a box
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/set_point.cpp b/doc/src/examples/core/set_point.cpp
index 39520c921..d4a627d63 100644
--- a/doc/src/examples/core/set_point.cpp
+++ b/doc/src/examples/core/set_point.cpp
@@ -11,7 +11,9 @@
 //` Set the coordinate of a point
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/tag.cpp b/doc/src/examples/core/tag.cpp
index 215e77f23..86e8f5a83 100644
--- a/doc/src/examples/core/tag.cpp
+++ b/doc/src/examples/core/tag.cpp
@@ -15,6 +15,8 @@
 #include <boost/assign.hpp>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/core/tag_cast.cpp b/doc/src/examples/core/tag_cast.cpp
index f33345706..019e1edd1 100644
--- a/doc/src/examples/core/tag_cast.cpp
+++ b/doc/src/examples/core/tag_cast.cpp
@@ -12,7 +12,10 @@
 
 #include <iostream>
 #include <typeinfo>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 namespace geo = boost::geometry;
 int main()
diff --git a/doc/src/examples/geometries/adapted/boost_array.cpp b/doc/src/examples/geometries/adapted/boost_array.cpp
index 99aa8a3d7..b1237318f 100644
--- a/doc/src/examples/geometries/adapted/boost_array.cpp
+++ b/doc/src/examples/geometries/adapted/boost_array.cpp
@@ -11,7 +11,9 @@
 //` Shows how to use a Boost.Array using Boost.Geometry's distance, set and assign_values algorithms
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/adapted/boost_array.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
diff --git a/doc/src/examples/geometries/adapted/boost_range/filtered.cpp b/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
index e215594d0..bdf05ef0c 100644
--- a/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
@@ -11,7 +11,10 @@
 //` Shows how to use a Boost.Geometry linestring, filtered by Boost.Range adaptor
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/filtered.hpp>
 
 struct not_two
diff --git a/doc/src/examples/geometries/adapted/boost_range/reversed.cpp b/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
index 5bdf5e2ce..6ba3a6b79 100644
--- a/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
@@ -11,7 +11,10 @@
 //` Shows how to use a Boost.Geometry linestring, reversed by Boost.Range adaptor
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/reversed.hpp>
 
 int main()
diff --git a/doc/src/examples/geometries/adapted/boost_range/sliced.cpp b/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
index eb65621f2..d4fe398af 100644
--- a/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
@@ -15,6 +15,8 @@
 #include <boost/assign.hpp>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/sliced.hpp>
 
 
diff --git a/doc/src/examples/geometries/adapted/boost_range/strided.cpp b/doc/src/examples/geometries/adapted/boost_range/strided.cpp
index 08ae880f6..2472337f5 100644
--- a/doc/src/examples/geometries/adapted/boost_range/strided.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/strided.cpp
@@ -15,6 +15,8 @@
 #include <boost/assign.hpp>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/strided.hpp>
 
 
diff --git a/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp b/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
index 1d75c6980..f0cd9b01e 100644
--- a/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
@@ -15,6 +15,8 @@
 #include <boost/assign.hpp>
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/uniqued.hpp>
 
 typedef boost::geometry::model::d2::point_xy<int> xy;
diff --git a/doc/src/examples/geometries/adapted/boost_tuple.cpp b/doc/src/examples/geometries/adapted/boost_tuple.cpp
index 67a51836d..1ff67be3f 100644
--- a/doc/src/examples/geometries/adapted/boost_tuple.cpp
+++ b/doc/src/examples/geometries/adapted/boost_tuple.cpp
@@ -17,7 +17,9 @@ various other examples as well.
 */
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
diff --git a/doc/src/examples/geometries/register/box_templated.cpp b/doc/src/examples/geometries/register/box_templated.cpp
index 72e0a589f..1b0378f74 100644
--- a/doc/src/examples/geometries/register/box_templated.cpp
+++ b/doc/src/examples/geometries/register/box_templated.cpp
@@ -11,7 +11,9 @@
 //` Show the use of the macro BOOST_GEOMETRY_REGISTER_BOX_TEMPLATED
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/box.hpp>
 
 template <typename P>
diff --git a/doc/src/examples/geometries/register/linestring.cpp b/doc/src/examples/geometries/register/linestring.cpp
index bbbbe0b48..f810d3eb2 100644
--- a/doc/src/examples/geometries/register/linestring.cpp
+++ b/doc/src/examples/geometries/register/linestring.cpp
@@ -11,7 +11,9 @@
 //` Show the use of BOOST_GEOMETRY_REGISTER_LINESTRING
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
 
 typedef boost::geometry::model::d2::point_xy<double> point_2d;
diff --git a/doc/src/examples/geometries/register/linestring_templated.cpp b/doc/src/examples/geometries/register/linestring_templated.cpp
index 221c61a58..188df627b 100644
--- a/doc/src/examples/geometries/register/linestring_templated.cpp
+++ b/doc/src/examples/geometries/register/linestring_templated.cpp
@@ -12,7 +12,9 @@
 
 #include <iostream>
 #include <deque>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
 
 // Adapt any deque to Boost.Geometry Linestring Concept
diff --git a/doc/src/examples/geometries/register/multi_linestring.cpp b/doc/src/examples/geometries/register/multi_linestring.cpp
index ab72a92cf..56b71dddb 100644
--- a/doc/src/examples/geometries/register/multi_linestring.cpp
+++ b/doc/src/examples/geometries/register/multi_linestring.cpp
@@ -11,7 +11,9 @@
 //` Show the use of the macro BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/multi/geometries/register/multi_linestring.hpp>
 
diff --git a/doc/src/examples/geometries/register/multi_polygon.cpp b/doc/src/examples/geometries/register/multi_polygon.cpp
index db6a3130d..aa89e73e1 100644
--- a/doc/src/examples/geometries/register/multi_polygon.cpp
+++ b/doc/src/examples/geometries/register/multi_polygon.cpp
@@ -11,7 +11,9 @@
 //` Show the use of the macro BOOST_GEOMETRY_REGISTER_MULTI_POLYGON
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/multi/geometries/register/multi_polygon.hpp>
 
diff --git a/doc/src/examples/geometries/register/ring.cpp b/doc/src/examples/geometries/register/ring.cpp
index bad0e3a54..0b550521d 100644
--- a/doc/src/examples/geometries/register/ring.cpp
+++ b/doc/src/examples/geometries/register/ring.cpp
@@ -11,7 +11,9 @@
 //` Show the use of the macro BOOST_GEOMETRY_REGISTER_RING
 
 #include <iostream>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
 
 typedef boost::geometry::model::d2::point_xy<double> point_2d;
diff --git a/doc/src/examples/geometries/register/ring_templated.cpp b/doc/src/examples/geometries/register/ring_templated.cpp
index 13308ef3d..28a4d5d2f 100644
--- a/doc/src/examples/geometries/register/ring_templated.cpp
+++ b/doc/src/examples/geometries/register/ring_templated.cpp
@@ -12,7 +12,9 @@
 
 #include <iostream>
 #include <deque>
+
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
 
 // Adapt any deque to Boost.Geometry Ring Concept
diff --git a/doc/src/examples/quick_start.cpp b/doc/src/examples/quick_start.cpp
index b246afad0..ff96b19c7 100644
--- a/doc/src/examples/quick_start.cpp
+++ b/doc/src/examples/quick_start.cpp
@@ -22,6 +22,8 @@
 //[quickstart_include
 
 #include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 
 using namespace boost::geometry;
 //]
diff --git a/example/01_point_example.cpp b/example/01_point_example.cpp
index 6d5e782b4..b9e9c6342 100644
--- a/example/01_point_example.cpp
+++ b/example/01_point_example.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_array.hpp>
diff --git a/example/02_linestring_example.cpp b/example/02_linestring_example.cpp
index 8315d1761..ca9b3d27f 100644
--- a/example/02_linestring_example.cpp
+++ b/example/02_linestring_example.cpp
@@ -17,9 +17,13 @@
 #include <vector>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 // Optional includes to handle c-arrays as points, std::vectors as linestrings
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
+
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 
 
diff --git a/example/03_polygon_example.cpp b/example/03_polygon_example.cpp
index e817fa261..cd7bdfd6a 100644
--- a/example/03_polygon_example.cpp
+++ b/example/03_polygon_example.cpp
@@ -15,9 +15,11 @@
 #include <string>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
-#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 
diff --git a/example/04_boost_example.cpp b/example/04_boost_example.cpp
index f6d56cdfe..a92295552 100644
--- a/example/04_boost_example.cpp
+++ b/example/04_boost_example.cpp
@@ -13,6 +13,9 @@
 #include <iostream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 #include <boost/assign.hpp>
diff --git a/example/05_a_overlay_polygon_example.cpp b/example/05_a_overlay_polygon_example.cpp
index 6a81221b1..a5a4c5b43 100644
--- a/example/05_a_overlay_polygon_example.cpp
+++ b/example/05_a_overlay_polygon_example.cpp
@@ -19,6 +19,8 @@
 
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
 #if defined(HAVE_SVG)
diff --git a/example/05_b_overlay_linestring_polygon_example.cpp b/example/05_b_overlay_linestring_polygon_example.cpp
index 118026603..3f90c8f71 100644
--- a/example/05_b_overlay_linestring_polygon_example.cpp
+++ b/example/05_b_overlay_linestring_polygon_example.cpp
@@ -19,6 +19,9 @@
 
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
 #if defined(HAVE_SVG)
diff --git a/example/06_a_transformation_example.cpp b/example/06_a_transformation_example.cpp
index 3c5f6f9b0..6abb7ea79 100644
--- a/example/06_a_transformation_example.cpp
+++ b/example/06_a_transformation_example.cpp
@@ -13,6 +13,8 @@
 #include <iostream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
 
diff --git a/example/06_b_transformation_example.cpp b/example/06_b_transformation_example.cpp
index 0b6a0542b..6580f65a5 100644
--- a/example/06_b_transformation_example.cpp
+++ b/example/06_b_transformation_example.cpp
@@ -16,6 +16,8 @@
 #include <sstream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/algorithms/centroid.hpp>
 #include <boost/geometry/strategies/transform.hpp>
 #include <boost/geometry/strategies/transform/matrix_transformers.hpp>
diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp
index 4ea9c5ae8..929af00a1 100644
--- a/example/07_a_graph_route_example.cpp
+++ b/example/07_a_graph_route_example.cpp
@@ -24,6 +24,7 @@
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
 
diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp
index 64f4844c9..17dbea3a6 100644
--- a/example/07_b_graph_route_example.cpp
+++ b/example/07_b_graph_route_example.cpp
@@ -28,6 +28,7 @@
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
 
diff --git a/example/c04_a_custom_triangle_example.cpp b/example/c04_a_custom_triangle_example.cpp
index ce2a53e15..be1e0ac49 100644
--- a/example/c04_a_custom_triangle_example.cpp
+++ b/example/c04_a_custom_triangle_example.cpp
@@ -16,6 +16,7 @@
 
 #include <boost/geometry/algorithms/area.hpp>
 #include <boost/geometry/algorithms/centroid.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 #include <boost/geometry/util/write_dsv.hpp>
diff --git a/example/c05_custom_point_pointer_example.cpp b/example/c05_custom_point_pointer_example.cpp
index d3787df7e..9819c0f81 100644
--- a/example/c05_custom_point_pointer_example.cpp
+++ b/example/c05_custom_point_pointer_example.cpp
@@ -19,6 +19,7 @@
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/algorithms/intersection.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
index b09f3f3b7..dab9d99a7 100644
--- a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
+++ b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
@@ -18,6 +18,7 @@
 #include <boost/scoped_array.hpp>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
 #include <boost/geometry/multi/multi.hpp>
diff --git a/example/with_external_libs/x05_shapelib_example.cpp b/example/with_external_libs/x05_shapelib_example.cpp
index a136240e1..8fbfe5e0d 100644
--- a/example/with_external_libs/x05_shapelib_example.cpp
+++ b/example/with_external_libs/x05_shapelib_example.cpp
@@ -20,6 +20,7 @@
 #include "shapefil.h"
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
 
 using namespace boost::geometry;
diff --git a/example/with_external_libs/x06_qt_world_mapper.cpp b/example/with_external_libs/x06_qt_world_mapper.cpp
index ebf788c95..0f8e45281 100644
--- a/example/with_external_libs/x06_qt_world_mapper.cpp
+++ b/example/with_external_libs/x06_qt_world_mapper.cpp
@@ -23,6 +23,7 @@
 #include <boost/foreach.hpp>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
 
diff --git a/example_extensions/experimental/geometry_of.cpp b/example_extensions/experimental/geometry_of.cpp
index 71626c2f1..4c14caa73 100644
--- a/example_extensions/experimental/geometry_of.cpp
+++ b/example_extensions/experimental/geometry_of.cpp
@@ -21,6 +21,7 @@
 
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 namespace bg = boost::geometry;
diff --git a/example_extensions/gis/latlong/distance_example.cpp b/example_extensions/gis/latlong/distance_example.cpp
index c1279db28..4ddaa4a07 100644
--- a/example_extensions/gis/latlong/distance_example.cpp
+++ b/example_extensions/gis/latlong/distance_example.cpp
@@ -16,6 +16,8 @@
 
 #include <boost/geometry/geometry.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 #include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
 #include <boost/geometry/strategies/spherical/distance_cross_track.hpp>
diff --git a/example_extensions/gis/projections/p01_projection_example.cpp b/example_extensions/gis/projections/p01_projection_example.cpp
index 5692867e2..95fae63e4 100644
--- a/example_extensions/gis/projections/p01_projection_example.cpp
+++ b/example_extensions/gis/projections/p01_projection_example.cpp
@@ -9,6 +9,7 @@
 // Projection example 1, direct
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/algorithms/parse.hpp>
 #include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
diff --git a/example_extensions/gis/projections/p02_projfactory_example.cpp b/example_extensions/gis/projections/p02_projfactory_example.cpp
index 469fb7c81..627eb3cd6 100644
--- a/example_extensions/gis/projections/p02_projfactory_example.cpp
+++ b/example_extensions/gis/projections/p02_projfactory_example.cpp
@@ -9,6 +9,7 @@
 // Projection example 2, using factory
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 #include <boost/geometry/extensions/gis/projections/parameters.hpp>
diff --git a/example_extensions/gis/projections/p03_projmap_example.cpp b/example_extensions/gis/projections/p03_projmap_example.cpp
index 48f65c245..92f633f0f 100644
--- a/example_extensions/gis/projections/p03_projmap_example.cpp
+++ b/example_extensions/gis/projections/p03_projmap_example.cpp
@@ -11,6 +11,7 @@
 #include <fstream>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/std_as_ring.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/algorithms/area.cpp b/test/algorithms/area.cpp
index c3d56a63e..4ed4e7009 100644
--- a/test/algorithms/area.cpp
+++ b/test/algorithms/area.cpp
@@ -17,6 +17,7 @@
 
 #include <algorithms/test_area.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
diff --git a/test/algorithms/centroid.cpp b/test/algorithms/centroid.cpp
index fab082b06..4781c6c6a 100644
--- a/test/algorithms/centroid.cpp
+++ b/test/algorithms/centroid.cpp
@@ -15,6 +15,7 @@
 #include <algorithms/test_centroid.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
diff --git a/test/algorithms/convex_hull.cpp b/test/algorithms/convex_hull.cpp
index d520a9afc..f36e15391 100644
--- a/test/algorithms/convex_hull.cpp
+++ b/test/algorithms/convex_hull.cpp
@@ -18,6 +18,7 @@
 #include <algorithms/test_convex_hull.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 template <typename P>
diff --git a/test/algorithms/detail/partition.cpp b/test/algorithms/detail/partition.cpp
index 11c689943..339e93605 100644
--- a/test/algorithms/detail/partition.cpp
+++ b/test/algorithms/detail/partition.cpp
@@ -12,6 +12,7 @@
 
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 
 #include <boost/geometry/algorithms/detail/partition.hpp>
diff --git a/test/algorithms/detail/sections/range_by_section.cpp b/test/algorithms/detail/sections/range_by_section.cpp
index 920e95e82..f0643f929 100644
--- a/test/algorithms/detail/sections/range_by_section.cpp
+++ b/test/algorithms/detail/sections/range_by_section.cpp
@@ -17,6 +17,7 @@
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
 #include <boost/geometry/views/detail/range_type.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 
diff --git a/test/algorithms/detail/sections/sectionalize.cpp b/test/algorithms/detail/sections/sectionalize.cpp
index 7071e051e..a52d5b2ef 100644
--- a/test/algorithms/detail/sections/sectionalize.cpp
+++ b/test/algorithms/detail/sections/sectionalize.cpp
@@ -22,9 +22,11 @@
 #include <boost/geometry/algorithms/num_points.hpp>
 #include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
 
+
 #include <test_common/test_point.hpp>
 
 #if defined(TEST_WITH_SVG)
diff --git a/test/algorithms/difference.cpp b/test/algorithms/difference.cpp
index c1564d20b..7787dea3d 100644
--- a/test/algorithms/difference.cpp
+++ b/test/algorithms/difference.cpp
@@ -23,6 +23,8 @@
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 //#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
 //#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
 
diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/disjoint.cpp
index 4e326236b..08084eca9 100644
--- a/test/algorithms/disjoint.cpp
+++ b/test/algorithms/disjoint.cpp
@@ -20,6 +20,7 @@
 
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp
index bce602e41..9cb34ba35 100644
--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance.cpp
@@ -21,6 +21,7 @@
 #include <boost/mpl/if.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_array_as_linestring.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
diff --git a/test/algorithms/envelope.cpp b/test/algorithms/envelope.cpp
index 3896b34b3..27d5f578a 100644
--- a/test/algorithms/envelope.cpp
+++ b/test/algorithms/envelope.cpp
@@ -16,6 +16,7 @@
 #include <algorithms/test_envelope.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/geometries/adapted/std_pair_as_segment.hpp>
diff --git a/test/algorithms/equals.cpp b/test/algorithms/equals.cpp
index 989489a74..7038a00e5 100644
--- a/test/algorithms/equals.cpp
+++ b/test/algorithms/equals.cpp
@@ -8,6 +8,7 @@
 #include <algorithms/test_equals.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 
diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp
index 1e8814d4d..815d107ad 100644
--- a/test/algorithms/intersection.cpp
+++ b/test/algorithms/intersection.cpp
@@ -24,6 +24,7 @@
 #include <algorithms/test_overlay.hpp>
 
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <test_common/test_point.hpp>
 #include <test_common/with_pointer.hpp>
diff --git a/test/algorithms/intersects.cpp b/test/algorithms/intersects.cpp
index 769827c46..4e71452f2 100644
--- a/test/algorithms/intersects.cpp
+++ b/test/algorithms/intersects.cpp
@@ -9,6 +9,7 @@
 
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 template <typename P>
diff --git a/test/algorithms/length.cpp b/test/algorithms/length.cpp
index 1700881e4..151703758 100644
--- a/test/algorithms/length.cpp
+++ b/test/algorithms/length.cpp
@@ -10,6 +10,7 @@
 #include <algorithms/test_length.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/std_pair_as_segment.hpp>
 
 #include <test_geometries/all_custom_linestring.hpp>
diff --git a/test/algorithms/overlaps.cpp b/test/algorithms/overlaps.cpp
index d49404e99..5eff2e12b 100644
--- a/test/algorithms/overlaps.cpp
+++ b/test/algorithms/overlaps.cpp
@@ -9,6 +9,7 @@
 
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 template <typename P>
diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp
index a566bfc95..638b7e571 100644
--- a/test/algorithms/overlay/assemble.cpp
+++ b/test/algorithms/overlay/assemble.cpp
@@ -24,6 +24,7 @@
 #include <boost/geometry/algorithms/within.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test/algorithms/overlay/ccw_traverse.cpp b/test/algorithms/overlay/ccw_traverse.cpp
index ffd74e39f..82f9d3b1e 100644
--- a/test/algorithms/overlay/ccw_traverse.cpp
+++ b/test/algorithms/overlay/ccw_traverse.cpp
@@ -16,6 +16,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #if defined(TEST_WITH_SVG)
diff --git a/test/algorithms/overlay/dissolver.cpp b/test/algorithms/overlay/dissolver.cpp
index 2c298dc59..00b9ac87f 100644
--- a/test/algorithms/overlay/dissolver.cpp
+++ b/test/algorithms/overlay/dissolver.cpp
@@ -16,6 +16,7 @@
 #include <boost/geometry/algorithms/detail/overlay/dissolver.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
diff --git a/test/algorithms/overlay/relative_order.cpp b/test/algorithms/overlay/relative_order.cpp
index 5101347d6..b8b7ec798 100644
--- a/test/algorithms/overlay/relative_order.cpp
+++ b/test/algorithms/overlay/relative_order.cpp
@@ -20,6 +20,8 @@
 #include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_relative_order.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
 #endif
diff --git a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
index 40d7f7a55..94ce0239b 100644
--- a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
+++ b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
@@ -29,6 +29,8 @@
 
 #include <boost/geometry/geometry.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 
 struct star_params
 {
diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp
index 9153170d2..e861ceb7f 100644
--- a/test/algorithms/overlay/robustness/recursive_polygons.cpp
+++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp
@@ -28,6 +28,7 @@
 
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 #include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
diff --git a/test/algorithms/overlay/robustness/star_comb.cpp b/test/algorithms/overlay/robustness/star_comb.cpp
index 445270997..bef2284fb 100644
--- a/test/algorithms/overlay/robustness/star_comb.cpp
+++ b/test/algorithms/overlay/robustness/star_comb.cpp
@@ -30,6 +30,7 @@
 
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 #include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
index 2607113f5..5252506c0 100644
--- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
+++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
@@ -25,6 +25,8 @@
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
 
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
diff --git a/test/algorithms/overlay/select_rings.cpp b/test/algorithms/overlay/select_rings.cpp
index e547b8a1a..e9dcad5e7 100644
--- a/test/algorithms/overlay/select_rings.cpp
+++ b/test/algorithms/overlay/select_rings.cpp
@@ -15,6 +15,9 @@
 #include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
 #include <boost/geometry/algorithms/detail/overlay/assign_parents.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
 #include <boost/assign/list_of.hpp>
diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp
index 7425ec4ac..abdcdea8f 100644
--- a/test/algorithms/overlay/self_intersection_points.cpp
+++ b/test/algorithms/overlay/self_intersection_points.cpp
@@ -24,6 +24,8 @@
 //#include <boost/geometry/algorithms/detail/overlay/self_intersection_points.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
diff --git a/test/algorithms/overlay/split_rings.cpp b/test/algorithms/overlay/split_rings.cpp
index 9495a9b35..229649fbb 100644
--- a/test/algorithms/overlay/split_rings.cpp
+++ b/test/algorithms/overlay/split_rings.cpp
@@ -21,6 +21,8 @@
 #include <boost/geometry/algorithms/detail/overlay/split_rings.hpp>
 #include <boost/geometry/algorithms/area.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp
index 58cbd4ef3..b8d6a4272 100644
--- a/test/algorithms/overlay/traverse_gmp.cpp
+++ b/test/algorithms/overlay/traverse_gmp.cpp
@@ -30,6 +30,7 @@
 
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
diff --git a/test/algorithms/perimeter.cpp b/test/algorithms/perimeter.cpp
index 66fdbfcb4..c564d9765 100644
--- a/test/algorithms/perimeter.cpp
+++ b/test/algorithms/perimeter.cpp
@@ -9,6 +9,7 @@
 
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <algorithms/test_perimeter.hpp>
 
diff --git a/test/algorithms/reverse.cpp b/test/algorithms/reverse.cpp
index 509ecbd81..777401461 100644
--- a/test/algorithms/reverse.cpp
+++ b/test/algorithms/reverse.cpp
@@ -10,6 +10,7 @@
 
 #include <algorithms/test_reverse.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <test_common/test_point.hpp>
 #include <test_geometries/all_custom_linestring.hpp>
diff --git a/test/algorithms/simplify.cpp b/test/algorithms/simplify.cpp
index bebdd6d9d..2555a638e 100644
--- a/test/algorithms/simplify.cpp
+++ b/test/algorithms/simplify.cpp
@@ -17,7 +17,7 @@
 
 #include <algorithms/test_simplify.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
-
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <test_geometries/wrapped_boost_array.hpp>
 #include <test_common/test_point.hpp>
diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp
index af8ba28c7..c8b02e394 100644
--- a/test/algorithms/transform.cpp
+++ b/test/algorithms/transform.cpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/algorithms/transform.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/util/write_dsv.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
diff --git a/test/algorithms/union.cpp b/test/algorithms/union.cpp
index 6f150232c..95d079f1b 100644
--- a/test/algorithms/union.cpp
+++ b/test/algorithms/union.cpp
@@ -23,6 +23,7 @@
 #include <algorithms/test_overlay.hpp>
 
 #include <algorithms/overlay/overlay_cases.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 static std::string javier4[2] =
     {
diff --git a/test/algorithms/unique.cpp b/test/algorithms/unique.cpp
index 1446bc713..02900f8a5 100644
--- a/test/algorithms/unique.cpp
+++ b/test/algorithms/unique.cpp
@@ -10,6 +10,7 @@
 
 #include <algorithms/test_unique.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 
diff --git a/test/algorithms/within.cpp b/test/algorithms/within.cpp
index 9020c364d..ad59f4d78 100644
--- a/test/algorithms/within.cpp
+++ b/test/algorithms/within.cpp
@@ -9,6 +9,7 @@
 
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 template <typename P>
diff --git a/test/geometries/boost_polygon_overlay.cpp b/test/geometries/boost_polygon_overlay.cpp
index d18e2a472..1d15a0a9b 100644
--- a/test/geometries/boost_polygon_overlay.cpp
+++ b/test/geometries/boost_polygon_overlay.cpp
@@ -11,6 +11,7 @@
 
 
 #include <boost/geometry/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_polygon/point.hpp>
 #include <boost/geometry/geometries/adapted/boost_polygon/box.hpp>
 #include <boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
diff --git a/test/geometries/boost_range.cpp b/test/geometries/boost_range.cpp
index 50cc43c88..541b81ef4 100644
--- a/test/geometries/boost_range.cpp
+++ b/test/geometries/boost_range.cpp
@@ -13,6 +13,7 @@
 
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/adjacent_filtered.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/filtered.hpp>
 #include <boost/geometry/geometries/adapted/boost_range/reversed.hpp>
diff --git a/test/iterators/closing_iterator.cpp b/test/iterators/closing_iterator.cpp
index 9b3db2b5a..da4ed95c5 100644
--- a/test/iterators/closing_iterator.cpp
+++ b/test/iterators/closing_iterator.cpp
@@ -24,6 +24,7 @@
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 
 // The closing iterator should also work on normal std:: containers
diff --git a/test/iterators/ever_circling_iterator.cpp b/test/iterators/ever_circling_iterator.cpp
index b68d35a64..6bbb49c28 100644
--- a/test/iterators/ever_circling_iterator.cpp
+++ b/test/iterators/ever_circling_iterator.cpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 template <typename G>
 void test_geometry(std::string const& wkt)
diff --git a/test/multi/algorithms/multi_area.cpp b/test/multi/algorithms/multi_area.cpp
index bf5b13c1e..1dd13b283 100644
--- a/test/multi/algorithms/multi_area.cpp
+++ b/test/multi/algorithms/multi_area.cpp
@@ -11,6 +11,8 @@
 #include <boost/geometry/multi/multi.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/multi/algorithms/multi_centroid.cpp
index dc58bef3c..2606f687f 100644
--- a/test/multi/algorithms/multi_centroid.cpp
+++ b/test/multi/algorithms/multi_centroid.cpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/multi/strategies/cartesian/centroid_average.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/multi/algorithms/multi_convex_hull.cpp
index c649c0b90..e0e669bf9 100644
--- a/test/multi/algorithms/multi_convex_hull.cpp
+++ b/test/multi/algorithms/multi_convex_hull.cpp
@@ -19,6 +19,7 @@
 #include <algorithms/test_convex_hull.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
diff --git a/test/multi/algorithms/multi_difference.cpp b/test/multi/algorithms/multi_difference.cpp
index e93a9f4af..fe6a8fcd7 100644
--- a/test/multi/algorithms/multi_difference.cpp
+++ b/test/multi/algorithms/multi_difference.cpp
@@ -21,6 +21,7 @@
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp> // only for testing #77
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp
index 702f0347f..e47168496 100644
--- a/test/multi/algorithms/multi_distance.cpp
+++ b/test/multi/algorithms/multi_distance.cpp
@@ -23,6 +23,7 @@
 #include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <test_common/test_point.hpp>
diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/multi/algorithms/multi_envelope.cpp
index c84ea9e82..31f69a3d4 100644
--- a/test/multi/algorithms/multi_envelope.cpp
+++ b/test/multi/algorithms/multi_envelope.cpp
@@ -24,6 +24,7 @@
 #include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <test_common/test_point.hpp>
diff --git a/test/multi/algorithms/multi_equals.cpp b/test/multi/algorithms/multi_equals.cpp
index 95eb3a05b..75f203c4e 100644
--- a/test/multi/algorithms/multi_equals.cpp
+++ b/test/multi/algorithms/multi_equals.cpp
@@ -11,6 +11,7 @@
 #include <boost/geometry/multi/algorithms/equals.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/multi/algorithms/multi_for_each.cpp
index b5fd7d566..c47f6d23b 100644
--- a/test/multi/algorithms/multi_for_each.cpp
+++ b/test/multi/algorithms/multi_for_each.cpp
@@ -16,6 +16,7 @@
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
diff --git a/test/multi/algorithms/multi_intersection.cpp b/test/multi/algorithms/multi_intersection.cpp
index 087b9f791..be8821cd5 100644
--- a/test/multi/algorithms/multi_intersection.cpp
+++ b/test/multi/algorithms/multi_intersection.cpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp> // only for testing #77
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_length.cpp b/test/multi/algorithms/multi_length.cpp
index 65ee8621e..5618cfff2 100644
--- a/test/multi/algorithms/multi_length.cpp
+++ b/test/multi/algorithms/multi_length.cpp
@@ -11,6 +11,8 @@
 #include <boost/geometry/multi/multi.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/test/multi/algorithms/multi_num_geometries.cpp b/test/multi/algorithms/multi_num_geometries.cpp
index e2bd8798e..54dacb648 100644
--- a/test/multi/algorithms/multi_num_geometries.cpp
+++ b/test/multi/algorithms/multi_num_geometries.cpp
@@ -13,6 +13,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_num_interior_rings.cpp b/test/multi/algorithms/multi_num_interior_rings.cpp
index eb56e6c9e..4350fafbf 100644
--- a/test/multi/algorithms/multi_num_interior_rings.cpp
+++ b/test/multi/algorithms/multi_num_interior_rings.cpp
@@ -13,6 +13,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_num_points.cpp b/test/multi/algorithms/multi_num_points.cpp
index 6bc95d01d..6109cd80e 100644
--- a/test/multi/algorithms/multi_num_points.cpp
+++ b/test/multi/algorithms/multi_num_points.cpp
@@ -13,6 +13,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_perimeter.cpp b/test/multi/algorithms/multi_perimeter.cpp
index 1cc823f32..a075a90ba 100644
--- a/test/multi/algorithms/multi_perimeter.cpp
+++ b/test/multi/algorithms/multi_perimeter.cpp
@@ -12,6 +12,7 @@
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
diff --git a/test/multi/algorithms/multi_reverse.cpp b/test/multi/algorithms/multi_reverse.cpp
index 301be3fdb..82ec7d55e 100644
--- a/test/multi/algorithms/multi_reverse.cpp
+++ b/test/multi/algorithms/multi_reverse.cpp
@@ -13,6 +13,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
diff --git a/test/multi/algorithms/multi_simplify.cpp b/test/multi/algorithms/multi_simplify.cpp
index 816fe3faa..09a836178 100644
--- a/test/multi/algorithms/multi_simplify.cpp
+++ b/test/multi/algorithms/multi_simplify.cpp
@@ -17,6 +17,8 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/test/multi/algorithms/multi_transform.cpp b/test/multi/algorithms/multi_transform.cpp
index ebc58cb0d..5f79f9606 100644
--- a/test/multi/algorithms/multi_transform.cpp
+++ b/test/multi/algorithms/multi_transform.cpp
@@ -20,6 +20,7 @@
 #include <boost/geometry/algorithms/transform.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/multi/algorithms/transform.hpp>
 
diff --git a/test/multi/algorithms/multi_union.cpp b/test/multi/algorithms/multi_union.cpp
index 498602346..0a8a2fd9a 100644
--- a/test/multi/algorithms/multi_union.cpp
+++ b/test/multi/algorithms/multi_union.cpp
@@ -19,6 +19,7 @@
 #include <boost/geometry/multi/algorithms/intersection.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
diff --git a/test/multi/algorithms/multi_unique.cpp b/test/multi/algorithms/multi_unique.cpp
index a6a127adf..a0aee93d2 100644
--- a/test/multi/algorithms/multi_unique.cpp
+++ b/test/multi/algorithms/multi_unique.cpp
@@ -13,6 +13,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
diff --git a/test/multi/algorithms/multi_within.cpp b/test/multi/algorithms/multi_within.cpp
index 9c02145bd..a3815b686 100644
--- a/test/multi/algorithms/multi_within.cpp
+++ b/test/multi/algorithms/multi_within.cpp
@@ -18,6 +18,7 @@
 #include <boost/geometry/multi/core/point_order.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 #include <algorithms/test_within.hpp>
diff --git a/test/views/closeable_view.cpp b/test/views/closeable_view.cpp
index 991836eac..96849f7e4 100644
--- a/test/views/closeable_view.cpp
+++ b/test/views/closeable_view.cpp
@@ -19,6 +19,7 @@
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/util/write_dsv.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
diff --git a/test/views/reversible_closeable.cpp b/test/views/reversible_closeable.cpp
index 87e0dc38d..6d4b11880 100644
--- a/test/views/reversible_closeable.cpp
+++ b/test/views/reversible_closeable.cpp
@@ -21,6 +21,7 @@
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 #include <boost/geometry/util/write_dsv.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
diff --git a/test/views/reversible_view.cpp b/test/views/reversible_view.cpp
index 42ae5c339..ea124781b 100644
--- a/test/views/reversible_view.cpp
+++ b/test/views/reversible_view.cpp
@@ -19,6 +19,7 @@
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 #include <boost/geometry/util/write_dsv.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
diff --git a/test/views/segment_view.cpp b/test/views/segment_view.cpp
index a56188771..5761da996 100644
--- a/test/views/segment_view.cpp
+++ b/test/views/segment_view.cpp
@@ -15,6 +15,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/views/segment_view.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
diff --git a/test_extensions/algorithms/connect.cpp b/test_extensions/algorithms/connect.cpp
index 6fc59f203..0f0eda247 100644
--- a/test_extensions/algorithms/connect.cpp
+++ b/test_extensions/algorithms/connect.cpp
@@ -13,6 +13,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/algorithms/buffer.hpp>
 #include <boost/geometry/algorithms/num_points.hpp>
diff --git a/test_extensions/algorithms/dissolve.cpp b/test_extensions/algorithms/dissolve.cpp
index 3838aeaaa..a49b98f11 100644
--- a/test_extensions/algorithms/dissolve.cpp
+++ b/test_extensions/algorithms/dissolve.cpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/algorithms/unique.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test_extensions/algorithms/is_convex.cpp b/test_extensions/algorithms/is_convex.cpp
index df97a545e..e01338053 100644
--- a/test_extensions/algorithms/is_convex.cpp
+++ b/test_extensions/algorithms/is_convex.cpp
@@ -30,6 +30,7 @@
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/util/as_range.hpp>
 #include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
diff --git a/test_extensions/algorithms/mark_spikes.cpp b/test_extensions/algorithms/mark_spikes.cpp
index 9a326d444..1ea18ec38 100644
--- a/test_extensions/algorithms/mark_spikes.cpp
+++ b/test_extensions/algorithms/mark_spikes.cpp
@@ -16,6 +16,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
diff --git a/test_extensions/algorithms/midpoints.cpp b/test_extensions/algorithms/midpoints.cpp
index b7070f178..ebed64036 100644
--- a/test_extensions/algorithms/midpoints.cpp
+++ b/test_extensions/algorithms/midpoints.cpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/extensions/algorithms/midpoints.hpp>
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/util/write_dsv.hpp>
 
diff --git a/test_extensions/algorithms/offset.cpp b/test_extensions/algorithms/offset.cpp
index e98ece407..f1c2e3aac 100644
--- a/test_extensions/algorithms/offset.cpp
+++ b/test_extensions/algorithms/offset.cpp
@@ -13,6 +13,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/algorithms/length.hpp>
 #include <boost/geometry/algorithms/num_points.hpp>
diff --git a/test_extensions/algorithms/remove_holes_if.cpp b/test_extensions/algorithms/remove_holes_if.cpp
index 353adeafc..2b7a1fb11 100644
--- a/test_extensions/algorithms/remove_holes_if.cpp
+++ b/test_extensions/algorithms/remove_holes_if.cpp
@@ -23,6 +23,7 @@
 #include <boost/geometry/extensions/algorithms/remove_holes_if.hpp>
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
diff --git a/test_extensions/algorithms/selected.cpp b/test_extensions/algorithms/selected.cpp
index dc3c55fe3..93ed42bb2 100644
--- a/test_extensions/algorithms/selected.cpp
+++ b/test_extensions/algorithms/selected.cpp
@@ -22,6 +22,7 @@
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/extensions/algorithms/selected.hpp>
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
 
diff --git a/test_extensions/gis/projections/projection.cpp b/test_extensions/gis/projections/projection.cpp
index c8e0253e7..93df5e445 100644
--- a/test_extensions/gis/projections/projection.cpp
+++ b/test_extensions/gis/projections/projection.cpp
@@ -30,6 +30,7 @@
 #include <boost/geometry/core/coordinate_type.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/extensions/gis/latlong/point_ll.hpp>
 #include <test_common/test_point.hpp>
diff --git a/test_extensions/gis/projections/projection_epsg.cpp b/test_extensions/gis/projections/projection_epsg.cpp
index 45498a3e8..3e4fd292e 100644
--- a/test_extensions/gis/projections/projection_epsg.cpp
+++ b/test_extensions/gis/projections/projection_epsg.cpp
@@ -33,6 +33,7 @@
 
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/extensions/gis/latlong/point_ll.hpp>
 #include <test_common/test_point.hpp>
 
diff --git a/test_extensions/gis/projections/projections.cpp b/test_extensions/gis/projections/projections.cpp
index e71f16e53..14960d070 100644
--- a/test_extensions/gis/projections/projections.cpp
+++ b/test_extensions/gis/projections/projections.cpp
@@ -24,6 +24,8 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/extensions/gis/projections/parameters.hpp>
 #include <boost/geometry/extensions/gis/projections/projection.hpp>
 #include <boost/geometry/extensions/gis/projections/factory.hpp>
diff --git a/test_extensions/index/rtree.cpp b/test_extensions/index/rtree.cpp
index 7a0179352..e83ba8b20 100644
--- a/test_extensions/index/rtree.cpp
+++ b/test_extensions/index/rtree.cpp
@@ -12,8 +12,8 @@
 #include <boost/test/floating_point_comparison.hpp>
 #include <boost/test/included/test_exec_monitor.hpp>
 
-#include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/extensions/index/rtree/rtree.hpp>
 
diff --git a/test_extensions/nsphere/within.cpp b/test_extensions/nsphere/within.cpp
index 498ee2f55..3fc5b8712 100644
--- a/test_extensions/nsphere/within.cpp
+++ b/test_extensions/nsphere/within.cpp
@@ -10,6 +10,8 @@
 #include <boost/geometry/extensions/nsphere/nsphere.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>