diff --git a/mozilla/js/js2/debugger.cpp b/mozilla/js/js2/debugger.cpp
index 14fc3f95dec..73d3b7876a0 100644
--- a/mozilla/js/js2/debugger.cpp
+++ b/mozilla/js/js2/debugger.cpp
@@ -80,12 +80,12 @@ namespace Debugger {
     }
 
     bool
-    Shell::doCommand (Interpreter::Context */*context*/, const String &source)
+    Shell::doCommand (Interpreter::Context * /*context*/, const String &source)
     {
         Lexer lex (mWorld, source, widenCString("debugger console"), 0);
         const String *cmd;
         ShellCommand match = COMMAND_COUNT;
-        int ambig_matches = 0;
+        uint32 ambig_matches = 0;
         
         const Token &t = lex.get(true);
 
@@ -137,7 +137,7 @@ namespace Debugger {
             }
         else
             mErr << "Ambiguous command '" << *cmd << "', " <<
-                (uint)(ambig_matches + 1) << " similar commands.\n";
+                (ambig_matches + 1) << " similar commands.\n";
 
         return  (ambig_matches == 0);
         
diff --git a/mozilla/js/js2/interpreter.cpp b/mozilla/js/js2/interpreter.cpp
index 26a7f097695..5e9a1dcb1fb 100644
--- a/mozilla/js/js2/interpreter.cpp
+++ b/mozilla/js/js2/interpreter.cpp
@@ -34,6 +34,8 @@
 #include "interpreter.h"
 #include "world.h"
 
+#include <assert.h>
+
 namespace JavaScript {
 namespace JSTypes {
 
diff --git a/mozilla/js/js2/js2.cpp b/mozilla/js/js2/js2.cpp
index 227839974c4..40acd3f401b 100644
--- a/mozilla/js/js2/js2.cpp
+++ b/mozilla/js/js2/js2.cpp
@@ -591,7 +591,8 @@ int main(int argc, char **argv)
 #endif
 
 #if 1
-    using namespace JavaScript::Shell;
+    using namespace JavaScript;
+    using namespace Shell;
     
     assert(testFactorial(world, 5) == 120);
     assert(testObjects(world, 5) == 5);
diff --git a/mozilla/js2/src/debugger.cpp b/mozilla/js2/src/debugger.cpp
index 14fc3f95dec..73d3b7876a0 100644
--- a/mozilla/js2/src/debugger.cpp
+++ b/mozilla/js2/src/debugger.cpp
@@ -80,12 +80,12 @@ namespace Debugger {
     }
 
     bool
-    Shell::doCommand (Interpreter::Context */*context*/, const String &source)
+    Shell::doCommand (Interpreter::Context * /*context*/, const String &source)
     {
         Lexer lex (mWorld, source, widenCString("debugger console"), 0);
         const String *cmd;
         ShellCommand match = COMMAND_COUNT;
-        int ambig_matches = 0;
+        uint32 ambig_matches = 0;
         
         const Token &t = lex.get(true);
 
@@ -137,7 +137,7 @@ namespace Debugger {
             }
         else
             mErr << "Ambiguous command '" << *cmd << "', " <<
-                (uint)(ambig_matches + 1) << " similar commands.\n";
+                (ambig_matches + 1) << " similar commands.\n";
 
         return  (ambig_matches == 0);
         
diff --git a/mozilla/js2/src/interpreter.cpp b/mozilla/js2/src/interpreter.cpp
index 26a7f097695..5e9a1dcb1fb 100644
--- a/mozilla/js2/src/interpreter.cpp
+++ b/mozilla/js2/src/interpreter.cpp
@@ -34,6 +34,8 @@
 #include "interpreter.h"
 #include "world.h"
 
+#include <assert.h>
+
 namespace JavaScript {
 namespace JSTypes {
 
diff --git a/mozilla/js2/tests/cpp/js2_shell.cpp b/mozilla/js2/tests/cpp/js2_shell.cpp
index 227839974c4..40acd3f401b 100644
--- a/mozilla/js2/tests/cpp/js2_shell.cpp
+++ b/mozilla/js2/tests/cpp/js2_shell.cpp
@@ -591,7 +591,8 @@ int main(int argc, char **argv)
 #endif
 
 #if 1
-    using namespace JavaScript::Shell;
+    using namespace JavaScript;
+    using namespace Shell;
     
     assert(testFactorial(world, 5) == 120);
     assert(testObjects(world, 5) == 5);