diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h
index 68f38074..668e1515 100644
--- a/include/etl/basic_string.h
+++ b/include/etl/basic_string.h
@@ -1005,7 +1005,7 @@ namespace etl
     {
       ETL_ASSERT(position <= size(), ETL_ERROR(string_out_of_bounds));
 
-      insert(begin() + position, s, s + strlen(s));
+      insert(begin() + position, s, s + etl::strlen(s));
       return *this;
     }
 
diff --git a/include/etl/bitset.h b/include/etl/bitset.h
index 2b0b6abe..aa5dae6d 100644
--- a/include/etl/bitset.h
+++ b/include/etl/bitset.h
@@ -47,6 +47,7 @@ SOFTWARE.
 #include "exception.h"
 #include "integral_limits.h"
 #include "binary.h"
+#include "char_traits.h"
 
 #include "private/minmax_push.h"
 
@@ -294,7 +295,7 @@ namespace etl
     {
       reset();
 
-      size_t i = std::min(NBITS, strlen(text));
+      size_t i = std::min(NBITS, etl::strlen(text));
 
       while (i > 0)
       {