diff --git a/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
index 6f88a2757..8d5ffe2b8 100644
--- a/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
+++ b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
@@ -58,7 +58,7 @@ namespace boost { namespace geometry
 namespace detail { namespace buffer
 {
 
-template <typename RangeIn, typename RangeOut, typename DistanceStrategy, typename Strategies>
+template <typename RangeIn, typename DistanceStrategy, typename RangeOut, typename Strategies>
 inline void simplify_input(RangeIn const& range,
                            DistanceStrategy const& distance,
                            RangeOut& simplified,
diff --git a/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp b/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
index fee7947a7..961f201ed 100644
--- a/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
+++ b/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
@@ -54,7 +54,7 @@ public :
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
     //! Fills output_range with a flat end
-    template <typename Point, typename RangeOut, typename DistanceStrategy>
+    template <typename Point, typename DistanceStrategy, typename RangeOut>
     inline void apply(Point const& penultimate_point,
                 Point const& perp_left_point,
                 Point const& ultimate_point,
diff --git a/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
index 68614e401..abf055a67 100644
--- a/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
+++ b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
@@ -107,7 +107,7 @@ public :
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
     //! Fills output_range with a round end
-    template <typename Point, typename RangeOut, typename DistanceStrategy>
+    template <typename Point, typename DistanceStrategy, typename RangeOut>
     inline void apply(Point const& penultimate_point,
                 Point const& perp_left_point,
                 Point const& ultimate_point,
diff --git a/include/boost/geometry/strategies/geographic/buffer_end_round.hpp b/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
index f4b555122..bb8730e25 100644
--- a/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
+++ b/include/boost/geometry/strategies/geographic/buffer_end_round.hpp
@@ -63,7 +63,7 @@ public :
     }
 
     //! Fills output_range with a round end
-    template <typename Point, typename RangeOut, typename DistanceStrategy>
+    template <typename Point, typename DistanceStrategy, typename RangeOut>
     inline void apply(Point const& penultimate_point, Point const& perp_left_point,
                       Point const& ultimate_point, Point const& perp_right_point,
                       buffer_side_selector side, DistanceStrategy const& distance,
diff --git a/include/boost/geometry/strategies/geographic/buffer_point_circle.hpp b/include/boost/geometry/strategies/geographic/buffer_point_circle.hpp
index c2d98ea68..619ca2b1a 100644
--- a/include/boost/geometry/strategies/geographic/buffer_point_circle.hpp
+++ b/include/boost/geometry/strategies/geographic/buffer_point_circle.hpp
@@ -72,8 +72,8 @@ public :
     template
     <
         typename Point,
-        typename RangeOut,
-        typename DistanceStrategy
+        typename DistanceStrategy,
+        typename RangeOut
     >
     inline void apply(Point const& point,
                       DistanceStrategy const& distance_strategy,
diff --git a/include/boost/geometry/strategies/geographic/buffer_side_straight.hpp b/include/boost/geometry/strategies/geographic/buffer_side_straight.hpp
index 93588e2af..f5ee2e68e 100644
--- a/include/boost/geometry/strategies/geographic/buffer_side_straight.hpp
+++ b/include/boost/geometry/strategies/geographic/buffer_side_straight.hpp
@@ -54,8 +54,8 @@ public :
     template
     <
         typename Point,
-        typename RangeOut,
-        typename DistanceStrategy
+        typename DistanceStrategy,
+        typename RangeOut
     >
     inline result_code apply(Point const& input_p1, Point const& input_p2,
                              buffer_side_selector side,