diff --git a/doc/src/examples/algorithms/append.cpp b/doc/src/examples/algorithms/append.cpp
index 692951433..ce7ad84f3 100644
--- a/doc/src/examples/algorithms/append.cpp
+++ b/doc/src/examples/algorithms/append.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
diff --git a/doc/src/examples/algorithms/area.cpp b/doc/src/examples/algorithms/area.cpp
index d89d0012c..597bec3b4 100644
--- a/doc/src/examples/algorithms/area.cpp
+++ b/doc/src/examples/algorithms/area.cpp
@@ -11,7 +11,7 @@
 //` Calculate the area of a polygon
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 808f102ff..cefbf39a2 100644
--- a/doc/src/examples/algorithms/area_with_strategy.cpp
+++ b/doc/src/examples/algorithms/area_with_strategy.cpp
@@ -11,7 +11,7 @@
 //` Calculate the area of a polygon
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 bc5b4cdc5..7309911ee 100644
--- a/doc/src/examples/algorithms/assign.cpp
+++ b/doc/src/examples/algorithms/assign.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/assign_2d_point.cpp b/doc/src/examples/algorithms/assign_2d_point.cpp
index e32f5b5c7..f21f47e0e 100644
--- a/doc/src/examples/algorithms/assign_2d_point.cpp
+++ b/doc/src/examples/algorithms/assign_2d_point.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 #if defined(HAVE_TTMATH)
diff --git a/doc/src/examples/algorithms/assign_3d_point.cpp b/doc/src/examples/algorithms/assign_3d_point.cpp
index aa3ddb683..094b8869b 100644
--- a/doc/src/examples/algorithms/assign_3d_point.cpp
+++ b/doc/src/examples/algorithms/assign_3d_point.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/assign_box_corners.cpp b/doc/src/examples/algorithms/assign_box_corners.cpp
index f6588194f..e74545bed 100644
--- a/doc/src/examples/algorithms/assign_box_corners.cpp
+++ b/doc/src/examples/algorithms/assign_box_corners.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 using namespace boost::geometry;
diff --git a/doc/src/examples/algorithms/assign_inverse.cpp b/doc/src/examples/algorithms/assign_inverse.cpp
index 8685f1397..27d1fdf11 100644
--- a/doc/src/examples/algorithms/assign_inverse.cpp
+++ b/doc/src/examples/algorithms/assign_inverse.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 2f5284693..06a684afe 100644
--- a/doc/src/examples/algorithms/assign_point_from_index.cpp
+++ b/doc/src/examples/algorithms/assign_point_from_index.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 8cec40be8..db73730ef 100644
--- a/doc/src/examples/algorithms/assign_point_to_index.cpp
+++ b/doc/src/examples/algorithms/assign_point_to_index.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 using namespace boost::geometry;
diff --git a/doc/src/examples/algorithms/assign_points.cpp b/doc/src/examples/algorithms/assign_points.cpp
index c74775963..30cdfd8cd 100644
--- a/doc/src/examples/algorithms/assign_points.cpp
+++ b/doc/src/examples/algorithms/assign_points.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
diff --git a/doc/src/examples/algorithms/centroid.cpp b/doc/src/examples/algorithms/centroid.cpp
index e4004183a..49bb80cde 100644
--- a/doc/src/examples/algorithms/centroid.cpp
+++ b/doc/src/examples/algorithms/centroid.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <list>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
diff --git a/doc/src/examples/algorithms/clear.cpp b/doc/src/examples/algorithms/clear.cpp
index f9932ed26..abe4dbdb3 100644
--- a/doc/src/examples/algorithms/clear.cpp
+++ b/doc/src/examples/algorithms/clear.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
diff --git a/doc/src/examples/algorithms/comparable_distance.cpp b/doc/src/examples/algorithms/comparable_distance.cpp
index 0ed9a0490..64df6d56d 100644
--- a/doc/src/examples/algorithms/comparable_distance.cpp
+++ b/doc/src/examples/algorithms/comparable_distance.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 #include <boost/numeric/conversion/bounds.hpp>
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/convex_hull.cpp b/doc/src/examples/algorithms/convex_hull.cpp
index f6963f092..ed290e2f4 100644
--- a/doc/src/examples/algorithms/convex_hull.cpp
+++ b/doc/src/examples/algorithms/convex_hull.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
 /*<-*/ #include "create_svg_two.hpp" /*->*/
