diff --git a/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp b/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
index c37367e11..890924984 100644
--- a/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
+++ b/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
@@ -142,4 +142,4 @@ struct default_ps_strategy
 }} // namespace boost::geometry
 
 
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_DEFAULT_STRATEGIES_HPP
\ No newline at end of file
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_DEFAULT_STRATEGIES_HPP
diff --git a/include/boost/geometry/util/combine_if.hpp b/include/boost/geometry/util/combine_if.hpp
index 764845feb..6d8d932a1 100644
--- a/include/boost/geometry/util/combine_if.hpp
+++ b/include/boost/geometry/util/combine_if.hpp
@@ -1,9 +1,5 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 // Copyright (c) 2014 Samuel Debionne, Grenoble, France.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
diff --git a/include/boost/geometry/util/is_implemented.hpp b/include/boost/geometry/util/is_implemented.hpp
index 30b99a3f4..eace2c181 100644
--- a/include/boost/geometry/util/is_implemented.hpp
+++ b/include/boost/geometry/util/is_implemented.hpp
@@ -1,14 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
-// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
-
-// This file was modified by Oracle on 2014.
-// Modifications copyright (c) 2014, Oracle and/or its affiliates.
-
-// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,6 +9,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+
 #ifndef BOOST_GEOMETRY_UTIL_IS_IMPLEMENTED_HPP
 #define BOOST_GEOMETRY_UTIL_IS_IMPLEMENTED_HPP
 
diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp
index ed5856ab4..19d8830c6 100644
--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance.cpp
@@ -311,7 +311,7 @@ template <typename P>
 void test_all()
 {
     test_distance_point<P>();
-     test_distance_segment<P>();
+    test_distance_segment<P>();
     test_distance_array_as_linestring<P>();
 
     test_geometry<P, bg::model::segment<P> >("POINT(1 3)", "LINESTRING(1 1,4 4)", sqrt(2.0));
@@ -438,7 +438,7 @@ template <typename T>
 void test_variant()
 {
     typedef bg::model::point<T, 2, bg::cs::cartesian> point_type;
-    typedef bg::model::segment<fp_point_type> segment_type;
+    typedef bg::model::segment<point_type> segment_type;
     typedef boost::variant<point_type, segment_type> variant_type;
 
     point_type point;