diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
index f9a0a3ea6c2..99512a7f384 100644
--- a/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
+++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
@@ -72,10 +72,7 @@ mailing address.
 */
 
 #include <stddef.h>
-#include "prtypes.h"
 #include "prmem.h"
-#include "prlog.h"
-#include "GIF2.h"
 
 #include "nsIImage.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -87,8 +84,6 @@ mailing address.
 
 #include "imgILoad.h"
 
-#include "imgContainer.h"
-
 #include "gfxColor.h"
 #include "gfxPlatform.h"
 #include "lcms.h"
diff --git a/mozilla/modules/libpr0n/src/imgContainer.h b/mozilla/modules/libpr0n/src/imgContainer.h
index dfd159a5fd3..379da52f634 100644
--- a/mozilla/modules/libpr0n/src/imgContainer.h
+++ b/mozilla/modules/libpr0n/src/imgContainer.h
@@ -103,7 +103,7 @@
  *
  * @note
  * <li> "Mask", "Alpha", and "Alpha Level" are interchangable phrases in
- * respects to imgContainerGIF.
+ * respects to imgContainer.
  *
  * @par
  * <li> GIFs never have more than a 1 bit alpha.
@@ -143,8 +143,6 @@ public:
   virtual ~imgContainer();
 
 private:
-  friend class nsGIFDecoder2;
-  
   struct Anim
   {
     //! Area of the first frame that needs to be redrawn on subsequent loops.