diff --git a/doc/src/examples/algorithms/correct.cpp b/doc/src/examples/algorithms/correct.cpp
index add730428..cacf6cf99 100644
--- a/doc/src/examples/algorithms/correct.cpp
+++ b/doc/src/examples/algorithms/correct.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
 #include <boost/assign.hpp>
diff --git a/doc/src/examples/algorithms/difference.cpp b/doc/src/examples/algorithms/difference.cpp
index 44bcf82b5..03f5cf954 100644
--- a/doc/src/examples/algorithms/difference.cpp
+++ b/doc/src/examples/algorithms/difference.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <list>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/difference_inserter.cpp b/doc/src/examples/algorithms/difference_inserter.cpp
index 3c54ccd5b..60d8883ac 100644
--- a/doc/src/examples/algorithms/difference_inserter.cpp
+++ b/doc/src/examples/algorithms/difference_inserter.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/distance.cpp b/doc/src/examples/algorithms/distance.cpp
index 3d4e71d5a..bc77e9f0e 100644
--- a/doc/src/examples/algorithms/distance.cpp
+++ b/doc/src/examples/algorithms/distance.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <list>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 
diff --git a/doc/src/examples/algorithms/envelope.cpp b/doc/src/examples/algorithms/envelope.cpp
index ec50f572c..fd310dae2 100644
--- a/doc/src/examples/algorithms/envelope.cpp
+++ b/doc/src/examples/algorithms/envelope.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/equals.cpp b/doc/src/examples/algorithms/equals.cpp
index 27b087125..e6f982d9b 100644
--- a/doc/src/examples/algorithms/equals.cpp
+++ b/doc/src/examples/algorithms/equals.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
diff --git a/doc/src/examples/algorithms/expand.cpp b/doc/src/examples/algorithms/expand.cpp
index 449b48fd9..d2cb3fc4d 100644
--- a/doc/src/examples/algorithms/expand.cpp
+++ b/doc/src/examples/algorithms/expand.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <list>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/for_each_point.cpp b/doc/src/examples/algorithms/for_each_point.cpp
index 23c3b5a37..f5a42ba55 100644
--- a/doc/src/examples/algorithms/for_each_point.cpp
+++ b/doc/src/examples/algorithms/for_each_point.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 51d5f7a5e..8b29ef1e9 100644
--- a/doc/src/examples/algorithms/for_each_point_const.cpp
+++ b/doc/src/examples/algorithms/for_each_point_const.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 3d0a6d914..c1ae26236 100644
--- a/doc/src/examples/algorithms/for_each_segment_const.cpp
+++ b/doc/src/examples/algorithms/for_each_segment_const.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 827f2b403..a4ef55ef6 100644
--- a/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
+++ b/doc/src/examples/algorithms/intersection_ls_ls_point.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <deque>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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/intersection_poly_poly.cpp b/doc/src/examples/algorithms/intersection_poly_poly.cpp
index d863ca6b8..0966e1446 100644
--- a/doc/src/examples/algorithms/intersection_poly_poly.cpp
+++ b/doc/src/examples/algorithms/intersection_poly_poly.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <deque>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/intersection_segment.cpp b/doc/src/examples/algorithms/intersection_segment.cpp
index bbbc1d497..d9a902436 100644
--- a/doc/src/examples/algorithms/intersection_segment.cpp
+++ b/doc/src/examples/algorithms/intersection_segment.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 3d98e0a6b..536c649e7 100644
--- a/doc/src/examples/algorithms/intersects_linestring.cpp
+++ b/doc/src/examples/algorithms/intersects_linestring.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 fc96a3e88..9c98a3085 100644
--- a/doc/src/examples/algorithms/intersects_segment.cpp
+++ b/doc/src/examples/algorithms/intersects_segment.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 1eab5e117..506a3e6b5 100644
--- a/doc/src/examples/algorithms/length.cpp
+++ b/doc/src/examples/algorithms/length.cpp
@@ -11,7 +11,7 @@
     //` The following simple example shows the calculation of the length of a linestring containing three points
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 4f35ae41b..32eb6d39b 100644
--- a/doc/src/examples/algorithms/length_with_strategy.cpp
+++ b/doc/src/examples/algorithms/length_with_strategy.cpp
@@ -11,7 +11,7 @@
 //`The following example shows the length measured over a sphere, expressed in kilometers. To do that the radius of the sphere must be specified in the constructor of the strategy.
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/algorithms/make_2d_point.cpp b/doc/src/examples/algorithms/make_2d_point.cpp
index be55eb553..1c374bf94 100644
--- a/doc/src/examples/algorithms/make_2d_point.cpp
+++ b/doc/src/examples/algorithms/make_2d_point.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
diff --git a/doc/src/examples/algorithms/make_3d_point.cpp b/doc/src/examples/algorithms/make_3d_point.cpp
index 254f0b281..4605bb81a 100644
--- a/doc/src/examples/algorithms/make_3d_point.cpp
+++ b/doc/src/examples/algorithms/make_3d_point.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/make_inverse.cpp b/doc/src/examples/algorithms/make_inverse.cpp
index cfcd718ee..20dd5fc37 100644
--- a/doc/src/examples/algorithms/make_inverse.cpp
+++ b/doc/src/examples/algorithms/make_inverse.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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 3b996ac4a..26d55c633 100644
--- a/doc/src/examples/algorithms/make_with_range.cpp
+++ b/doc/src/examples/algorithms/make_with_range.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/c_array_cartesian.hpp> /*< 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 87805761b..d66735de7 100644
--- a/doc/src/examples/algorithms/num_geometries.cpp
+++ b/doc/src/examples/algorithms/num_geometries.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/doc/src/examples/algorithms/num_interior_rings.cpp b/doc/src/examples/algorithms/num_interior_rings.cpp
index b4aa82940..b6edc4a67 100644
--- a/doc/src/examples/algorithms/num_interior_rings.cpp
+++ b/doc/src/examples/algorithms/num_interior_rings.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/doc/src/examples/algorithms/num_points.cpp b/doc/src/examples/algorithms/num_points.cpp
index b44c44c2a..be0c1492a 100644
--- a/doc/src/examples/algorithms/num_points.cpp
+++ b/doc/src/examples/algorithms/num_points.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/multi/geometries/multi_polygon.hpp>
diff --git a/doc/src/examples/algorithms/return_envelope.cpp b/doc/src/examples/algorithms/return_envelope.cpp
index 5775d9f53..cb8914e5d 100644
--- a/doc/src/examples/algorithms/return_envelope.cpp
+++ b/doc/src/examples/algorithms/return_envelope.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 #include <boost/assign.hpp>
diff --git a/doc/src/examples/algorithms/reverse.cpp b/doc/src/examples/algorithms/reverse.cpp
index 33fc690fc..26eb35f68 100644
--- a/doc/src/examples/algorithms/reverse.cpp
+++ b/doc/src/examples/algorithms/reverse.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
diff --git a/doc/src/examples/algorithms/simplify.cpp b/doc/src/examples/algorithms/simplify.cpp
index f67a256b3..db4a97bfb 100644
--- a/doc/src/examples/algorithms/simplify.cpp
+++ b/doc/src/examples/algorithms/simplify.cpp
@@ -11,7 +11,7 @@
 //` Example showing how to simplify a linestring
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 e3a2e7c05..d93034dfd 100644
--- a/doc/src/examples/algorithms/simplify_insert.cpp
+++ b/doc/src/examples/algorithms/simplify_insert.cpp
@@ -11,7 +11,7 @@
 //` Simplify a linestring using a back inserter
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 a73cd0c68..3236fee0b 100644
--- a/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
+++ b/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
@@ -11,7 +11,7 @@
 //` Simplify a linestring using an output iterator
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.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 80d487819..7f0bf779f 100644
--- a/doc/src/examples/algorithms/sym_difference.cpp
+++ b/doc/src/examples/algorithms/sym_difference.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.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/transform.cpp b/doc/src/examples/algorithms/transform.cpp
index 8eea3be30..feee4ab13 100644
--- a/doc/src/examples/algorithms/transform.cpp
+++ b/doc/src/examples/algorithms/transform.cpp
@@ -11,7 +11,7 @@
 //` Shows how points can be transformed using the default strategy
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 
 int main()
diff --git a/doc/src/examples/algorithms/transform_with_strategy.cpp b/doc/src/examples/algorithms/transform_with_strategy.cpp
index 2fcfc57f4..20e842635 100644
--- a/doc/src/examples/algorithms/transform_with_strategy.cpp
+++ b/doc/src/examples/algorithms/transform_with_strategy.cpp
@@ -11,7 +11,7 @@
 //` Shows how points can be scaled, translated or rotated
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 
 int main()
diff --git a/doc/src/examples/algorithms/union.cpp b/doc/src/examples/algorithms/union.cpp
index 865da72c2..79c35298a 100644
--- a/doc/src/examples/algorithms/union.cpp
+++ b/doc/src/examples/algorithms/union.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <vector>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
 
diff --git a/doc/src/examples/algorithms/unique.cpp b/doc/src/examples/algorithms/unique.cpp
index 294e1cd98..d258361ef 100644
--- a/doc/src/examples/algorithms/unique.cpp
+++ b/doc/src/examples/algorithms/unique.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
 int main()
diff --git a/doc/src/examples/algorithms/within.cpp b/doc/src/examples/algorithms/within.cpp
index cb8e110fc..24d33bdcc 100644
--- a/doc/src/examples/algorithms/within.cpp
+++ b/doc/src/examples/algorithms/within.cpp
@@ -13,7 +13,7 @@
 #include <iostream>
 #include <list>
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 
 #include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
diff --git a/doc/src/examples/core/closure.cpp b/doc/src/examples/core/closure.cpp
index 47c40adcc..db4c5e406 100644
--- a/doc/src/examples/core/closure.cpp
+++ b/doc/src/examples/core/closure.cpp
@@ -11,7 +11,7 @@
 //` Examine if a polygon is defined as "should be closed"
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/coordinate_dimension.cpp b/doc/src/examples/core/coordinate_dimension.cpp
index 5061c46ce..744d01910 100644
--- a/doc/src/examples/core/coordinate_dimension.cpp
+++ b/doc/src/examples/core/coordinate_dimension.cpp
@@ -11,7 +11,7 @@
 //` Examine the number of coordinates making up the points in a linestring type
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 #include <boost/geometry/geometries/adapted/std_as_linestring.hpp>
 
diff --git a/doc/src/examples/core/coordinate_system.cpp b/doc/src/examples/core/coordinate_system.cpp
index 0152aabf4..6969a27a2 100644
--- a/doc/src/examples/core/coordinate_system.cpp
+++ b/doc/src/examples/core/coordinate_system.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <typeinfo>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/coordinate_type.cpp b/doc/src/examples/core/coordinate_type.cpp
index ebeea7e3c..3fffafa5f 100644
--- a/doc/src/examples/core/coordinate_type.cpp
+++ b/doc/src/examples/core/coordinate_type.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <typeinfo>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/degree_radian.cpp b/doc/src/examples/core/degree_radian.cpp
index 3b8411068..3cd2d3dba 100644
--- a/doc/src/examples/core/degree_radian.cpp
+++ b/doc/src/examples/core/degree_radian.cpp
@@ -11,7 +11,7 @@
 //` Specify two coordinate systems, one in degrees, one in radians.
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 using namespace boost::geometry;
 
diff --git a/doc/src/examples/core/get_box.cpp b/doc/src/examples/core/get_box.cpp
index c7f6c1b3e..181721267 100644
--- a/doc/src/examples/core/get_box.cpp
+++ b/doc/src/examples/core/get_box.cpp
@@ -11,7 +11,7 @@
 //` Get the coordinate of a box
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/get_point.cpp b/doc/src/examples/core/get_point.cpp
index 126b25aac..cd0243e52 100644
--- a/doc/src/examples/core/get_point.cpp
+++ b/doc/src/examples/core/get_point.cpp
@@ -11,7 +11,7 @@
 //` Get the coordinate of a point
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/point_order.cpp b/doc/src/examples/core/point_order.cpp
index 34e371209..dede853cd 100644
--- a/doc/src/examples/core/point_order.cpp
+++ b/doc/src/examples/core/point_order.cpp
@@ -11,7 +11,7 @@
 //` Examine the expected point order of a polygon type
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/point_type.cpp b/doc/src/examples/core/point_type.cpp
index 2f1b499b7..51508511c 100644
--- a/doc/src/examples/core/point_type.cpp
+++ b/doc/src/examples/core/point_type.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <typeinfo>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/rings.cpp b/doc/src/examples/core/rings.cpp
index 76eae12de..1487db4f4 100644
--- a/doc/src/examples/core/rings.cpp
+++ b/doc/src/examples/core/rings.cpp
@@ -15,7 +15,7 @@ Also shows the related ring_type and interior_type.
 */
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 
 int main()
