diff --git a/mozilla/base/src/nsITimer.h b/mozilla/base/src/nsITimer.h
index 2f3e5787359..6be97cce080 100644
--- a/mozilla/base/src/nsITimer.h
+++ b/mozilla/base/src/nsITimer.h
@@ -45,6 +45,8 @@ typedef void
  */
 class nsITimer : public nsISupports {
 public:  
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMER_IID)
+  
   /**
    * Initialize a timer to fire after the given millisecond interval.
    * This version takes a function to call and a closure to pass to
diff --git a/mozilla/base/src/nsITimerCallback.h b/mozilla/base/src/nsITimerCallback.h
index 9772c3e3f46..80127210477 100644
--- a/mozilla/base/src/nsITimerCallback.h
+++ b/mozilla/base/src/nsITimerCallback.h
@@ -35,7 +35,9 @@ class nsITimer;
  */
 class nsITimerCallback : public nsISupports {
 public:  
-  virtual void Notify(nsITimer *timer)=0;
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMERCALLBACK_IID)
+
+  virtual void Notify(nsITimer *timer) = 0;
 };
 
 #endif
diff --git a/mozilla/modules/oji/public/nsIJVMPluginTagInfo.h b/mozilla/modules/oji/public/nsIJVMPluginTagInfo.h
index ff414ccea48..73c69e1bb16 100644
--- a/mozilla/modules/oji/public/nsIJVMPluginTagInfo.h
+++ b/mozilla/modules/oji/public/nsIJVMPluginTagInfo.h
@@ -36,8 +36,17 @@
 // This interface provides additional hooks into the plugin manager that allow 
 // a plugin to implement the plugin manager's Java virtual machine.
 
+#define NS_IJVMPLUGINTAGINFO_IID                     \
+{ /* 27b42df0-a1bd-11d1-85b1-00805f0e4dfe */         \
+    0x27b42df0,                                      \
+    0xa1bd,                                          \
+    0x11d1,                                          \
+    {0x85, 0xb1, 0x00, 0x80, 0x5f, 0x0e, 0x4d, 0xfe} \
+}
+
 class nsIJVMPluginTagInfo : public nsISupports {
 public:
+	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IJVMPLUGINTAGINFO_IID)
 
     NS_IMETHOD
     GetCode(const char* *result) = 0;
@@ -56,14 +65,6 @@ public:
 
 };
 
-#define NS_IJVMPLUGINTAGINFO_IID                     \
-{ /* 27b42df0-a1bd-11d1-85b1-00805f0e4dfe */         \
-    0x27b42df0,                                      \
-    0xa1bd,                                          \
-    0x11d1,                                          \
-    {0x85, 0xb1, 0x00, 0x80, 0x5f, 0x0e, 0x4d, 0xfe} \
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif /* nsIJVMPluginTagInfo_h___ */
diff --git a/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h b/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
index a3c8e80ecdc..a9324ffd32d 100644
--- a/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
+++ b/mozilla/modules/plugin/base/public/nsIPluginTagInfo2.h
@@ -47,8 +47,17 @@ enum nsPluginTagType {
     nsPluginTagType_Applet
 };
 
+#define NS_IPLUGINTAGINFO2_IID                       \
+{ /* 6a49c9a0-019b-11d2-815b-006008119d7a */         \
+    0x6a49c9a0,                                      \
+    0x019b,                                          \
+    0x11d2,                                          \
+    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
+}
+
 class nsIPluginTagInfo2 : public nsIPluginTagInfo {
 public:
+	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINTAGINFO2_IID)
 
     // QueryInterface on nsIPluginInstancePeer to get this.
 
@@ -107,14 +116,6 @@ public:
 
 };
 
-#define NS_IPLUGINTAGINFO2_IID                       \
-{ /* 6a49c9a0-019b-11d2-815b-006008119d7a */         \
-    0x6a49c9a0,                                      \
-    0x019b,                                          \
-    0x11d2,                                          \
-    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif /* nsIPluginTagInfo2_h___ */
diff --git a/mozilla/modules/plugin/base/src/nsIPluginInstanceOwner.h b/mozilla/modules/plugin/base/src/nsIPluginInstanceOwner.h
index 0def06e8255..04ee10ce35b 100644
--- a/mozilla/modules/plugin/base/src/nsIPluginInstanceOwner.h
+++ b/mozilla/modules/plugin/base/src/nsIPluginInstanceOwner.h
@@ -29,6 +29,7 @@
 struct nsIPluginInstanceOwner : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCEOWNER_IID)
 
   /**
    * Let the owner know that an instance has been created
diff --git a/mozilla/modules/plugin/nglsrc/nsIPluginInstanceOwner.h b/mozilla/modules/plugin/nglsrc/nsIPluginInstanceOwner.h
index 0def06e8255..04ee10ce35b 100644
--- a/mozilla/modules/plugin/nglsrc/nsIPluginInstanceOwner.h
+++ b/mozilla/modules/plugin/nglsrc/nsIPluginInstanceOwner.h
@@ -29,6 +29,7 @@
 struct nsIPluginInstanceOwner : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGININSTANCEOWNER_IID)
 
   /**
    * Let the owner know that an instance has been created
diff --git a/mozilla/modules/plugin/public/nsIPluginTagInfo2.h b/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
index a3c8e80ecdc..a9324ffd32d 100644
--- a/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
+++ b/mozilla/modules/plugin/public/nsIPluginTagInfo2.h
@@ -47,8 +47,17 @@ enum nsPluginTagType {
     nsPluginTagType_Applet
 };
 
+#define NS_IPLUGINTAGINFO2_IID                       \
+{ /* 6a49c9a0-019b-11d2-815b-006008119d7a */         \
+    0x6a49c9a0,                                      \
+    0x019b,                                          \
+    0x11d2,                                          \
+    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
+}
+
 class nsIPluginTagInfo2 : public nsIPluginTagInfo {
 public:
+	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPLUGINTAGINFO2_IID)
 
     // QueryInterface on nsIPluginInstancePeer to get this.
 
@@ -107,14 +116,6 @@ public:
 
 };
 
-#define NS_IPLUGINTAGINFO2_IID                       \
-{ /* 6a49c9a0-019b-11d2-815b-006008119d7a */         \
-    0x6a49c9a0,                                      \
-    0x019b,                                          \
-    0x11d2,                                          \
-    {0x81, 0x5b, 0x00, 0x60, 0x08, 0x11, 0x9d, 0x7a} \
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif /* nsIPluginTagInfo2_h___ */