From 4a9ccaf8190e07ccb6989df46be752fc610c8db0 Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Mon, 15 Dec 2014 19:12:11 +0100
Subject: [PATCH] [geometry] Fix the order of Boost.Variant includes.

variant_fwd.hpp must be included before other Boost.Variant headers
because it contains config used in other parts of this library.
---
 include/boost/geometry/algorithms/append.hpp               | 2 ++
 include/boost/geometry/algorithms/area.hpp                 | 3 ++-
 include/boost/geometry/algorithms/assign.hpp               | 6 ++++--
 include/boost/geometry/algorithms/buffer.hpp               | 3 ++-
 include/boost/geometry/algorithms/centroid.hpp             | 3 ++-
 include/boost/geometry/algorithms/clear.hpp                | 5 +++--
 include/boost/geometry/algorithms/convert.hpp              | 3 ++-
 include/boost/geometry/algorithms/convex_hull.hpp          | 3 ++-
 include/boost/geometry/algorithms/correct.hpp              | 3 ++-
 include/boost/geometry/algorithms/covered_by.hpp           | 2 +-
 include/boost/geometry/algorithms/crosses.hpp              | 3 +++
 .../geometry/algorithms/detail/disjoint/interface.hpp      | 2 +-
 .../geometry/algorithms/detail/is_simple/interface.hpp     | 2 +-
 .../geometry/algorithms/detail/is_valid/interface.hpp      | 2 +-
 include/boost/geometry/algorithms/envelope.hpp             | 3 ++-
 include/boost/geometry/algorithms/equals.hpp               | 6 ++++--
 include/boost/geometry/algorithms/expand.hpp               | 7 ++++---
 include/boost/geometry/algorithms/length.hpp               | 4 ++--
 include/boost/geometry/algorithms/num_geometries.hpp       | 3 ++-
 include/boost/geometry/algorithms/num_interior_rings.hpp   | 2 +-
 include/boost/geometry/algorithms/num_points.hpp           | 2 +-
 include/boost/geometry/algorithms/num_segments.hpp         | 2 +-
 include/boost/geometry/algorithms/perimeter.hpp            | 3 ++-
 include/boost/geometry/algorithms/remove_spikes.hpp        | 3 ++-
 include/boost/geometry/algorithms/reverse.hpp              | 3 ++-
 include/boost/geometry/algorithms/simplify.hpp             | 3 ++-
 include/boost/geometry/algorithms/touches.hpp              | 7 ++++---
 include/boost/geometry/algorithms/transform.hpp            | 3 ++-
 include/boost/geometry/algorithms/within.hpp               | 3 ++-
 include/boost/geometry/io/wkt/write.hpp                    | 3 ++-
 30 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp
index 1a8828ba4..7809451ac 100644
--- a/include/boost/geometry/algorithms/append.hpp
+++ b/include/boost/geometry/algorithms/append.hpp
@@ -22,6 +22,8 @@
 
 
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
 
diff --git a/include/boost/geometry/algorithms/area.hpp b/include/boost/geometry/algorithms/area.hpp
index 737779871..eae1a7d85 100644
--- a/include/boost/geometry/algorithms/area.hpp
+++ b/include/boost/geometry/algorithms/area.hpp
@@ -18,9 +18,10 @@
 #include <boost/mpl/if.hpp>
 #include <boost/range/functions.hpp>
 #include <boost/range/metafunctions.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
diff --git a/include/boost/geometry/algorithms/assign.hpp b/include/boost/geometry/algorithms/assign.hpp
index 32f095b9a..0596acdfa 100644
--- a/include/boost/geometry/algorithms/assign.hpp
+++ b/include/boost/geometry/algorithms/assign.hpp
@@ -26,6 +26,10 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/type_traits.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 #include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/assign_values.hpp>
@@ -41,8 +45,6 @@
 
 #include <boost/geometry/util/for_each_coordinate.hpp>
 