diff --git a/doc/src/examples/core/set_box.cpp b/doc/src/examples/core/set_box.cpp
index e4b871330..1c56572b1 100644
--- a/doc/src/examples/core/set_box.cpp
+++ b/doc/src/examples/core/set_box.cpp
@@ -11,7 +11,7 @@
 //` Set the coordinate of a box
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/set_point.cpp b/doc/src/examples/core/set_point.cpp
index 14a3c5138..39520c921 100644
--- a/doc/src/examples/core/set_point.cpp
+++ b/doc/src/examples/core/set_point.cpp
@@ -11,7 +11,7 @@
 //` Set the coordinate of a point
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/core/tag.cpp b/doc/src/examples/core/tag.cpp
index 281296215..88530ca9d 100644
--- a/doc/src/examples/core/tag.cpp
+++ b/doc/src/examples/core/tag.cpp
@@ -11,7 +11,7 @@
 //` Shows how tag dispatching essentially works in Boost.Geometry
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
 
 #include <boost/assign.hpp>
diff --git a/doc/src/examples/core/tag_cast.cpp b/doc/src/examples/core/tag_cast.cpp
index 7f4ab3e0e..f33345706 100644
--- a/doc/src/examples/core/tag_cast.cpp
+++ b/doc/src/examples/core/tag_cast.cpp
@@ -12,7 +12,7 @@
 
 #include <iostream>
 #include <typeinfo>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace geo = boost::geometry;
 int main()
