diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp
index 8359a90711c..d7f97aec069 100644
--- a/mozilla/xpcom/build/nsXPComInit.cpp
+++ b/mozilla/xpcom/build/nsXPComInit.cpp
@@ -83,7 +83,9 @@
 
 #include "nsILocalFile.h"
 #include "nsLocalFile.h"
+#ifdef XP_UNIX
 #include "nsNativeCharsetUtils.h"
+#endif
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsICategoryManager.h"
diff --git a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
index e4b9e3ac3ee..58a74c3709b 100644
--- a/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
+++ b/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
@@ -744,6 +744,7 @@ NS_ShutdownNativeCharsetUtils()
 #else // non XP_UNIX implementations go here...
 
 #include "nsDebug.h"
+#include "nsAString.h"
 
 NS_COM nsresult
 NS_CopyNativeToUnicode(const nsACString &input, nsAString  &output)