diff --git a/mozilla/js2/src/debugger.cpp b/mozilla/js2/src/debugger.cpp
index b33f8bafc2e..bc1a3bb7525 100644
--- a/mozilla/js2/src/debugger.cpp
+++ b/mozilla/js2/src/debugger.cpp
@@ -32,6 +32,7 @@
  */
 
 #include "world.h"
+#include "utilities.h"
 #include "debugger.h"
 
 #include <string>
diff --git a/mozilla/js2/src/formatter.cpp b/mozilla/js2/src/formatter.cpp
index c7f5d4a80b1..7cbd83521b9 100644
--- a/mozilla/js2/src/formatter.cpp
+++ b/mozilla/js2/src/formatter.cpp
@@ -484,7 +484,7 @@ namespace JavaScript
 // be at the beginning of a line. Call end before destroying the Formatter;
 // otherwise the last line may not be output to f.
     PrettyPrinter::PrettyPrinter(Formatter &f, uint32 lineWidth):
-            lineWidth(min(lineWidth, unlimitedLineWidth)),
+            lineWidth(min(lineWidth, static_cast<uint32>(unlimitedLineWidth))),
             outputFormatter(f),
             outputPos(0),
             lineNum(0),
diff --git a/mozilla/js2/src/gc_allocator.cpp b/mozilla/js2/src/gc_allocator.cpp
index c73ee2bbdf6..39cc512cef3 100644
--- a/mozilla/js2/src/gc_allocator.cpp
+++ b/mozilla/js2/src/gc_allocator.cpp
@@ -22,6 +22,7 @@
 #include <vector>
 #include <algorithm>
 
+#include "stlcfg.h"
 #include "gc_allocator.h"
 #include "gc_container.h"
 
diff --git a/mozilla/js2/src/utilities.h b/mozilla/js2/src/utilities.h
index 84f10fe183a..ec9b8774c11 100644
--- a/mozilla/js2/src/utilities.h
+++ b/mozilla/js2/src/utilities.h
@@ -34,6 +34,11 @@
 #ifndef utilities_h___
 #define utilities_h___
 
+#ifdef MSC_VER
+     // diasble long identifier warnings
+#    pragma warning(disable: 4786)
+#endif
+
 #include "systemtypes.h"
 
 namespace JavaScript