diff --git a/mozilla/modules/libimg/public/ilIImageRenderer.h b/mozilla/modules/libimg/public/ilIImageRenderer.h
index 071f7c3e961..20790923a96 100644
--- a/mozilla/modules/libimg/public/ilIImageRenderer.h
+++ b/mozilla/modules/libimg/public/ilIImageRenderer.h
@@ -38,6 +38,8 @@
  */
 class ilIImageRenderer : public nsISupports {
 public:
+
+  NS_DEFINE_STATIC_IID_ACCESSOR(IL_IIMAGERENDERER_IID);
   /**
    *  This is the function invoked for allocating pixmap storage and
    *  platform-specific pixmap resources.
diff --git a/mozilla/modules/libimg/public/ilINetReader.h b/mozilla/modules/libimg/public/ilINetReader.h
index 82fbfa2906c..35f837ea060 100644
--- a/mozilla/modules/libimg/public/ilINetReader.h
+++ b/mozilla/modules/libimg/public/ilINetReader.h
@@ -38,6 +38,8 @@ class ilIURL;
 class ilINetReader : public nsISupports {
 public:
 
+  NS_DEFINE_STATIC_IID_ACCESSOR(IL_INETREADER_IID);
+  
   NS_IMETHOD WriteReady(PRUint32 *max_read)=0;
   
   NS_IMETHOD FirstWrite(const unsigned char *str, int32 len, char* url)=0;
diff --git a/mozilla/modules/libimg/src/ilNetReader.cpp b/mozilla/modules/libimg/src/ilNetReader.cpp
index 48be474cff0..c10de11786e 100644
--- a/mozilla/modules/libimg/src/ilNetReader.cpp
+++ b/mozilla/modules/libimg/src/ilNetReader.cpp
@@ -24,8 +24,6 @@
 #include "ilINetReader.h"
 #include "nsCRT.h"
 
-static NS_DEFINE_IID(kINetReaderIID, IL_INETREADER_IID);
-
 class NetReaderImpl : public ilINetReader {
 public:
 
@@ -70,7 +68,7 @@ NetReaderImpl::~NetReaderImpl()
 {
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS(NetReaderImpl, kINetReaderIID)
+NS_IMPL_THREADSAFE_ISUPPORTS1(NetReaderImpl, ilINetReader)
 
 NS_IMETHODIMP
 NetReaderImpl::WriteReady(PRUint32* max_read)
diff --git a/mozilla/modules/libimg/src/ilclient.cpp b/mozilla/modules/libimg/src/ilclient.cpp
index 1c35e9a7cb7..dd25a4ab661 100644
--- a/mozilla/modules/libimg/src/ilclient.cpp
+++ b/mozilla/modules/libimg/src/ilclient.cpp
@@ -59,7 +59,6 @@ struct il_cache_struct il_cache;
 /*-------------------------------*/
 NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-NS_DEFINE_IID(kIImgDCallbkIID, NS_IIMGDCALLBK_IID);
 
 ImgDCallbk::~ImgDCallbk()
 {
@@ -67,7 +66,7 @@ ImgDCallbk::~ImgDCallbk()
         il_delete_container(ilContainer);
 }
 
-NS_IMPL_ISUPPORTS(ImgDCallbk, kIImgDCallbkIID)
+NS_IMPL_ISUPPORTS1(ImgDCallbk, nsIImgDCallbk)
 
 NS_IMETHODIMP
 ImgDCallbk::CreateInstance(const nsCID &aClass,
@@ -576,7 +575,7 @@ il_get_container(IL_GroupContext *img_cx,
           PR_FREEIF(ic);
           return NULL;
         }
-        nsresult res = imgdcb->QueryInterface(kIImgDCallbkIID, (void**)&imgdcb);
+        nsresult res = imgdcb->QueryInterface(NS_GET_IID(nsIImgDCallbk), (void**)&imgdcb);
         if (NS_FAILED(res)) {
           delete imgdcb;