diff --git a/lib/str_replace.h b/lib/str_replace.h
index d3b39b2785..f6380900e2 100644
--- a/lib/str_replace.h
+++ b/lib/str_replace.h
@@ -45,8 +45,8 @@ extern const char *strcasestr(const char *s1, const char *s2);
 #if !HAVE_STRCASECMP
 inline int strcasecmp(const char* s1, const char* s2) {
     while (*s1 && *s2) {
-        char c1 = tolower(*s1++);
-        char c2 = tolower(*s2++);
+        char c1 = (char)tolower(*s1++);
+        char c2 = (char)tolower(*s2++);
         if (c1 < c2) return -1;
         if (c1 > c2) return 1;
     }
diff --git a/tests/unit-tests/lib/test_parse.cpp b/tests/unit-tests/lib/test_parse.cpp
index 8a428f47cf..50366f220a 100644
--- a/tests/unit-tests/lib/test_parse.cpp
+++ b/tests/unit-tests/lib/test_parse.cpp
@@ -1,8 +1,10 @@
+#include <string>
+#include <ios>
+
 #include "gtest/gtest.h"
 #include "common_defs.h"
 #include "url.h"
-#include <string>
-#include <ios>
+#include "str_replace.h"
 
 using namespace std;