diff --git a/mozilla/modules/plugin/bad/badapter.cpp b/mozilla/modules/plugin/bad/badapter.cpp
index 4783e5a77a1..20c530a8495 100644
--- a/mozilla/modules/plugin/bad/badapter.cpp
+++ b/mozilla/modules/plugin/bad/badapter.cpp
@@ -414,7 +414,6 @@ public:
 
     NS_DECL_ISUPPORTS
 
-    NS_DECL_NSIBASESTREAM
     NS_DECL_NSIINPUTSTREAM
 
     ////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp
index 4783e5a77a1..20c530a8495 100644
--- a/mozilla/modules/plugin/samples/backward/badapter.cpp
+++ b/mozilla/modules/plugin/samples/backward/badapter.cpp
@@ -414,7 +414,6 @@ public:
 
     NS_DECL_ISUPPORTS
 
-    NS_DECL_NSIBASESTREAM
     NS_DECL_NSIINPUTSTREAM
 
     ////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
index 394c4f3c88b..45fbbd18ba9 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/BackwardAdapter.cpp
@@ -800,15 +800,12 @@ public:
     NS_DECL_ISUPPORTS
 
     ////////////////////////////////////////////////////////////////////////////
-    // from nsIBaseStream:
+    // from nsIInputStream:
 
     /** Close the stream. */
     NS_IMETHOD
     Close(void);
 
-    ////////////////////////////////////////////////////////////////////////////
-    // from nsIInputStream:
-
     /** Return the number of bytes in the stream
      *  @param aLength out parameter to hold the length
      *         of the stream. if an error occurs, the length