diff --git a/base/string_utils.cpp b/base/string_utils.cpp
index effab2849f..e9f2aa1d39 100644
--- a/base/string_utils.cpp
+++ b/base/string_utils.cpp
@@ -1,10 +1,10 @@
-#include "base/string_utils.hpp"
 #include "base/assert.hpp"
+#include "base/string_utils.hpp"
 
-#include "std/target_os.hpp"
-#include "std/iterator.hpp"
 #include "std/cmath.hpp"
 #include "std/iomanip.hpp"
+#include "std/iterator.hpp"
+#include "std/target_os.hpp"
 
 #include <boost/algorithm/string/trim.hpp>
 
diff --git a/platform/settings.cpp b/platform/settings.cpp
index 500f249b9d..0cb17a4f3f 100644
--- a/platform/settings.cpp
+++ b/platform/settings.cpp
@@ -148,7 +148,7 @@ bool FromStringArray(string const & s, T(&arr)[N])
   size_t count = 0;
   while (count < N && in >> arr[count])
   {
-    if (!std::isfinite(arr[count]))
+    if (!isfinite(arr[count]))
       return false;
     ++count;
   }
diff --git a/std/cmath.hpp b/std/cmath.hpp
index 0601e73eaa..e2dcffaf63 100644
--- a/std/cmath.hpp
+++ b/std/cmath.hpp
@@ -12,6 +12,7 @@
 #endif
 
 using std::abs;
+using std::isfinite;
 
 namespace math
 {