diff --git a/doc/src/examples/geometries/point.cpp b/doc/src/examples/geometries/point.cpp
index 680ca4a5e..103642f4b 100644
--- a/doc/src/examples/geometries/point.cpp
+++ b/doc/src/examples/geometries/point.cpp
@@ -11,7 +11,7 @@
 //` Declaration and use of the Boost.Geometry model::point, modelling the Point Concept
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 
 namespace bg = boost::geometry;
 
diff --git a/doc/src/examples/geometries/register/point.cpp b/doc/src/examples/geometries/register/point.cpp
index bfac67d88..f523fc7c8 100644
--- a/doc/src/examples/geometries/register/point.cpp
+++ b/doc/src/examples/geometries/register/point.cpp
@@ -11,7 +11,7 @@
 //` Show the use of the macro BOOST_GEOMETRY_REGISTER_POINT_2D
 
 #include <iostream>
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
 
 /*< Somewhere, any legacy point struct is defined >*/
diff --git a/doc/src/examples/quick_start.cpp b/doc/src/examples/quick_start.cpp
index 36567b3fa..669235191 100644
--- a/doc/src/examples/quick_start.cpp
+++ b/doc/src/examples/quick_start.cpp
@@ -20,7 +20,7 @@
 //#pragma warning( disable : 4244 )
 #endif // defined(_MSC_VER)
 
-#include <boost/geometry/geometry.hpp>
+#include <boost/geometry.hpp>
 #include <boost/geometry/algorithms/overlaps.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/register/point.hpp>