-#include <boost/variant/variant_fwd.hpp>
-
 namespace boost { namespace geometry
 {
 
diff --git a/include/boost/geometry/algorithms/buffer.hpp b/include/boost/geometry/algorithms/buffer.hpp
index b8b07ad4d..d4c60ff2c 100644
--- a/include/boost/geometry/algorithms/buffer.hpp
+++ b/include/boost/geometry/algorithms/buffer.hpp
@@ -17,9 +17,10 @@
 #include <cstddef>
 
 #include <boost/numeric/conversion/cast.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/envelope.hpp>
diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp
index 65dc9c375..8f310f910 100644
--- a/include/boost/geometry/algorithms/centroid.hpp
+++ b/include/boost/geometry/algorithms/centroid.hpp
@@ -24,9 +24,10 @@
 #include <cstddef>
 
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/cs.hpp>
diff --git a/include/boost/geometry/algorithms/clear.hpp b/include/boost/geometry/algorithms/clear.hpp
index 1850816b1..28d68bfb1 100644
--- a/include/boost/geometry/algorithms/clear.hpp
+++ b/include/boost/geometry/algorithms/clear.hpp
@@ -16,9 +16,10 @@
 
 
 #include <boost/type_traits/remove_const.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
+
 #include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/access.hpp>
diff --git a/include/boost/geometry/algorithms/convert.hpp b/include/boost/geometry/algorithms/convert.hpp
index 914ef8f42..af9902996 100644
--- a/include/boost/geometry/algorithms/convert.hpp
+++ b/include/boost/geometry/algorithms/convert.hpp
@@ -22,9 +22,10 @@
 #include <boost/range.hpp>
 #include <boost/type_traits/is_array.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
diff --git a/include/boost/geometry/algorithms/convex_hull.hpp b/include/boost/geometry/algorithms/convex_hull.hpp
index 09f4c5142..2765eff78 100644
--- a/include/boost/geometry/algorithms/convex_hull.hpp
+++ b/include/boost/geometry/algorithms/convex_hull.hpp
@@ -20,9 +20,10 @@
 #define BOOST_GEOMETRY_ALGORITHMS_CONVEX_HULL_HPP
 
 #include <boost/array.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/point_order.hpp>
diff --git a/include/boost/geometry/algorithms/correct.hpp b/include/boost/geometry/algorithms/correct.hpp
index 3c61b2c0d..5b2747887 100644
--- a/include/boost/geometry/algorithms/correct.hpp
+++ b/include/boost/geometry/algorithms/correct.hpp
@@ -23,9 +23,10 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
diff --git a/include/boost/geometry/algorithms/covered_by.hpp b/include/boost/geometry/algorithms/covered_by.hpp
index e50dc338a..282a754c0 100644
--- a/include/boost/geometry/algorithms/covered_by.hpp
+++ b/include/boost/geometry/algorithms/covered_by.hpp
@@ -22,9 +22,9 @@
 
 #include <cstddef>
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/algorithms/within.hpp>
diff --git a/include/boost/geometry/algorithms/crosses.hpp b/include/boost/geometry/algorithms/crosses.hpp
index 91ed3e080..53f911308 100644
--- a/include/boost/geometry/algorithms/crosses.hpp
+++ b/include/boost/geometry/algorithms/crosses.hpp
@@ -21,7 +21,10 @@
 #define BOOST_GEOMETRY_ALGORITHMS_CROSSES_HPP
 
 #include <cstddef>
+
 #include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include <boost/geometry/core/access.hpp>
 
diff --git a/include/boost/geometry/algorithms/detail/disjoint/interface.hpp b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
index ec9057ba0..43cdb7879 100644
--- a/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
@@ -23,9 +23,9 @@
 
 #include <cstddef>
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
diff --git a/include/boost/geometry/algorithms/detail/is_simple/interface.hpp b/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
index 4239664ed..1741e1a3d 100644
--- a/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/is_simple/interface.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_INTERFACE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_INTERFACE_HPP
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
diff --git a/include/boost/geometry/algorithms/detail/is_valid/interface.hpp b/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
index 2e59c1455..b61b0df0e 100644
--- a/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/is_valid/interface.hpp
@@ -10,9 +10,9 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_INTERFACE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_INTERFACE_HPP
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
diff --git a/include/boost/geometry/algorithms/envelope.hpp b/include/boost/geometry/algorithms/envelope.hpp
index e06ed71e8..702d609ca 100644
--- a/include/boost/geometry/algorithms/envelope.hpp
+++ b/include/boost/geometry/algorithms/envelope.hpp
@@ -18,9 +18,10 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/expand.hpp>
diff --git a/include/boost/geometry/algorithms/equals.hpp b/include/boost/geometry/algorithms/equals.hpp
index c6b718da1..fc97cdb48 100644
--- a/include/boost/geometry/algorithms/equals.hpp
+++ b/include/boost/geometry/algorithms/equals.hpp
@@ -26,6 +26,10 @@
 
 #include <boost/range.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/geometry_id.hpp>
@@ -50,8 +54,6 @@
 
 #include <boost/geometry/views/detail/indexed_point_view.hpp>
 
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/apply_visitor.hpp>
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/algorithms/expand.hpp b/include/boost/geometry/algorithms/expand.hpp
index 19e40aa2d..1a3c8dfa2 100644
--- a/include/boost/geometry/algorithms/expand.hpp
+++ b/include/boost/geometry/algorithms/expand.hpp
@@ -20,6 +20,10 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
@@ -29,9 +33,6 @@
 #include <boost/geometry/strategies/compare.hpp>
 #include <boost/geometry/policies/compare.hpp>
 
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/apply_visitor.hpp>
-
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/algorithms/length.hpp b/include/boost/geometry/algorithms/length.hpp
index 6cbec5303..dea4512e7 100644
--- a/include/boost/geometry/algorithms/length.hpp
+++ b/include/boost/geometry/algorithms/length.hpp
@@ -34,9 +34,9 @@
 #include <boost/mpl/transform.hpp>
 #include <boost/type_traits.hpp>
 
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
 #include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/closure.hpp>
diff --git a/include/boost/geometry/algorithms/num_geometries.hpp b/include/boost/geometry/algorithms/num_geometries.hpp
index d37d0bfab..1c8796d42 100644
--- a/include/boost/geometry/algorithms/num_geometries.hpp
+++ b/include/boost/geometry/algorithms/num_geometries.hpp
@@ -23,9 +23,10 @@
 #include <cstddef>
 
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
diff --git a/include/boost/geometry/algorithms/num_interior_rings.hpp b/include/boost/geometry/algorithms/num_interior_rings.hpp
index e198b37a7..7d85c94d0 100644
--- a/include/boost/geometry/algorithms/num_interior_rings.hpp
+++ b/include/boost/geometry/algorithms/num_interior_rings.hpp
@@ -24,9 +24,9 @@
 
 #include <boost/range.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
diff --git a/include/boost/geometry/algorithms/num_points.hpp b/include/boost/geometry/algorithms/num_points.hpp
index 4c2ad3b08..13fbd8026 100644
--- a/include/boost/geometry/algorithms/num_points.hpp
+++ b/include/boost/geometry/algorithms/num_points.hpp
@@ -26,9 +26,9 @@
 
 #include <boost/range.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
diff --git a/include/boost/geometry/algorithms/num_segments.hpp b/include/boost/geometry/algorithms/num_segments.hpp
index cbb568596..820437292 100644
--- a/include/boost/geometry/algorithms/num_segments.hpp
+++ b/include/boost/geometry/algorithms/num_segments.hpp
@@ -17,9 +17,9 @@
 
 #include <boost/range.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/tag.hpp>
diff --git a/include/boost/geometry/algorithms/perimeter.hpp b/include/boost/geometry/algorithms/perimeter.hpp
index 0ec153c1f..6be779377 100644
--- a/include/boost/geometry/algorithms/perimeter.hpp
+++ b/include/boost/geometry/algorithms/perimeter.hpp
@@ -20,9 +20,10 @@
 #define BOOST_GEOMETRY_ALGORITHMS_PERIMETER_HPP
 
 #include <boost/range/metafunctions.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/length.hpp>
 #include <boost/geometry/algorithms/detail/calculate_null.hpp>
diff --git a/include/boost/geometry/algorithms/remove_spikes.hpp b/include/boost/geometry/algorithms/remove_spikes.hpp
index e62ea9fe3..755d58f7b 100644
--- a/include/boost/geometry/algorithms/remove_spikes.hpp
+++ b/include/boost/geometry/algorithms/remove_spikes.hpp
@@ -16,9 +16,10 @@
 
 #include <boost/range.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/coordinate_type.hpp>
diff --git a/include/boost/geometry/algorithms/reverse.hpp b/include/boost/geometry/algorithms/reverse.hpp
index 17b23ffdf..ca57b2623 100644
--- a/include/boost/geometry/algorithms/reverse.hpp
+++ b/include/boost/geometry/algorithms/reverse.hpp
@@ -19,9 +19,10 @@
 
 #include <boost/range.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/detail/multi_modify.hpp>
diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp
index 00b6ed6f9..29c556d43 100644
--- a/include/boost/geometry/algorithms/simplify.hpp
+++ b/include/boost/geometry/algorithms/simplify.hpp
@@ -18,9 +18,10 @@
 
 #include <boost/core/ignore_unused.hpp>
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/closure.hpp>
diff --git a/include/boost/geometry/algorithms/touches.hpp b/include/boost/geometry/algorithms/touches.hpp
index a06071d42..6f13be6a7 100644
--- a/include/boost/geometry/algorithms/touches.hpp
+++ b/include/boost/geometry/algorithms/touches.hpp
@@ -23,6 +23,10 @@
 
 #include <deque>
 
+#include <boost/variant/variant_fwd.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/for_each_range.hpp>
 #include <boost/geometry/algorithms/detail/overlay/overlay.hpp>
@@ -32,9 +36,6 @@
 #include <boost/geometry/algorithms/num_geometries.hpp>
 #include <boost/geometry/algorithms/detail/sub_range.hpp>
 #include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/detail/relate/relate.hpp>
 
diff --git a/include/boost/geometry/algorithms/transform.hpp b/include/boost/geometry/algorithms/transform.hpp
index 1d6e8d0a3..a6e7a20ac 100644
--- a/include/boost/geometry/algorithms/transform.hpp
+++ b/include/boost/geometry/algorithms/transform.hpp
@@ -20,9 +20,10 @@
 
 #include <boost/range.hpp>
 #include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
diff --git a/include/boost/geometry/algorithms/within.hpp b/include/boost/geometry/algorithms/within.hpp
index f66b1ed1c..309d0bcfc 100644
--- a/include/boost/geometry/algorithms/within.hpp
+++ b/include/boost/geometry/algorithms/within.hpp
@@ -24,9 +24,10 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
diff --git a/include/boost/geometry/io/wkt/write.hpp b/include/boost/geometry/io/wkt/write.hpp
index 6c1a2e153..ed6cd4ba3 100644
--- a/include/boost/geometry/io/wkt/write.hpp
+++ b/include/boost/geometry/io/wkt/write.hpp
@@ -20,9 +20,10 @@
 
 #include <boost/array.hpp>
 #include <boost/range.hpp>
+
+#include <boost/variant/variant_fwd.hpp>
 #include <boost/variant/apply_visitor.hpp>
 #include <boost/variant/static_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/assign.hpp>