diff --git a/mozilla/modules/libpr0n/src/imgLoader.h b/mozilla/modules/libpr0n/src/imgLoader.h
index 5aa6283178a..bf079805383 100644
--- a/mozilla/modules/libpr0n/src/imgLoader.h
+++ b/mozilla/modules/libpr0n/src/imgLoader.h
@@ -41,7 +41,7 @@ class imgLoader : public imgILoader
 {
 public:
   NS_DECL_ISUPPORTS
-  NS_DECL_NSIIMAGELOADER
+  NS_DECL_IMGILOADER
 
   imgLoader();
   virtual ~imgLoader();
diff --git a/mozilla/modules/libpr0n/src/imgRequest.h b/mozilla/modules/libpr0n/src/imgRequest.h
index 984f1603212..edea63f314e 100644
--- a/mozilla/modules/libpr0n/src/imgRequest.h
+++ b/mozilla/modules/libpr0n/src/imgRequest.h
@@ -68,8 +68,8 @@ public:
 
   NS_DECL_ISUPPORTS
   NS_DECL_IMGIREQUEST
+  NS_DECL_IMGIDECODEROBSERVER
   NS_DECL_GFXIIMAGECONTAINEROBSERVER
-  NS_DECL_NSIIMAGEDECODEROBSERVER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSISTREAMOBSERVER
 
diff --git a/mozilla/modules/libpr0n/src/imgRequestProxy.h b/mozilla/modules/libpr0n/src/imgRequestProxy.h
index 852e534bcd4..c9451e538df 100644
--- a/mozilla/modules/libpr0n/src/imgRequestProxy.h
+++ b/mozilla/modules/libpr0n/src/imgRequestProxy.h
@@ -37,12 +37,12 @@
 }
 
 class imgRequestProxy : public imgIRequest,
-                            public imgIDecoderObserver
+                        public imgIDecoderObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_IMGIREQUEST
-  NS_DECL_NSIIMAGEDECODEROBSERVER
+  NS_DECL_IMGIDECODEROBSERVER
   NS_DECL_GFXIIMAGECONTAINEROBSERVER
 
   imgRequestProxy();