diff --git a/src/common/componentTools.cpp b/src/common/componentTools.cpp
index 6086b7bcf..3bf3d5815 100644
--- a/src/common/componentTools.cpp
+++ b/src/common/componentTools.cpp
@@ -30,7 +30,12 @@ const char *nsStringToCString(const nsAString &str) {
 #endif
 
   NS_CStringGetData(tmpStr, &cStr);
+
+#ifdef _WIN32
+  return _strdup(cStr);
+#else
   return strdup(cStr);
+#endif
 }
 
 std::string nsStringToString(const nsEmbedString &str) {
@@ -70,5 +75,10 @@ const char *nsStringToUTF8(const nsAString &str) {
   nsCString tmpStr;
   CopyUTF16toUTF8(str, tmpStr);
   NS_CStringGetData(tmpStr, &cStr);
+
+#ifdef _WIN32
+  return _strdup(cStr);
+#else
   return strdup(cStr);
+#endif
 }
diff --git a/src/common/componentTools.h b/src/common/componentTools.h
index 692fc8926..2923003a2 100644
--- a/src/common/componentTools.h
+++ b/src/common/componentTools.h
@@ -20,6 +20,10 @@
 #ifndef KIWIX_COMPONENTTOOLS_H
 #define KIWIX_COMPONENTTOOLS_H
 
+#ifdef _WIN32
+  #include <mozilla/Char16.h>
+#endif
+
 #include<string>
 
 #ifdef __APPLE__