diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index ea750d0cf16..f11b6bc0e2e 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -72,7 +72,6 @@
 #include "nsIObserverService.h"
 #include "nsXPCOM.h"
 #include "nsXPFEComponentsCID.h"
-#include "nsNativeCharsetUtils.h"
 
 struct JSContext;
 
diff --git a/mozilla/xpfe/bootstrap/nsStringSupport.h b/mozilla/xpfe/bootstrap/nsStringSupport.h
index 1f4dd9514bd..da9697bc622 100644
--- a/mozilla/xpfe/bootstrap/nsStringSupport.h
+++ b/mozilla/xpfe/bootstrap/nsStringSupport.h
@@ -89,6 +89,12 @@ FindInString(nsCString &str, const char *needle, PRBool ignoreCase = PR_FALSE)
   return p ? p - data : kNotFound;
 }
 
+inline void
+NS_CopyUnicodeToNative(const nsAString &input, nsACString &output)
+{
+  NS_UTF16ToCString(input, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM, output);
+}
+
 typedef nsCString nsCAutoString;
 typedef nsString nsAutoString;
 typedef nsCString nsXPIDLCString;
@@ -97,6 +103,7 @@ typedef nsString nsXPIDLString;
 #else // MOZILLA_STRICT_API
 
 #include "nsString.h"
+#include "nsNativeCharsetUtils.h"
 
 inline void
 AppendIntToString(nsCString &str, PRInt32 value)