diff --git a/mozilla/lib/plugin/nsIPlug.h b/mozilla/lib/plugin/nsIPlug.h
index 7935a115716..55e2f29d269 100644
--- a/mozilla/lib/plugin/nsIPlug.h
+++ b/mozilla/lib/plugin/nsIPlug.h
@@ -155,6 +155,8 @@ struct nsRect {
 
 #ifdef XP_UNIX
 
+#include <stdio.h>
+
 /*
  * Callback Structures.
  *
diff --git a/mozilla/modules/oji/Makefile b/mozilla/modules/oji/Makefile
index 18922fc7631..2d147bd70d5 100644
--- a/mozilla/modules/oji/Makefile
+++ b/mozilla/modules/oji/Makefile
@@ -10,7 +10,7 @@
 #// root of NS
 #//
 #//------------------------------------------------------------------------
-NS_DEPTH=../..
+DEPTH=../..
 
 #//------------------------------------------------------------------------
 #//
@@ -27,5 +27,5 @@ DIRS= src
 #// Include the common makefile rules
 #//
 #//------------------------------------------------------------------------
-include $(NS_DEPTH)/config/rules.mk
+include $(DEPTH)/config/rules.mk
 
diff --git a/mozilla/modules/oji/src/Makefile b/mozilla/modules/oji/src/Makefile
index 540164cb29d..9ee24c43962 100644
--- a/mozilla/modules/oji/src/Makefile
+++ b/mozilla/modules/oji/src/Makefile
@@ -4,7 +4,7 @@
 #//
 #//------------------------------------------------------------------------
 
-NS_DEPTH        = ../../..
+DEPTH        = ../../..
 
 MODULE		= oji
 
@@ -20,5 +20,5 @@ endif # MOZ_OJI
 
 EXPORTS         = nsjvm.h jvmmgr.h nsscd.h
 
-include $(NS_DEPTH)/config/rules.mk
+include $(DEPTH)/config/rules.mk