diff --git a/mozilla/intl/locale/src/nsLocaleFactory.cpp b/mozilla/intl/locale/src/nsLocaleFactory.cpp
index 5d871cabdd2..765fd03f3bc 100644
--- a/mozilla/intl/locale/src/nsLocaleFactory.cpp
+++ b/mozilla/intl/locale/src/nsLocaleFactory.cpp
@@ -26,7 +26,7 @@
 #ifdef XP_PC
 #include <windows.h>
 #endif
-#ifdef XP_UNIX
+#ifdef XP_UNIX || defined(XP_BEOS)
 #include <locale.h>
 #include <stdlib.h>
 #include <ctype.h>  // for isalpha, tolower & isspace
diff --git a/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp b/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp
index 7f9d237d6bb..36ff1e49693 100644
--- a/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp
+++ b/mozilla/intl/locale/src/windows/nsIWin32LocaleImpl.cpp
@@ -455,7 +455,7 @@ nsIWin32LocaleImpl::GetXPLocale(LCID winLCID, nsString* locale)
 
 	for(i=0;i<LENGTH_MAPPING_LIST;i++) {
 		if (lang_id==iso_list[i].win_code) {
-			for(j=0;strlen(iso_list[i].sublang_list[j].iso_code)!=0;i++) {
+			for(j=0;strlen(iso_list[i].sublang_list[j].iso_code)!=0;j++) {
 				if (sublang_id == iso_list[i].sublang_list[j].win_code) {
 					PR_snprintf(rfc_locale_string,9,"%s-%s%c",iso_list[i].iso_code,
 						iso_list[i].sublang_list[j].iso_code,0);