diff --git a/owlps-positioner/measurement.hh b/owlps-positioner/measurement.hh
index 731b11f..c41bae5 100644
--- a/owlps-positioner/measurement.hh
+++ b/owlps-positioner/measurement.hh
@@ -167,13 +167,13 @@ inline float Measurement::get_variance_mw() const
 
 inline float Measurement::get_std_deviation_mw() const
 {
-  return sqrt(variance_mw) ;
+  return sqrtf(variance_mw) ;
 }
 
 
 inline float Measurement::get_std_deviation_dbm() const
 {
-  return sqrt(variance_dbm) ;
+  return sqrtf(variance_dbm) ;
 }
 
 
diff --git a/owlps-positioner/point3d.cc b/owlps-positioner/point3d.cc
index 66f688a..a5431cc 100644
--- a/owlps-positioner/point3d.cc
+++ b/owlps-positioner/point3d.cc
@@ -98,9 +98,8 @@ double Point3D::angle_2d(const Point3D &b, const Point3D &c) const
   if (sq_ab == 0 || sq_ac == 0 || sq_bc == 0)
     return 0 ;
 
-  double
-  ab = sqrt(sq_ab),
-  ac = sqrt(sq_ac) ;
+  double ab = sqrt(sq_ab) ;
+  double ac = sqrt(sq_ac) ;
 
   double cos_bac = (sq_ab + sq_ac - sq_bc) / (2 * ab * ac) ;
   double bac = acos(cos_bac) ;
diff --git a/owlps-positioner/point3d.hh b/owlps-positioner/point3d.hh
index c4380e7..ddd3297 100644
--- a/owlps-positioner/point3d.hh
+++ b/owlps-positioner/point3d.hh
@@ -194,7 +194,7 @@ inline void Point3D::set_coordinates(const Point3D &source)
  */
 inline float Point3D::distance_2d(const Point3D &source) const
 {
-  return sqrt(square_distance_2d(source)) ;
+  return sqrtf(square_distance_2d(source)) ;
 }
 
 
@@ -204,7 +204,7 @@ inline float Point3D::distance_2d(const Point3D &source) const
  */
 inline float Point3D::distance(const Point3D &source) const
 {
-  return sqrt(square_distance(source)) ;
+  return sqrtf(square_distance(source)) ;
 }