diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 56ea630be5a..7d52aa7df12 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -58,10 +58,8 @@
 #undef NOISY_PUSHING
 #endif
 
-nsIID nsInlineFrame::kInlineFrameCID = NS_INLINE_FRAME_CID;
-
-
 
+NS_DEFINE_IID(kInlineFrameCID, NS_INLINE_FRAME_CID);
 
 
 //////////////////////////////////////////////////////////////////////
diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h
index 17b800b15da..bd42309f82d 100644
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -120,8 +120,6 @@ public:
 
   NS_IMETHOD CanContinueTextRun(PRBool& aContinueTextRun) const;
 
-  static nsIID kInlineFrameCID;
-
   // Take all of the frames away from this frame. The caller is
   // presumed to keep them alive.
   void StealAllFrames() {
diff --git a/layout/html/base/src/nsInlineFrame.cpp b/layout/html/base/src/nsInlineFrame.cpp
index 56ea630be5a..7d52aa7df12 100644
--- a/layout/html/base/src/nsInlineFrame.cpp
+++ b/layout/html/base/src/nsInlineFrame.cpp
@@ -58,10 +58,8 @@
 #undef NOISY_PUSHING
 #endif
 
-nsIID nsInlineFrame::kInlineFrameCID = NS_INLINE_FRAME_CID;
-
-
 
+NS_DEFINE_IID(kInlineFrameCID, NS_INLINE_FRAME_CID);
 
 
 //////////////////////////////////////////////////////////////////////
diff --git a/layout/html/base/src/nsInlineFrame.h b/layout/html/base/src/nsInlineFrame.h
index 17b800b15da..bd42309f82d 100644
--- a/layout/html/base/src/nsInlineFrame.h
+++ b/layout/html/base/src/nsInlineFrame.h
@@ -120,8 +120,6 @@ public:
 
   NS_IMETHOD CanContinueTextRun(PRBool& aContinueTextRun) const;
 
-  static nsIID kInlineFrameCID;
-
   // Take all of the frames away from this frame. The caller is
   // presumed to keep them alive.
   void StealAllFrames() {