Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to NS_DECLARE, and make a NS_DEFINE_ macro that's outside the class declaration, r=shaver

camino/src/history/nsIHistoryDisplay.h

@@ -54,7 +54,7 @@ class NS_NO_VTABLE nsIHistoryDisplay : public nsISupports
 {
  public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYDISPLAY_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYDISPLAY_IID)
 
 
   /**
@@ -71,6 +71,7 @@ class NS_NO_VTABLE nsIHistoryDisplay : public nsISupports
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryDisplay, NS_IHISTORYDISPLAY_IID)
 
 #define NS_DECL_NSIHISTORYDISPLAY \
   NS_IMETHOD GetItemCount(PRUint32 *outCount); \

camino/src/history/nsIHistoryItems.h

@@ -76,7 +76,7 @@ class NS_NO_VTABLE nsIHistoryItem : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYITEM_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYITEM_IID)
 
   NS_IMETHOD GetURL(nsACString& outURL) = 0;
   NS_IMETHOD GetReferrer(nsACString& outReferrer) = 0;
@@ -95,6 +95,7 @@ public:
   NS_IMETHOD GetID(nsACString& outIDString) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryItem, NS_IHISTORYITEM_IID)
 
 #define NS_DECL_NSIHISTORYITEM \
   NS_IMETHOD GetURL(nsACString& outURL); \
@@ -115,7 +116,7 @@ class NS_NO_VTABLE nsIHistoryItems : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYITEMS_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYITEMS_IID)
 
   /**
      * GetMaxItemCount
@@ -149,6 +150,7 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryItems, NS_IHISTORYITEMS_IID)
 
 #define NS_DECL_NSIHISTORYITEMS \
   NS_IMETHOD GetMaxItemCount(PRUint32 *outCount); \

camino/src/history/nsIHistoryObserver.h

@@ -56,7 +56,7 @@ class nsIHistoryObserver : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHISTORYOBSERVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHISTORYOBSERVER_IID)
 
   NS_IMETHOD HistoryLoaded() = 0;
   NS_IMETHOD HistoryClosing() = 0;
@@ -72,6 +72,7 @@ public:
   
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHistoryObserver, NS_IHISTORYOBSERVER_IID)
 
 #define NS_DECL_NSIHISTORYOBSERVER \
   NS_IMETHOD HistoryLoaded(); \

content/base/public/mozISanitizingSerializer.h

@@ -113,7 +113,7 @@
 class mozISanitizingHTMLSerializer : public nsISupports {
  public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(MOZ_ISANITIZINGHTMLSERIALIZER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(MOZ_ISANITIZINGHTMLSERIALIZER_IID)
 
   NS_IMETHOD Initialize(nsAString* aOutString,
                         PRUint32 aFlags,
@@ -121,4 +121,7 @@ class mozISanitizingHTMLSerializer : public nsISupports {
   // This function violates string ownership rules, see impl.
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(mozISanitizingHTMLSerializer,
+                              MOZ_ISANITIZINGHTMLSERIALIZER_IID)
+
 #endif

content/base/public/nsIAttribute.h

@@ -55,7 +55,7 @@ class nsDOMAttributeMap;
 class nsIAttribute : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IATTRIBUTE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IATTRIBUTE_IID)
 
   virtual void SetMap(nsDOMAttributeMap *aMap) = 0;
   
@@ -106,4 +106,6 @@ private:
   nsIAttribute(); // Not to be implemented.
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIAttribute, NS_IATTRIBUTE_IID)
+
 #endif /* nsIAttribute_h___ */

content/base/public/nsIContent.h

@@ -74,7 +74,7 @@ class nsAttrValue;
  */
 class nsIContent : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENT_IID)
 
   nsIContent(nsINodeInfo *aNodeInfo)
     : mParentPtrBits(0),
@@ -867,4 +867,6 @@ protected:
   nsCOMPtr<nsINodeInfo> mNodeInfo;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContent, NS_ICONTENT_IID)
+
 #endif /* nsIContent_h___ */

content/base/public/nsIContentIterator.h

@@ -56,7 +56,7 @@ class nsIDOMRange;
 class nsIContentIterator : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTENTITERTOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTITERTOR_IID)
 
   /* Initializes an iterator for the subtree rooted by the node aRoot
    */
@@ -98,12 +98,14 @@ public:
   virtual nsresult PositionAt(nsIContent* aCurNode) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentIterator, NS_ICONTENTITERTOR_IID)
+
 class nsIPresShell;
 
 class nsIGeneratedContentIterator : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IGENERATEDCONTENTITERTOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IGENERATEDCONTENTITERTOR_IID)
 
   /* Initializes an iterator for the subtree rooted by the node aRoot
    */
@@ -112,6 +114,8 @@ public:
   virtual nsresult Init(nsIPresShell *aShell, nsIContent* aContent) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIGeneratedContentIterator,
+                              NS_IGENERATEDCONTENTITERTOR_IID)
 
 #endif // __nsIContentIterator_h___
 

content/base/public/nsIContentSerializer.h

@@ -62,7 +62,7 @@ class nsIDOMDocument; /* forward declaration */
 class nsIContentSerializer : public nsISupports {
  public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTENTSERIALIZER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICONTENTSERIALIZER_IID)
 
   NS_IMETHOD Init(PRUint32 flags, PRUint32 aWrapColumn,
                   const char* aCharSet, PRBool aIsCopying) = 0;
@@ -103,6 +103,8 @@ class nsIContentSerializer : public nsISupports {
                                  nsAString& aStr) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIContentSerializer, NS_ICONTENTSERIALIZER_IID)
+
 #define NS_CONTENTSERIALIZER_CONTRACTID_PREFIX \
 "@mozilla.org/layout/contentserializer;1?mimetype="
 

content/base/public/nsIDocument.h

@@ -114,7 +114,7 @@ class nsIDOMUserDataHandler;
 class nsIDocument : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_IID)
   NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
 
   nsIDocument()
@@ -968,6 +968,7 @@ protected:
   PRUint32 mPartID;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocument, NS_IDOCUMENT_IID)
 
 /**
  * Helper class to automatically handle batching of document updates.  This

content/base/public/nsIDocumentEncoder.h

@@ -82,7 +82,7 @@ class nsIDocumentEncoderNodeFixup : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENTENCODERNODEFIXUP_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENTENCODERNODEFIXUP_IID)
 
   /**
    * Create a fixed up version of a node. This method is called before
@@ -92,11 +92,14 @@ public:
   NS_IMETHOD FixupNode(nsIDOMNode *aNode, nsIDOMNode **aOutNode) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentEncoderNodeFixup,
+                              NS_IDOCUMENTENCODERNODEFIXUP_IID)
+
 class nsIDocumentEncoder : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_ENCODER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_ENCODER_IID)
 
   /**
    * Output methods flag bits.
@@ -264,5 +267,7 @@ public:
   NS_IMETHOD SetNodeFixup(nsIDocumentEncoderNodeFixup *aFixup) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentEncoder, NS_IDOCUMENT_ENCODER_IID)
+
 #endif /* nsIDocumentEncoder_h__ */
 

content/base/public/nsIDocumentObserver.h

@@ -61,7 +61,7 @@ typedef PRUint32 nsUpdateType;
 class nsIDocumentObserver : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_OBSERVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_OBSERVER_IID)
 
   /**
    * Notify that a content model update is beginning. This call can be
@@ -332,6 +332,8 @@ public:
   virtual void DocumentWillBeDestroyed(nsIDocument *aDocument) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentObserver, NS_IDOCUMENT_OBSERVER_IID)
+
 #define NS_DECL_NSIDOCUMENTOBSERVER                                          \
     virtual void BeginUpdate(nsIDocument* aDocument, nsUpdateType aUpdateType);\
     virtual void EndUpdate(nsIDocument* aDocument, nsUpdateType aUpdateType);\

content/base/public/nsIHTMLToTextSink.h

@@ -54,11 +54,13 @@
 class nsIHTMLToTextSink : public nsISupports {
  public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTMLTOTEXTSINK_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTMLTOTEXTSINK_IID)
 
   NS_IMETHOD Initialize(nsAString* aOutString,
                         PRUint32 aFlags, PRUint32 aWrapCol) = 0;
      // This function violates string ownership rules, see impl.
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHTMLToTextSink, NS_IHTMLTOTEXTSINK_IID)
+
 #endif

content/base/public/nsINameSpaceManager.h

@@ -87,7 +87,7 @@ static const PRInt32 kNameSpaceID_None = 0;
 class nsINameSpaceManager : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_INAMESPACEMANAGER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_INAMESPACEMANAGER_IID)
 
   virtual nsresult RegisterNameSpace(const nsAString& aURI,
                                      PRInt32& aNameSpaceID) = 0;
@@ -98,6 +98,8 @@ public:
   virtual PRBool HasElementCreator(PRInt32 aNameSpaceID) = 0;
 };
  
+NS_DEFINE_STATIC_IID_ACCESSOR(nsINameSpaceManager, NS_INAMESPACEMANAGER_IID)
+
 nsresult NS_GetNameSpaceManager(nsINameSpaceManager** aInstancePtrResult);
 
 void NS_NameSpaceManagerShutdown();

content/base/public/nsINodeInfo.h

@@ -76,7 +76,7 @@ class nsIPrincipal;
 class nsINodeInfo : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_INODEINFO_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_INODEINFO_IID)
 
   nsINodeInfo()
     : mInner(nsnull, nsnull, kNameSpaceID_None),
@@ -311,4 +311,6 @@ protected:
   nsNodeInfoManager* mOwnerManager; // Strong reference!
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsINodeInfo, NS_INODEINFO_IID)
+
 #endif /* nsINodeInfo_h___ */

content/base/public/nsIPrivateDOMImplementation.h

@@ -53,11 +53,14 @@ class nsIURI;
 class nsIPrivateDOMImplementation : public nsISupports {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATEDOMIMPLEMENTATION_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATEDOMIMPLEMENTATION_IID)
 
   NS_IMETHOD Init(nsIURI* aBaseURI) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateDOMImplementation,
+                              NS_IPRIVATEDOMIMPLEMENTATION_IID)
+
 nsresult
 NS_NewDOMImplementation(nsIDOMDOMImplementation** aInstancePtrResult);
 

content/base/public/nsIRangeUtils.h

@@ -55,7 +55,7 @@ class nsIContent;
 
 class nsIRangeUtils : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRANGEUTILS_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRANGEUTILS_IID)
 
   NS_IMETHOD_(PRInt32) ComparePoints(nsIDOMNode* aParent1, PRInt32 aOffset1,
                                      nsIDOMNode* aParent2, PRInt32 aOffset2) = 0;
@@ -68,5 +68,7 @@ public:
                                 PRBool *outNodeAfter) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIRangeUtils, NS_IRANGEUTILS_IID)
+
 #endif /* nsIRangeUtils_h___ */
 

content/base/public/nsIScriptElement.h

@@ -53,7 +53,7 @@
  */
 class nsIScriptElement : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCRIPTELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISCRIPTELEMENT_IID)
 
   /**
    * Content type identifying the scripting language. Can be empty, in
@@ -78,4 +78,6 @@ public:
   virtual PRUint32 GetScriptLineNumber() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptElement, NS_ISCRIPTELEMENT_IID)
+
 #endif // nsIScriptElement_h___

content/base/public/nsIStyleSheetLinkingElement.h

@@ -52,7 +52,7 @@ class nsIStyleSheet;
 
 class nsIStyleSheetLinkingElement : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISTYLESHEETLINKINGELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISTYLESHEETLINKINGELEMENT_IID)
 
   /**
    * Used to make the association between a style sheet and
@@ -115,4 +115,7 @@ public:
   virtual void SetLineNumber(PRUint32 aLineNumber) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIStyleSheetLinkingElement,
+                              NS_ISTYLESHEETLINKINGELEMENT_IID)
+
 #endif // nsILinkingElement_h__

content/base/public/nsITextContent.h

@@ -54,7 +54,7 @@ class nsTextFragment;
  */
 class nsITextContent : public nsIContent {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXT_CONTENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ITEXT_CONTENT_IID)
 
   nsITextContent(nsINodeInfo *aNodeInfo)
     : nsIContent(aNodeInfo)
@@ -102,6 +102,8 @@ public:
   virtual void AppendTextTo(nsAString& aResult) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsITextContent, NS_ITEXT_CONTENT_IID)
+
 // XXX These belong elsewhere
 /**
  * aNodeInfoManager must not be null.

content/base/public/nsIXPathEvaluatorInternal.h

@@ -51,7 +51,7 @@ class nsIXPathEvaluatorInternal : public nsISupports
 {
 public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXPATHEVALUATORINTERNAL_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXPATHEVALUATORINTERNAL_IID)
 
   /**
    * Sets the document this evaluator corresponds to
@@ -59,4 +59,7 @@ public:
   NS_IMETHOD SetDocument(nsIDOMDocument* aDocument) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXPathEvaluatorInternal,
+                              NS_IXPATHEVALUATORINTERNAL_IID)
+
 #endif //nsIXPathEvaluatorInternal_h__

content/base/src/nsDocumentEncoder.cpp

@@ -84,7 +84,7 @@ enum nsRangeIterationDirection {
 class nsDocumentEncoder : public nsIDocumentEncoder
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_ENCODER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_ENCODER_IID)
 
   nsDocumentEncoder();
   virtual ~nsDocumentEncoder();
@@ -160,6 +160,8 @@ protected:
   PRPackedBool      mIsCopying;  // Set to PR_TRUE only while copying
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsDocumentEncoder, NS_IDOCUMENT_ENCODER_IID)
+
 NS_IMPL_ADDREF(nsDocumentEncoder)
 NS_IMPL_RELEASE(nsDocumentEncoder)
 

content/base/src/nsGenericElement.h

@@ -1031,7 +1031,7 @@ protected:
 class nsIDocumentFragment : public nsIDOMDocumentFragment
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENTFRAGMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENTFRAGMENT_IID)
 
   /** Tell the children their parent is gone */
   NS_IMETHOD DisconnectChildren() = 0;
@@ -1041,6 +1041,7 @@ public:
   NS_IMETHOD DropChildReferences() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentFragment, NS_IDOCUMENTFRAGMENT_IID)
 
 #define NS_FORWARD_NSIDOMNODE_NO_CLONENODE(_to)                               \
   NS_IMETHOD GetNodeName(nsAString& aNodeName) {                              \

content/canvas/public/nsICanvasElement.h

@@ -48,7 +48,7 @@
 
 class nsICanvasElement : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICANVASELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICANVASELEMENT_IID)
 
   /**
    * Ask the Canvas Element to return the current image container that
@@ -68,4 +68,6 @@ public:
   NS_IMETHOD UpdateImageFrame () = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsICanvasElement, NS_ICANVASELEMENT_IID)
+
 #endif /* nsICanvasElement_h___ */

content/canvas/public/nsICanvasRenderingContextInternal.h

@@ -50,7 +50,7 @@
 
 class nsICanvasRenderingContextInternal : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICANVASRENDERINGCONTEXTINTERNAL_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICANVASRENDERINGCONTEXTINTERNAL_IID)
 
   // This method should NOT hold a ref to aParentCanvas; it will be called
   // with nsnull when the element is going away.
@@ -74,4 +74,7 @@ public:
   NS_IMETHOD UpdateImageFrame() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsICanvasRenderingContextInternal,
+                              NS_ICANVASRENDERINGCONTEXTINTERNAL_IID)
+
 #endif /* nsICanvasRenderingContextInternal_h___ */

content/canvas/src/nsCanvasRenderingContext2D.cpp

@@ -93,7 +93,7 @@ static NS_DEFINE_IID(kBlenderCID, NS_BLENDER_CID);
 class nsCanvasGradient : public nsIDOMCanvasGradient
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_CANVASGRADIENT_PRIVATE_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_CANVASGRADIENT_PRIVATE_IID)
 
     nsCanvasGradient(cairo_pattern_t *cpat, nsICSSParser *cssparser)
         : mPattern(cpat), mCSSParser(cssparser)
@@ -134,6 +134,8 @@ protected:
     nsCOMPtr<nsICSSParser> mCSSParser;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsCanvasGradient, NS_CANVASGRADIENT_PRIVATE_IID)
+
 NS_IMPL_ADDREF(nsCanvasGradient)
 NS_IMPL_RELEASE(nsCanvasGradient)
 
@@ -152,7 +154,7 @@ NS_INTERFACE_MAP_END
 class nsCanvasPattern : public nsIDOMCanvasPattern
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_CANVASPATTERN_PRIVATE_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_CANVASPATTERN_PRIVATE_IID)
 
     nsCanvasPattern(cairo_pattern_t *cpat, PRUint8 *dataToFree)
         : mPattern(cpat), mData(dataToFree)
@@ -176,6 +178,8 @@ protected:
     PRUint8 *mData;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsCanvasPattern, NS_CANVASPATTERN_PRIVATE_IID)
+
 NS_IMPL_ADDREF(nsCanvasPattern)
 NS_IMPL_RELEASE(nsCanvasPattern)
 

content/events/public/nsIEventListenerManager.h

@@ -60,7 +60,7 @@ struct JSObject;
 class nsIEventListenerManager : public nsISupports {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEVENTLISTENERMANAGER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTLISTENERMANAGER_IID)
 
   /**
   * Sets events listeners of all types.
@@ -195,6 +195,9 @@ public:
   virtual PRBool HasUnloadListeners() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventListenerManager,
+                              NS_IEVENTLISTENERMANAGER_IID)
+
 nsresult
 NS_NewEventListenerManager(nsIEventListenerManager** aInstancePtrResult);
 

content/events/public/nsIEventStateManager.h

@@ -56,7 +56,7 @@ class imgIContainer;
 // {1dbe2518-06a1-461c-a1fd-dfbfb0ac0635}
 #define NS_IEVENTSTATEMANAGER_IID \
 { 0x1dbe2518, 0x6a1, 0x461c, \
-  { 0xa1, 0xfd, 0xdf, 0xbf, 0xb0, 0xac, 0x6, 0x35 } };
+  { 0xa1, 0xfd, 0xdf, 0xbf, 0xb0, 0xac, 0x6, 0x35 } }
 
 
 #define NS_EVENT_NEEDS_FRAME(event) (!NS_IS_FOCUS_EVENT(event))
@@ -72,7 +72,7 @@ public:
     eEventFocusedByApplication  // focus gained via Application (like script)
   };
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IEVENTSTATEMANAGER_IID)
 
   NS_IMETHOD Init() = 0;
 
@@ -149,6 +149,8 @@ public:
   NS_IMETHOD ShiftFocus(PRBool aDirection, nsIContent* aStart)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIEventStateManager, NS_IEVENTSTATEMANAGER_IID)
+
 #define NS_EVENT_STATE_ACTIVE        0x00000001 // mouse is down on content
 #define NS_EVENT_STATE_FOCUS         0x00000002 // content has focus
 #define NS_EVENT_STATE_HOVER         0x00000004 // mouse is hovering over content

content/events/public/nsIPrivateCompositionEvent.h

@@ -49,12 +49,15 @@
 class nsIPrivateCompositionEvent : public nsISupports {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATECOMPOSITIONEVENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATECOMPOSITIONEVENT_IID)
 
   NS_IMETHOD GetCompositionReply(struct nsTextEventReply** aReply) = 0;
   NS_IMETHOD GetReconversionReply(nsReconversionEventReply** aReply) = 0;
   NS_IMETHOD GetQueryCaretRectReply(nsQueryCaretRectEventReply** aReply) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateCompositionEvent,
+                              NS_IPRIVATECOMPOSITIONEVENT_IID)
+
 #endif // nsIPrivateCompositionEvent_h__
 

content/events/public/nsIPrivateDOMEvent.h

@@ -57,7 +57,7 @@ class nsEvent;
 class nsIPrivateDOMEvent : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATEDOMEVENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATEDOMEVENT_IID)
 
   NS_IMETHOD DuplicatePrivateData() = 0;
   NS_IMETHOD SetTarget(nsIDOMEventTarget* aTarget) = 0;
@@ -69,6 +69,8 @@ public:
   NS_IMETHOD SetTrusted(PRBool aTrusted)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateDOMEvent, NS_IPRIVATEDOMEVENT_IID)
+
 nsresult
 NS_NewDOMEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, nsEvent *aEvent);
 nsresult

content/events/public/nsIPrivateTextEvent.h

@@ -50,12 +50,14 @@
 class nsIPrivateTextEvent : public nsISupports {
 
 public:
-	NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTEVENT_IID)
+	NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTEVENT_IID)
 
 	NS_IMETHOD GetText(nsString& aText) = 0;
 	NS_IMETHOD GetInputRange(nsIPrivateTextRangeList** aInputRange) = 0;
 	NS_IMETHOD GetEventReply(struct nsTextEventReply** aReply) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateTextEvent, NS_IPRIVATETEXTEVENT_IID)
+
 #endif // nsIPrivateTextEvent_h__
 

content/events/public/nsIPrivateTextRange.h

@@ -47,7 +47,7 @@
 
 class nsIPrivateTextRange : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTRANGE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTRANGE_IID)
   enum {
     TEXTRANGE_CARETPOSITION = 1,
     TEXTRANGE_RAWINPUT = 2,
@@ -66,16 +66,21 @@ public:
   NS_IMETHOD    SetRangeType(PRUint16 aRangeType)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateTextRange, NS_IPRIVATETEXTRANGE_IID)
+
 #define NS_IPRIVATETEXTRANGELIST_IID \
 { 0x1ee9d531, 0x2a79, 0x11d3, \
 { 0x9e, 0xa4, 0x0, 0x60, 0x8, 0x9f, 0xe5, 0x9b} } 
 
 class nsIPrivateTextRangeList : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTRANGELIST_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IPRIVATETEXTRANGELIST_IID)
 
   NS_IMETHOD    GetLength(PRUint16* aLength)=0;
   NS_IMETHOD    Item(PRUint16 aIndex, nsIPrivateTextRange** aReturn)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIPrivateTextRangeList,
+                              NS_IPRIVATETEXTRANGELIST_IID)
+
 #endif // nsIPrivateTextRange_h__

content/html/content/public/nsIForm.h

@@ -68,7 +68,7 @@ class nsIURI;
 class nsIForm : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORM_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORM_IID)
 
   /**
    * Add an element to end of this form's list of elements
@@ -186,4 +186,6 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIForm, NS_IFORM_IID)
+
 #endif /* nsIForm_h___ */

content/html/content/public/nsIFormControl.h

@@ -82,7 +82,7 @@ class nsIFormControl : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMCONTROL_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMCONTROL_IID)
 
   /**
    * Get the form for this form control.
@@ -143,4 +143,6 @@ public:
   virtual PRBool AllowDrop() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormControl, NS_IFORMCONTROL_IID)
+
 #endif /* nsIFormControl_h___ */

content/html/content/public/nsIFormProcessor.h

@@ -73,7 +73,7 @@ class nsVoidArray;
 
 class nsIFormProcessor : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMPROCESSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMPROCESSOR_IID)
 
   /* ProcessValue is called for each name value pair that is 
    * about to be submitted for both "get" and "post" form submissions.
@@ -106,5 +106,7 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormProcessor, NS_IFORMPROCESSOR_IID)
+
 #endif /* nsIFormProcessor_h__ */
 

content/html/content/public/nsIFormSubmission.h

@@ -62,7 +62,7 @@ class nsIFormSubmission : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMISSION_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMSUBMISSION_IID)
 
   /**
    * Find out whether or not this form submission accepts files
@@ -118,6 +118,8 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormSubmission, NS_IFORMSUBMISSION_IID)
+
 //
 // Factory methods
 // 

content/html/content/public/nsIFormSubmitObserver.h

@@ -62,7 +62,7 @@ class nsIURI;
 
 class nsIFormSubmitObserver : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFORMSUBMITOBSERVER_IID)
 
   /*
    *   Subject calls the observer when the form is submitted
@@ -77,5 +77,8 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFormSubmitObserver,
+                              NS_IFORMSUBMITOBSERVER_IID)
+
 #endif /* nsIFormSubmitObserver_h__ */
 

content/html/content/public/nsIFrameSetElement.h

@@ -72,7 +72,7 @@ struct nsFramesetSpec {
 class nsIFrameSetElement : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFRAMESETELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFRAMESETELEMENT_IID)
 
   /**
    * GetRowSpec is used to get the "rows" spec.
@@ -95,5 +95,6 @@ public:
   NS_IMETHOD GetColSpec(PRInt32 *aNumValues, const nsFramesetSpec** aSpecs) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFrameSetElement, NS_IFRAMESETELEMENT_IID)
 
 #endif // nsIFramesetElement_h___

content/html/content/public/nsILink.h

@@ -57,7 +57,7 @@ class nsIURI;
  */
 class nsILink : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILINK_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ILINK_IID)
 
   /**
    * Get the cached state of the link.  If the state is unknown, 
@@ -102,4 +102,6 @@ public:
   NS_IMETHOD LinkRemoved() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsILink, NS_ILINK_IID)
+
 #endif /* nsILink_h___ */

content/html/content/public/nsIOptionElement.h

@@ -56,7 +56,7 @@
 class nsIOptionElement : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IOPTIONELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IOPTIONELEMENT_IID)
 
   /**
    * Select the option element from its own point of view.  This should only be
@@ -67,5 +67,7 @@ public:
   NS_IMETHOD SetSelectedInternal(PRBool aValue, PRBool aNotify) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIOptionElement, NS_IOPTIONELEMENT_IID)
+
 #endif // nsIOptionElement_h___
 

content/html/content/public/nsIRadioControlElement.h

@@ -56,7 +56,7 @@ class nsIForm;
 class nsIRadioControlElement : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOCONTROLELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRADIOCONTROLELEMENT_IID)
 
   /**
    * Set the radio button checked, but don't do any extra checks and don't
@@ -115,4 +115,7 @@ public:
   virtual already_AddRefed<nsIRadioGroupContainer> GetRadioGroupContainer() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIRadioControlElement,
+                              NS_IRADIOCONTROLELEMENT_IID)
+
 #endif // nsIRadioControlElement_h___

content/html/content/public/nsIRadioGroupContainer.h

@@ -55,7 +55,7 @@ class nsIRadioGroupContainer : public nsISupports
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOGROUPCONTAINER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRADIOGROUPCONTAINER_IID)
 
   /**
    * Walk through the radio group, visiting each note with avisitor->Visit()
@@ -131,4 +131,7 @@ public:
                                 PRInt32 *aItemsInGroup) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIRadioGroupContainer,
+                              NS_IRADIOGROUPCONTAINER_IID)
+
 #endif /* nsIRadioGroupContainer_h__ */

content/html/content/public/nsIRadioVisitor.h

@@ -54,7 +54,7 @@ class nsIFormControl;
 class nsIRadioVisitor : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOVISITOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IRADIOVISITOR_IID)
 
   /**
    * Visit a node in the tree.  This is meant to be called on all radios in a
@@ -71,6 +71,8 @@ public:
   NS_IMETHOD Visit(nsIFormControl* aRadio, PRBool* aStop) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIRadioVisitor, NS_IRADIOVISITOR_IID)
+
 /**
  * This visitor sets CheckedChanged on all elements it finds.
  *

content/html/content/public/nsITextControlElement.h

@@ -55,7 +55,7 @@ class nsITextControlFrame;
 class nsITextControlElement : public nsISupports {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITEXTCONTROLELEMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ITEXTCONTROLELEMENT_IID)
 
   /**
    * Set the control's value without security checks
@@ -68,5 +68,8 @@ public:
   NS_IMETHOD SetValueChanged(PRBool changed) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsITextControlElement,
+                              NS_ITEXTCONTROLELEMENT_IID)
+
 #endif // nsITextControlElement_h___
 

content/html/document/src/nsIHTMLDocument.h

@@ -63,7 +63,7 @@ class nsIDOMHTMLBodyElement;
 class nsIHTMLDocument : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTMLDOCUMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTMLDOCUMENT_IID)
 
   virtual nsresult AddImageMap(nsIDOMHTMLMapElement* aMap) = 0;
 
@@ -115,4 +115,6 @@ public:
   virtual nsContentList* GetForms() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIHTMLDocument, NS_IHTMLDOCUMENT_IID)
+
 #endif /* nsIHTMLDocument_h___ */

content/svg/content/src/nsIDOMSVGListener.h

@@ -51,7 +51,7 @@ class nsIDOMEvent;
 
 class nsIDOMSVGListener : public nsIDOMEventListener {
  public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMSVGLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMSVGLISTENER_IID)
   NS_IMETHOD Load   (nsIDOMEvent* aEvent) = 0;
   NS_IMETHOD Unload (nsIDOMEvent* aEvent) = 0;
   NS_IMETHOD Abort  (nsIDOMEvent* aEvent) = 0;
@@ -60,4 +60,6 @@ class nsIDOMSVGListener : public nsIDOMEventListener {
   NS_IMETHOD Scroll (nsIDOMEvent* aEvent) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMSVGListener, NS_IDOMSVGLISTENER_IID)
+
 #endif // __NS_SVGEVENT_H__

content/svg/content/src/nsIDOMSVGZoomListener.h

@@ -51,8 +51,11 @@ class nsIDOMEvent;
 
 class nsIDOMSVGZoomListener : public nsIDOMEventListener {
  public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMSVGZOOMLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMSVGZOOMLISTENER_IID)
   NS_IMETHOD Zoom (nsIDOMEvent* aEvent) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMSVGZoomListener,
+                              NS_IDOMSVGZOOMLISTENER_IID)
+
 #endif // __NS_SVGZOOMEVENT_H__

content/svg/content/src/nsISVGAngle.h

@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla SVG project.
- *
- * The Initial Developer of the Original Code is IBM Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_ISVGANGLE_H__
-#define __NS_ISVGANGLE_H__
-
-#include "nsIDOMSVGAngle.h"
-
-////////////////////////////////////////////////////////////////////////
-// nsISVGAngle: private interface for svg angles
-
-// {7ac1f558-4460-4e32-98d2-179a666c28d8}
-#define NS_ISVGANGLE_IID \
-{ 0x7ac1f558, 0x4460, 0x4e32, { 0x98, 0xd2, 0x17, 0x9a, 0x66, 0x6c, 0x28, 0xd8 } }
-
-class nsISVGAngle : public nsIDOMSVGAngle
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGANGLE_IID)
-};
-
-
-#endif // __NS_ISVGANGLE_H__

content/svg/content/src/nsISVGEnum.h

@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla SVG project.
- *
- * The Initial Developer of the Original Code is
- * IBM Corporation
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tim Rowley <tor@cs.brown.edu> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_ISVGENUM_H__
-#define __NS_ISVGENUM_H__
-
-#include "nsISupports.h"
-
-////////////////////////////////////////////////////////////////////////
-// nsISVGEnum: private interface for svg lengths
-
-// {6bb710c5-a18c-45fc-a412-f042bae4da2d}
-#define NS_ISVGENUM_IID \
-{ 0x6bb710c5, 0xa18c, 0x45fc, { 0xa4, 0x12, 0xf0, 0x42, 0xba, 0xe4, 0xda, 0x2d } }
-
-class nsISVGEnum : public nsISupports
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGENUM_IID)
-
-  NS_IMETHOD GetIntegerValue(PRUint16 &value)=0;
-  NS_IMETHOD SetIntegerValue(PRUint16 value)=0;
-};
-
-#endif // __NS_ISVGENUM_H__
-

content/svg/content/src/nsISVGFilter.h

@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla SVG project.
- *
- * The Initial Developer of the Original Code is IBM Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_ISVGFILTER_H__
-#define __NS_ISVGFILTER_H__
-
-#define NS_ISVGFILTER_IID \
-{ 0xbc1bf81a, 0x9765, 0x43c0, { 0xb3, 0x17, 0xd6, 0x91, 0x66, 0xcd, 0x3a, 0x30 } }
-
-// Bitfields used by nsISVGFilter::GetRequirements()
-#define NS_FE_SOURCEGRAPHIC   0x01
-#define NS_FE_SOURCEALPHA     0x02
-#define NS_FE_BACKGROUNDIMAGE 0x04
-#define NS_FE_BACKGROUNDALPHA 0x08
-#define NS_FE_FILLPAINT       0x10
-#define NS_FE_STROKEPAINT     0x20
-
-class nsSVGFilterInstance;
-
-class nsISVGFilter : public nsISupports {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGFILTER_IID)
-
-  // Perform the filter operation on the images/regions
-  // specified by 'instance'
-  NS_IMETHOD Filter(nsSVGFilterInstance *instance) = 0;
-
-  // Get the standard image source requirements of this filter.
-  NS_IMETHOD GetRequirements(PRUint32 *aRequirements) = 0;
-};
-
-#endif

content/svg/content/src/nsISVGLength.h

@@ -53,10 +53,11 @@ class nsSVGCoordCtx;
 class nsISVGLength : public nsIDOMSVGLength
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGLENGTH_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISVGLENGTH_IID)
 
   NS_IMETHOD SetContext(nsSVGCoordCtx* ctx)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsISVGLength, NS_ISVGLENGTH_IID)
 
 #endif // __NS_ISVGLENGTH_H__

content/svg/content/src/nsISVGValue.h

@@ -71,7 +71,7 @@ public:
     mod_die
   };
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGVALUE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISVGVALUE_IID)
 
   NS_IMETHOD SetValueString(const nsAString& aValue)=0;
   NS_IMETHOD GetValueString(nsAString& aValue)=0;
@@ -83,6 +83,8 @@ public:
   NS_IMETHOD EndBatchUpdate()=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsISVGValue, NS_ISVGVALUE_IID)
+
 nsresult
 NS_CreateSVGGenericStringValue(const nsAString& aValue, nsISVGValue** aResult);
 

content/svg/content/src/nsISVGValueObserver.h

@@ -62,7 +62,7 @@ class nsISVGValue;
 class nsISVGValueObserver : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGVALUEOBSERVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ISVGVALUEOBSERVER_IID)
   
   NS_IMETHOD WillModifySVGObservable(nsISVGValue* observable,
                                      nsISVGValue::modificationType)=0;
@@ -70,5 +70,7 @@ public:
                                      nsISVGValue::modificationType)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsISVGValueObserver, NS_ISVGVALUEOBSERVER_IID)
+
 #endif // __NS_ISVGVALUEOBSERVER_H__
 

content/svg/content/src/nsSVGCoordCtxProvider.h

@@ -96,7 +96,7 @@ private:
 class nsSVGCoordCtxProvider : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_SVGCOORDCTXPROVIDER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_SVGCOORDCTXPROVIDER_IID)
 
   nsSVGCoordCtxProvider() : mInner(new nsSVGCoordCtxHolder) {}
     
@@ -115,4 +115,7 @@ private:
   nsRefPtr<nsSVGCoordCtxHolder> mInner;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGCoordCtxProvider,
+                              NS_SVGCOORDCTXPROVIDER_IID)
+
 #endif // __NS_SVGCOORDCTXPROVIDER_H__

content/svg/content/src/nsSVGUseElement.cpp

@@ -77,7 +77,7 @@ protected:
   virtual nsresult Init();
   
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_SVG_USE_ELEMENT_IMPL_CID);
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_SVG_USE_ELEMENT_IMPL_CID)
 
   // interfaces:
   
@@ -132,6 +132,8 @@ protected:
   nsCOMPtr<nsIContent> mClone;  // cloned tree
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsSVGUseElement, NS_SVG_USE_ELEMENT_IMPL_CID)
+
 ////////////////////////////////////////////////////////////////////////
 // implementation
 

content/xbl/public/nsIBindingManager.h

@@ -64,7 +64,7 @@ class nsVoidArray;
 class nsIBindingManager : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBINDING_MANAGER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IBINDING_MANAGER_IID)
 
   virtual nsXBLBinding* GetBinding(nsIContent* aContent) = 0;
   NS_IMETHOD SetBinding(nsIContent* aContent, nsXBLBinding* aBinding) = 0;
@@ -178,4 +178,6 @@ public:
   NS_IMETHOD ShouldBuildChildFrames(nsIContent* aContent, PRBool* aResult) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIBindingManager, NS_IBINDING_MANAGER_IID)
+
 #endif // nsIBinding_Manager_h__

content/xbl/public/nsIXBLDocumentInfo.h

@@ -61,7 +61,7 @@ class nsACString;
 class nsIXBLDocumentInfo : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXBLDOCUMENTINFO_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXBLDOCUMENTINFO_IID)
 
   NS_IMETHOD GetDocument(nsIDocument** aResult)=0;
   
@@ -79,6 +79,8 @@ public:
   NS_IMETHOD_(PRBool) IsChrome()=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXBLDocumentInfo, NS_IXBLDOCUMENTINFO_IID)
+
 nsresult
 NS_NewXBLDocumentInfo(nsIDocument* aDocument, nsIXBLDocumentInfo** aResult);
 

content/xbl/public/nsIXBLService.h

@@ -62,7 +62,7 @@ class nsIAtom;
 class nsIXBLService : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXBLSERVICE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXBLSERVICE_IID)
 
   // This function loads a particular XBL file and installs all of the bindings
   // onto the element.
@@ -86,4 +86,6 @@ public:
   
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXBLService, NS_IXBLSERVICE_IID)
+
 #endif // nsIXBLService_h__

content/xml/content/public/nsIXMLContent.h

@@ -55,7 +55,7 @@ class nsIDocShell;
  */
 class nsIXMLContent : public nsIContent {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXMLCONTENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXMLCONTENT_IID)
   
   nsIXMLContent(nsINodeInfo *aNodeInfo)
     : nsIContent(aNodeInfo)
@@ -80,4 +80,6 @@ public:
   NS_IMETHOD MaybeTriggerAutoLink(nsIDocShell *aShell) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXMLContent, NS_IXMLCONTENT_IID)
+
 #endif // nsIXMLContent_h___

content/xml/document/public/nsILoadSaveContentSink.h

@@ -53,10 +53,13 @@
 class nsILoadSaveContentSink : public nsIXMLContentSink {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOADSAVE_CONTENT_SINK_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ILOADSAVE_CONTENT_SINK_IID)
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsILoadSaveContentSink,
+                              NS_ILOADSAVE_CONTENT_SINK_IID)
+
 /**
  * The nsIXMLContentSink passed to this method must also implement
  * nsIExpatSink.

content/xml/document/public/nsIXMLContentSink.h

@@ -75,10 +75,12 @@ class nsIChannel;
 class nsIXMLContentSink : public nsIContentSink {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXMLCONTENT_SINK_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXMLCONTENT_SINK_IID)
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXMLContentSink, NS_IXMLCONTENT_SINK_IID)
+
 nsresult
 NS_NewXMLContentSink(nsIXMLContentSink** aInstancePtrResult, nsIDocument* aDoc,
                      nsIURI* aURL, nsISupports* aContainer,

content/xslt/public/nsIDocumentTransformer.h

@@ -54,7 +54,7 @@ class nsITransformObserver : public nsISupports
 {
 public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITRANSFORMOBSERVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ITRANSFORMOBSERVER_IID)
 
   NS_IMETHOD OnDocumentCreated(nsIDOMDocument *aResultDocument) = 0;
 
@@ -63,6 +63,8 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsITransformObserver, NS_ITRANSFORMOBSERVER_IID)
+
 #define NS_IDOCUMENTTRANSFORMER_IID \
   {0x43e5a6c6, 0xa53c, 0x4f97, \
     { 0x91, 0x79, 0x47, 0xf2, 0x46, 0xec, 0xd9, 0xd6 }}
@@ -71,7 +73,7 @@ class nsIDocumentTransformer : public nsISupports
 {
 public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENTTRANSFORMER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOCUMENTTRANSFORMER_IID)
 
   NS_IMETHOD SetTransformObserver(nsITransformObserver* aObserver) = 0;
   NS_IMETHOD LoadStyleSheet(nsIURI* aUri, nsILoadGroup* aLoadGroup,
@@ -80,4 +82,7 @@ public:
   NS_IMETHOD CancelLoads() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocumentTransformer,
+                              NS_IDOCUMENTTRANSFORMER_IID)
+
 #endif //nsIDocumentTransformer_h__

content/xslt/src/xpath/nsIXFormsUtilityService.h

@@ -79,7 +79,7 @@ class nsIXFormsModelElement; /* forward declaration */
 class NS_NO_VTABLE nsIXFormsUtilityService : public nsISupports {
  public: 
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXFORMSUTILITYSERVICE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXFORMSUTILITYSERVICE_IID)
 
   /**
    * Function to get the corresponding model element from a xforms node or
@@ -158,6 +158,9 @@ class NS_NO_VTABLE nsIXFormsUtilityService : public nsISupports {
                                  PRInt32         * aDays) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXFormsUtilityService,
+                              NS_IXFORMSUTILITYSERVICE_IID)
+
 #define NS_ERROR_XFORMS_CALCUATION_EXCEPTION \
                        NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_GENERAL, 3001)
 

content/xslt/src/xpath/nsIXFormsXPathEvaluator.h

@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla XForms support.
- *
- * The Initial Developer of the Original Code is
- * IBM Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Aaron Reed <aaronr@us.ibm.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIXFormsXPathEvaluator_h
-#define nsIXFormsXPathEvaluator_h 
-
-
-#include "nsISupports.h"
-
-/* For IDL files that don't want to include root IDL files. */
-#ifndef NS_NO_VTABLE
-#define NS_NO_VTABLE
-#endif
-class nsIDOMNode; /* forward declaration */
-class nsIDOMNSXPathExpression; /* forward declaration */
-
-/* starting interface:    nsIXFormsXPathEvaluator */
-#define NS_XFORMS_XPATH_EVALUATOR_CONTRACTID "@mozilla.org/dom/xforms-xpath-evaluator;1"
-/* 4cdd884f-f949-4d82-bb78-b8edd9f1420c */
-#define TRANSFORMIIX_XFORMS_XPATH_EVALUATOR_CID   \
-{ 0x4cdd884f, 0xf949, 0x4d82, \
-  {0xbb, 0x78, 0xb8, 0xed, 0xd9, 0xf1, 0x42, 0x0c} }
-
-/* 61e5a446-73f7-432e-a2d6-d94d4a51aed8 */
-#define TRANSFORMIIX_XFORMS_XPATH_EVALUATOR_IID   \
-{ 0x61e5a446, 0x73f7, 0x432e, \
-  {0xa2, 0xd6, 0xd9, 0x4d, 0x4a, 0x51, 0xae, 0xd8} }
-
-/* Use this macro when declaring classes that implement this interface. */
-#define NS_DECL_NSIXFORMXPATHEVALUATOR \
-  NS_IMETHOD CreateExpression(const nsAString & aExpression, nsIDOMNode *aResolverNode, nsIDOMNSXPathExpression **aResult); \
-  NS_IMETHOD Evaluate(const nsAString & aExpression, nsIDOMNode *aContextNode, PRUint32 aContextPosition, PRUint32 aContextSize, nsIDOMNode *aResolverNode, PRUint16 aType, nsISupports *aInResult, nsISupports **aResult); 
-
-/**
- * Private interface implemented by the nsXFormsXPathEvaluator in Transformiix
- *   and will move to the XForms extension when XPath is made extensible.  We
- *   are using this interface instead of nsIDOMXPathEvaluator since we can
- *   don't really need all of that overhead.  For example, this interface uses
- *   a resolver node from the xforms document rather than forcing XForms to
- *   create a namespace resolver node prior to creating the expression or
- *   running an evaluation.
- */
-class NS_NO_VTABLE nsIXFormsXPathEvaluator : public nsISupports {
- public: 
-
-  NS_DEFINE_STATIC_IID_ACCESSOR(TRANSFORMIIX_XFORMS_XPATH_EVALUATOR_IID)
-
-  /**
-   * Function to create a nsIDOMNSXPathExpression from the provided expression
-   * string.  aResolverNode is the xforms node that the expression is
-   * associated with.
-   */
-  NS_IMETHOD CreateExpression(const nsAString & aExpression, nsIDOMNode *aResolverNode, nsIDOMNSXPathExpression **aResult) = 0;
-
-  /**
-   * Function to evaluate the given expression.  aResolverNode is the xforms
-   * node that the expression is associated with.  The other parameters are as
-   * required by DOM's XPathEvaluator.
-   */
-  NS_IMETHOD Evaluate(const nsAString & aExpression, nsIDOMNode *aContextNode, PRUint32 aContextPosition, PRUint32 aContextSize, nsIDOMNode *aResolverNode, PRUint16 aType, nsISupports *aInResult, nsISupports **aResult) = 0;
-
-};
-
-#endif /* nsIXFormsXPathEvaluator_h  */

content/xslt/src/xpath/nsXPathResult.h

@@ -48,18 +48,20 @@
 
 // {15b9b301-2012-11d6-a7f2-e6d0a678995c}
 #define NS_IXPATHRESULT_IID \
-{ 0x15b9b301, 0x2012, 0x11d6, {0xa7, 0xf2, 0xe6, 0xd0, 0xa6, 0x78, 0x99, 0x5c }};
+{ 0x15b9b301, 0x2012, 0x11d6, {0xa7, 0xf2, 0xe6, 0xd0, 0xa6, 0x78, 0x99, 0x5c }}
 
 class nsIXPathResult : public nsISupports
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXPATHRESULT_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXPATHRESULT_IID)
     virtual nsresult SetExprResult(txAExprResult *aExprResult,
                                    PRUint16 aResultType) = 0;
     virtual nsresult GetExprResult(txAExprResult **aExprResult) = 0;
     virtual nsresult Clone(nsIXPathResult **aResult) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXPathResult, NS_IXPATHRESULT_IID)
+
 /**
  * Helper class to keep Mozilla node objects alive as long as the nodeset is
  * alive.

content/xtf/src/nsIXTFElementWrapperPrivate.h

@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla XTF project.
- *
- * The Initial Developer of the Original Code is
- * Alex Fritze.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Alex Fritze <alex@croczilla.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_IXTFELEMENTWRAPPERPRIVATE_H__
-#define __NS_IXTFELEMENTWRAPPERPRIVATE_H__
-
-#include "nsISupports.h"
-
-// {599EB85F-ABC0-4B52-A1B0-EA103D48E3AE}
-#define NS_IXTFELEMENTWRAPPERPRIVATE_IID \
-{ 0x599eb85f, 0xabc0, 0x4b52, { 0xa1, 0xb0, 0xea, 0x10, 0x3d, 0x48, 0xe3, 0xae } }
-
-
-class nsIXTFElementWrapperPrivate : public nsISupports
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXTFELEMENTWRAPPERPRIVATE_IID)
-
-  // element type as given in nsIXTFElement:
-  virtual PRUint32 GetElementType() = 0;
-};
-
-#endif // __NS_IXTFELEMENTWRAPPERPRIVATE_H__

content/xtf/src/nsIXTFService.h

@@ -51,13 +51,15 @@ class nsINodeInfo;
 class nsIXTFService : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXTFSERVICE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXTFSERVICE_IID)
 
     // try to create an xtf element based on namespace
     virtual nsresult CreateElement(nsIContent** aResult,
                                    nsINodeInfo* aNodeInfo)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXTFService, NS_IXTFSERVICE_IID)
+
 //----------------------------------------------------------------------
 // The one class implementing this interface:
 

content/xtf/src/nsIXTFVisualWrapperPrivate.h

@@ -1,66 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Mozilla XTF project.
- *
- * The Initial Developer of the Original Code is
- * Alex Fritze.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Alex Fritze <alex@croczilla.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef __NS_IXTFVISUALWRAPPERPRIVATE_H__
-#define __NS_IXTFVISUALWRAPPERPRIVATE_H__
-
-#include "nsISupports.h"
-
-class nsISupportsArray;
-class nsIDOMElement;
-
-////////////////////////////////////////////////////////////////////////
-// nsIXTFVisualWrapperPrivate: private interface for visual frames
-
-// {B628361B-4466-407F-AD26-58F282DBB6DD}
-#define NS_IXTFVISUALWRAPPERPRIVATE_IID \
-{ 0xb628361b, 0x4466, 0x407f, { 0xad, 0x26, 0x58, 0xf2, 0x82, 0xdb, 0xb6, 0xdd } }
-
-class nsIXTFVisualWrapperPrivate : public nsISupports
-{
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXTFVISUALWRAPPERPRIVATE_IID)
-
-  NS_IMETHOD CreateAnonymousContent(nsPresContext* aPresContext,
-                                    nsISupportsArray& aAnonymousItems) = 0;
-  virtual void DidLayout() = 0;
-  virtual void GetInsertionPoint(nsIDOMElement** insertionPoint) = 0;
-  virtual PRBool ApplyDocumentStyleSheets() = 0;
-};
-
-#endif // __NS_IXTFVISUALWRAPPERPRIVATE_H__

content/xtf/src/nsXTFElementWrapper.h

@@ -64,7 +64,7 @@ protected:
   nsresult Init();
   
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_XTFELEMENTWRAPPER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_XTFELEMENTWRAPPER_IID)
 
   // nsISupports interface
   NS_DECL_ISUPPORTS_INHERITED
@@ -151,6 +151,8 @@ protected:
   PRInt32 mIntrinsicState;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsXTFElementWrapper, NS_XTFELEMENTWRAPPER_IID)
+
 class nsXTFStyledElementWrapper : public nsXTFElementWrapper
 {
 public:

content/xul/content/public/nsIXULPopupListener.h

@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIXULPopupListener_h__
-#define nsIXULPopupListener_h__
-
-// {2C453161-0942-11d3-BF87-00105A1B0627}
-#define NS_IXULPOPUPLISTENER_IID \
-{ 0x2c453161, 0x942, 0x11d3, { 0xbf, 0x87, 0x0, 0x10, 0x5a, 0x1b, 0x6, 0x27 } }
-
-class nsIDOMElement;
-
-typedef enum {
-    eXULPopupType_popup,
-    eXULPopupType_context,
-    eXULPopupType_tooltip,
-    eXULPopupType_blur
-} XULPopupType;
-
-class nsIXULPopupListener: public nsISupports {
-public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXULPOPUPLISTENER_IID)
-
-    NS_IMETHOD Init(nsIDOMElement* anElement, const XULPopupType& aPopupType) = 0;
-};
-
-nsresult
-NS_NewXULPopupListener(nsIXULPopupListener** result);
-
-#endif // nsIXULPopupListener_h__

content/xul/document/public/nsIXULContentSink.h

@@ -52,7 +52,7 @@ class nsIXULPrototypeDocument;
 class nsIXULContentSink : public nsIXMLContentSink
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXULCONTENTSINK_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULCONTENTSINK_IID)
 
     /**
      * Initialize the content sink, giving it an nsIDocument object
@@ -62,6 +62,7 @@ public:
     NS_IMETHOD Init(nsIDocument* aDocument, nsIXULPrototypeDocument* aPrototype) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULContentSink, NS_IXULCONTENTSINK_IID)
 
 nsresult
 NS_NewXULContentSink(nsIXULContentSink** aResult);

content/xul/document/public/nsIXULDocument.h

@@ -74,7 +74,7 @@ class nsIRDFDataSource;
 class nsIXULDocument : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXULDOCUMENT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULDOCUMENT_IID)
 
   // The resource-to-element map is a one-to-many mapping of RDF
   // resources to content elements.
@@ -158,6 +158,8 @@ public:
   NS_IMETHOD OnHide() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULDocument, NS_IXULDOCUMENT_IID)
+
 // factory functions
 nsresult NS_NewXULDocument(nsIXULDocument** result);
 

content/xul/document/public/nsIXULPrototypeCache.h

@@ -61,13 +61,13 @@ class nsIFastLoadService;
 
 // {CD196299-18E9-4642-AD43-666315C4D241}
 #define NS_IXULPROTOTYPECACHE_IID \
-{ 0xcd196299, 0x18e9, 0x4642, { 0xad, 0x43, 0x66, 0x63, 0x15, 0xc4, 0xd2, 0x41 } };
+{ 0xcd196299, 0x18e9, 0x4642, { 0xad, 0x43, 0x66, 0x63, 0x15, 0xc4, 0xd2, 0x41 } }
 
 
 class nsIXULPrototypeCache : public nsISupports
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXULPROTOTYPECACHE_IID);
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULPROTOTYPECACHE_IID)
 
     NS_IMETHOD GetPrototype(nsIURI* aURI, nsIXULPrototypeDocument** _result) = 0;
     NS_IMETHOD PutPrototype(nsIXULPrototypeDocument* aDocument) = 0;
@@ -118,6 +118,7 @@ public:
     NS_IMETHOD WritePrototype(nsIXULPrototypeDocument* aDocument) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULPrototypeCache, NS_IXULPROTOTYPECACHE_IID)
 
 NS_IMETHODIMP
 NS_NewXULPrototypeCache(nsISupports* aOuter, REFNSIID aIID, void** aResult);

content/xul/document/public/nsIXULPrototypeDocument.h

@@ -65,7 +65,7 @@ class nsISupportsArray;
 class nsIXULPrototypeDocument : public nsISerializable
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IXULPROTOTYPEDOCUMENT_IID);
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULPROTOTYPEDOCUMENT_IID)
 
     /**
      * Retrieve the URI of the document
@@ -97,6 +97,8 @@ public:
     NS_IMETHOD NotifyLoadDone() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIXULPrototypeDocument,
+                              NS_IXULPROTOTYPEDOCUMENT_IID)
 
 // CID for factory-based creation, used only for deserialization.
 #define NS_XULPROTOTYPEDOCUMENT_CLASSNAME "XUL Prototype Document"

db/mdb/public/mdb.h

@@ -374,7 +374,7 @@ class nsIMdbSorting;
 class nsIMdbObject : public nsISupports { // msg db base class
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBOBJECT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBOBJECT_IID)
 // { ===== begin nsIMdbObject methods =====
 
   // { ----- begin attribute methods -----
@@ -405,6 +405,8 @@ public:
 // } ===== end nsIMdbObject methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbObject, NS_IMDBOBJECT_IID)
+
 /*| nsIMdbErrorHook: a base class for clients of this API to subclass, in order
 **| to provide a callback installable in nsIMdbEnv for error notifications. If
 **| apps that subclass nsIMdbErrorHook wish to maintain a reference to the env
@@ -516,7 +518,7 @@ public:
 
 class nsIMdbThumb : public nsISupports { // closure for repeating incremental method
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBTHUMB_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBTHUMB_IID)
 
 // { ===== begin nsIMdbThumb methods =====
   NS_IMETHOD GetProgress(nsIMdbEnv* ev,
@@ -538,6 +540,8 @@ public:
 // } ===== end nsIMdbThumb methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbThumb, NS_IMDBTHUMB_IID)
+
 /*| nsIMdbEnv: a context parameter used when calling most abstract db methods.
 **| The main purpose of such an object is to permit a database implementation
 **| to avoid the use of globals to share information between various parts of
@@ -577,7 +581,7 @@ public:
 class nsIMdbEnv : public nsISupports { // db specific context parameter
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBENV_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBENV_IID)
 // { ===== begin nsIMdbEnv methods =====
 
   // { ----- begin attribute methods -----
@@ -610,6 +614,8 @@ public:
 // } ===== end nsIMdbEnv methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbEnv, NS_IMDBENV_IID)
+
 /*| nsIMdbFactory: the main entry points to the abstract db interface.  A DLL
 **| that supports this mdb interface need only have a single exported method
 **| that will return an instance of nsIMdbFactory, so that further methods in
@@ -667,7 +673,7 @@ public:
 class nsIMdbFactory : public nsISupports { // suite entry points
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBFACTORY_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBFACTORY_IID)
 // { ===== begin nsIMdbFactory methods =====
 
   // { ----- begin file methods -----
@@ -773,6 +779,8 @@ public:
 // } ===== end nsIMdbFactory methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbFactory, NS_IMDBFACTORY_IID)
+
 extern "C" nsIMdbFactory* MakeMdbFactory(); 
 
 /*| nsIMdbFile: abstract file interface resembling the original morkFile
@@ -829,7 +837,7 @@ extern "C" nsIMdbFactory* MakeMdbFactory();
 class nsIMdbFile : public nsISupports { // minimal file interface
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBFILE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBFILE_IID)
 // { ===== begin nsIMdbFile methods =====
 
   // { ----- begin pos methods -----
@@ -893,6 +901,8 @@ public:
 // } ===== end nsIMdbFile methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbFile, NS_IMDBFILE_IID)
+
 /*| nsIMdbPort: a readonly interface to a specific database file. The mutable
 **| nsIMdbStore interface is a subclass that includes writing behavior, but
 **| most of the needed db methods appear in the readonly nsIMdbPort interface.
@@ -1309,7 +1319,7 @@ public:
 
 class nsIMdbStore : public nsIMdbPort {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBSTORE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBSTORE_IID)
 
 // { ===== begin nsIMdbStore methods =====
 
@@ -1425,6 +1435,8 @@ public:
 // } ===== end nsIMdbStore methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbStore, NS_IMDBSTORE_IID)
+
 /*| nsIMdbCursor: base cursor class for iterating row cells and table rows
 **|
 **|| count: the number of elements in the collection (table or row)
@@ -1457,7 +1469,7 @@ public:
 class nsIMdbCursor  : public nsISupports  { // collection iterator
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBCURSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBCURSOR_IID)
 // { ===== begin nsIMdbCursor methods =====
 
   // { ----- begin attribute methods -----
@@ -1474,6 +1486,8 @@ public:
 // } ===== end nsIMdbCursor methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbCursor, NS_IMDBCURSOR_IID)
+
 #define NS_IMDBPORTTABLECURSOR_IID_STR = "f181a41e-933d-49b3-af93-20d3634b8b78"
 
 #define NS_IMDBPORTTABLECURSOR_IID \
@@ -1490,7 +1504,7 @@ public:
 class nsIMdbPortTableCursor : public nsISupports { // table collection iterator
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBPORTTABLECURSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBPORTTABLECURSOR_IID)
 // { ===== begin nsIMdbPortTableCursor methods =====
 
   // { ----- begin attribute methods -----
@@ -1517,6 +1531,9 @@ public:
 // } ===== end nsIMdbPortTableCursor methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbPortTableCursor,
+                              NS_IMDBPORTTABLECURSOR_IID)
+
 /*| nsIMdbCollection: an object that collects a set of other objects as members.
 **| The main purpose of this base class is to unify the perceived semantics
 **| of tables and rows where their collection behavior is similar.  This helps
@@ -1715,11 +1732,10 @@ public:
 {0xfe11bc98, 0xd02b, 0x4128, \
 {0x9f, 0xac, 0x87, 0x04, 0x2f, 0xdf, 0x96, 0x39}}
 
-
 class nsIMdbTable : public nsIMdbCollection { // a collection of rows
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBTABLE_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBTABLE_IID)
 // { ===== begin nsIMdbTable methods =====
 
   // { ----- begin meta attribute methods -----
@@ -1984,6 +2000,8 @@ public:
 // } ===== end nsIMdbTable methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbTable, NS_IMDBTABLE_IID)
+
 /*| nsIMdbSorting: a view of a table in some particular sort order.  This
 **| row order closely resembles a readonly array of rows with the same row
 **| membership as the underlying table, but in a different order than the
@@ -2104,7 +2122,7 @@ public:
 
 class nsIMdbTableRowCursor : public nsISupports { // table row iterator
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBTABLEROWCURSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBTABLEROWCURSOR_IID)
 
 // { ===== begin nsIMdbTableRowCursor methods =====
 
@@ -2189,6 +2207,8 @@ public:
 // } ===== end nsIMdbTableRowCursor methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbTableRowCursor, NS_IMDBTABLEROWCURSOR_IID)
+
 /*| nsIMdbRow: a collection of cells
 **|
 |*/
@@ -2204,7 +2224,7 @@ public:
 class nsIMdbRow : public nsIMdbCollection { // cell tuple
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBROW_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBROW_IID)
 // { ===== begin nsIMdbRow methods =====
 
   // { ----- begin cursor methods -----
@@ -2303,6 +2323,8 @@ public:
 // } ===== end nsIMdbRow methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbRow, NS_IMDBROW_IID)
+
 /*| nsIMdbRowCellCursor: cursor class for iterating row cells
 **|
 **|| row: the cursor is associated with a specific row, which can be
@@ -2324,7 +2346,7 @@ public:
 class nsIMdbRowCellCursor : public nsISupports{ // cell collection iterator
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBROWCELLCURSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBROWCELLCURSOR_IID)
 // { ===== begin nsIMdbRowCellCursor methods =====
 
   // { ----- begin attribute methods -----
@@ -2370,6 +2392,8 @@ public:
 // } ===== end nsIMdbRowCellCursor methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbRowCellCursor, NS_IMDBROWCELLCURSOR_IID)
+
 /*| nsIMdbBlob: a base class for objects composed mainly of byte sequence state.
 **| (This provides a base class for nsIMdbCell, so that cells themselves can
 **| be used to set state in another cell, without extracting a buffer.)
@@ -2479,7 +2503,7 @@ public:
 class nsIMdbCell : public nsIMdbBlob { // text attribute in row with column scope
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBTABLEROWCURSOR_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBTABLEROWCURSOR_IID)
 // { ===== begin nsIMdbCell methods =====
 
   // { ----- begin attribute methods -----
@@ -2535,6 +2559,8 @@ public:
 // } ===== end nsIMdbCell methods =====
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbCell, NS_IMDBTABLEROWCURSOR_IID)
+
 // } %%%%% end C++ abstract class interfaces %%%%%
 
 //3456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789

db/mork/build/nsIMdbFactoryFactory.h

@@ -53,8 +53,10 @@ class nsIMdbFactory;
 class nsIMdbFactoryFactory : public nsISupports
 {
 public:
-    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMDBFACTORYFACTORY_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_IMDBFACTORYFACTORY_IID)
 	NS_IMETHOD GetMdbFactory(nsIMdbFactory **aFactory) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMdbFactoryFactory, NS_IMDBFACTORYFACTORY_IID)
+
 #endif

dom/public/base/nsIFocusController.h

@@ -58,7 +58,7 @@ class nsAString;
 
 class nsIFocusController : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFOCUSCONTROLLER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IFOCUSCONTROLLER_IID)
 
   NS_IMETHOD GetFocusedElement(nsIDOMElement** aResult)=0;
   NS_IMETHOD SetFocusedElement(nsIDOMElement* aElement)=0;
@@ -87,6 +87,8 @@ public:
   NS_IMETHOD ResetElementFocus() = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIFocusController, NS_IFOCUSCONTROLLER_IID)
+
 class nsFocusSuppressor {
 public:
   ~nsFocusSuppressor()

dom/public/base/nsPIDOMWindow.h

@@ -83,7 +83,7 @@ struct nsTimeout;
 class nsPIDOMWindow : public nsIDOMWindowInternal
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_PIDOMWINDOW_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_PIDOMWINDOW_IID)
 
   virtual nsPIDOMWindow* GetPrivateRoot() = 0;
 
@@ -330,6 +330,8 @@ protected:
 };
 
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsPIDOMWindow, NS_PIDOMWINDOW_IID)
+
 #ifdef _IMPL_NS_LAYOUT
 PopupControlState
 PushPopupControlState(PopupControlState aState, PRBool aForce);

dom/public/base/nsPIWindowRoot.h

@@ -50,9 +50,11 @@ class nsIFocusController;
 
 class nsPIWindowRoot : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IWINDOWROOT_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IWINDOWROOT_IID)
 
   NS_IMETHOD GetFocusController(nsIFocusController** aResult)=0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsPIWindowRoot, NS_IWINDOWROOT_IID)
+
 #endif // nsPIWindowRoot_h__

dom/public/coreEvents/nsIDOMCompositionListener.h

@@ -54,7 +54,7 @@ class nsIDOMCompositionListener : public nsIDOMEventListener {
 
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMCOMPOSITIONLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMCOMPOSITIONLISTENER_IID)
 
   NS_IMETHOD HandleStartComposition(nsIDOMEvent* aCompositionEvent) = 0;
   NS_IMETHOD HandleEndComposition(nsIDOMEvent* aCompositionEvent) = 0;
@@ -62,4 +62,8 @@ public:
   NS_IMETHOD HandleQueryReconversion(nsIDOMEvent* aCompositionEvent) = 0;
   NS_IMETHOD HandleQueryCaretRect(nsIDOMEvent* aCompositionEvent) = 0;
 };
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMCompositionListener,
+                              NS_IDOMCOMPOSITIONLISTENER_IID)
+
 #endif // nsIDOMCompositionListener_h__

dom/public/coreEvents/nsIDOMContextMenuListener.h

@@ -54,7 +54,7 @@
 class nsIDOMContextMenuListener : public nsIDOMEventListener {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMCONTEXTMENULISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMCONTEXTMENULISTENER_IID)
   /**
   * Processes a context menu event
   * @param aContextMenuEvent @see nsIDOMEvent.h 
@@ -64,4 +64,7 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMContextMenuListener,
+                              NS_IDOMCONTEXTMENULISTENER_IID)
+
 #endif // nsIDOMContextMenuListener_h__

dom/public/coreEvents/nsIDOMDragListener.h

@@ -55,7 +55,7 @@ class nsIDOMDragListener : public nsIDOMEventListener {
 
 public:
 
-   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMDRAGLISTENER_IID)
+   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMDRAGLISTENER_IID)
 
   /**
   * Processes a drag enter event
@@ -94,4 +94,6 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMDragListener, NS_IDOMDRAGLISTENER_IID)
+
 #endif // nsIDOMDragListener_h__

dom/public/coreEvents/nsIDOMEventReceiver.h

@@ -58,7 +58,7 @@ class nsIDOMEventGroup;
 class nsIDOMEventReceiver : public nsIDOMEventTarget
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMEVENTRECEIVER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMEVENTRECEIVER_IID)
 
   NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener,
                                    const nsIID& aIID) = 0;
@@ -68,4 +68,7 @@ public:
   NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent) = 0;
   NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup) = 0;
 };
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMEventReceiver, NS_IDOMEVENTRECEIVER_IID)
+
 #endif // nsIDOMEventReceiver_h__

dom/public/coreEvents/nsIDOMFocusListener.h

@@ -55,7 +55,7 @@ class nsIDOMFocusListener : public nsIDOMEventListener
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMFOCUSLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMFOCUSLISTENER_IID)
 
   /**
   * Processes a focus event
@@ -72,4 +72,6 @@ public:
   NS_IMETHOD Blur(nsIDOMEvent* aEvent) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMFocusListener, NS_IDOMFOCUSLISTENER_IID)
+
 #endif // nsIDOMFocusListener_h__

dom/public/coreEvents/nsIDOMFormListener.h

@@ -54,7 +54,7 @@
 class nsIDOMFormListener : public nsIDOMEventListener {
 
 public:
-   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMFORMLISTENER_IID)
+   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMFORMLISTENER_IID)
   /**
   * Processes a form submit event
   * @param aEvent @see nsIDOMEvent.h 
@@ -92,4 +92,6 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMFormListener, NS_IDOMFORMLISTENER_IID)
+
 #endif // nsIDOMFormListener_h__

dom/public/coreEvents/nsIDOMKeyListener.h

@@ -53,7 +53,7 @@ class nsIDOMKeyListener : public nsIDOMEventListener {
 
 public:
 
-     NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMKEYLISTENER_IID)
+     NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMKEYLISTENER_IID)
     
     /**
      * Processes a key pressed event
@@ -78,4 +78,7 @@ public:
     NS_IMETHOD KeyPress(nsIDOMEvent* aKeyEvent) = 0;
 
 };
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMKeyListener, NS_IDOMKEYLISTENER_IID)
+
 #endif // nsIDOMKeyListener_h__

dom/public/coreEvents/nsIDOMLoadListener.h

@@ -54,7 +54,7 @@
 class nsIDOMLoadListener : public nsIDOMEventListener {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMLOADLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMLOADLISTENER_IID)
   /**
   * Processes a page or image load event
   * @param aMouseEvent @see nsIDOMEvent.h 
@@ -93,4 +93,6 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMLoadListener, NS_IDOMLOADLISTENER_IID)
+
 #endif // nsIDOMLoadListener_h__

dom/public/coreEvents/nsIDOMMouseListener.h

@@ -55,7 +55,7 @@ class nsIDOMMouseListener : public nsIDOMEventListener {
 
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMMOUSELISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMMOUSELISTENER_IID)
 
   /**
   * Processes a mouse down event
@@ -103,4 +103,6 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMMouseListener, NS_IDOMMOUSELISTENER_IID)
+
 #endif // nsIDOMMouseListener_h__

dom/public/coreEvents/nsIDOMMouseMotionListener.h

@@ -54,7 +54,7 @@
 class nsIDOMMouseMotionListener : public nsIDOMEventListener {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMMOUSEMOTIONLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMMOUSEMOTIONLISTENER_IID)
   /**
   * Processes a mouse move event
   * @param aMouseEvent @see nsIDOMEvent.h 
@@ -71,4 +71,7 @@ public:
 
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMMouseMotionListener,
+                              NS_IDOMMOUSEMOTIONLISTENER_IID)
+
 #endif // nsIDOMMouseMotionListener_h__

dom/public/coreEvents/nsIDOMMutationListener.h

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIDOMMutationListener_h__
-#define nsIDOMMutationListener_h__
-
-#include "nsIDOMEvent.h"
-#include "nsIDOMEventListener.h"
-
-/*
- * Mutation event listener interface.
- */
-// {0666EC94-3C54-4e16-8511-E8CC865F236C}
-#define NS_IDOMMUTATIONLISTENER_IID \
-{ 0x666ec94, 0x3c54, 0x4e16, { 0x85, 0x11, 0xe8, 0xcc, 0x86, 0x5f, 0x23, 0x6c } }
-
-class nsIDOMMutationListener : public nsIDOMEventListener {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMMUTATIONLISTENER_IID)
-    
-  NS_IMETHOD SubtreeModified(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD NodeInserted(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD NodeRemoved(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD NodeRemovedFromDocument(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD NodeInsertedIntoDocument(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD AttrModified(nsIDOMEvent* aMutationEvent)=0;
-  NS_IMETHOD CharacterDataModified(nsIDOMEvent* aMutationEvent)=0;
-};
-#endif // nsIDOMMutationListener_h__

dom/public/coreEvents/nsIDOMPageTransitionListener.h

@@ -1,58 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Google Inc.
- * Portions created by the Initial Developer are Copyright (C) 2005
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Brian Ryner <bryner@brianryner.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIDOMPageTransitionListener_h__
-#define nsIDOMPageTransitionListener_h__
-
-#include "nsIDOMEventListener.h"
-
-class nsIDOMEvent;
-
-/*
- * Page transition event listener interface.
- */
-#define NS_IDOMPAGETRANSITIONLISTENER_IID \
-{ 0x24f4d69f, 0x6b0c, 0x48a8, { 0xba, 0xb7, 0x12, 0x50, 0xcb, 0x5e, 0x48, 0x79 } }
-
-class nsIDOMPageTransitionListener : public nsIDOMEventListener {
- public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMPAGETRANSITIONLISTENER_IID)
-
-  NS_IMETHOD PageShow(nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD PageHide(nsIDOMEvent* aEvent) = 0;
-};
-#endif // nsIDOMPageTransitionListener_h__

dom/public/coreEvents/nsIDOMPaintListener.h

@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-#ifndef nsIDOMPaintListener_h__
-#define nsIDOMPaintListener_h__
-
-#include "nsIDOMEvent.h"
-#include "nsIDOMEventListener.h"
-
-/* a6cf906a-15b3-11d2-932e-00805f8add32 */
-#define NS_IDOMPAINTLISTENER_IID \
- {0xa6cf906a, 0x15b3, 0x11d2, {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32}}
-
-/*
- * Paint event listener
- */
-class nsIDOMPaintListener : public nsIDOMEventListener {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMPAINTLISTENER_IID)
-  /**
-  * Processes a paint event
-  * @param aEvent @see nsIDOMEvent.h 
-  * @returns whether the event was consumed or ignored. @see nsresult
-  */
-  NS_IMETHOD Paint(nsIDOMEvent* aEvent) = 0;
-
-  /**
-  * Processes a resize event
-  * @param aEvent @see nsIDOMEvent.h 
-  * @returns whether the event was consumed or ignored. @see nsresult
-  */
-  NS_IMETHOD Resize(nsIDOMEvent* aEvent) = 0;
-
-  /**
-  * Processes a scroll event
-  * @param aEvent @see nsIDOMEvent.h 
-  * @returns whether the event was consumed or ignored. @see nsresult
-  */
-  NS_IMETHOD Scroll(nsIDOMEvent* aEvent) = 0;
-};
-
-#endif /* nsIDOMPaintListener_h__ */

dom/public/coreEvents/nsIDOMScrollListener.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef nsIDOMScrollListener_h__
-#define nsIDOMScrollListener_h__
-
-#include "nsIDOMEvent.h"
-#include "nsIDOMEventListener.h"
-
-// {00B04615-4BC4-11d4-BA11-001083023C1E}
-#define NS_IDOMSCROLLLISTENER_IID \
-{ 0xb04615, 0x4bc4, 0x11d4, { 0xba, 0x11, 0x0, 0x10, 0x83, 0x2, 0x3c, 0x1e } }
-
-class nsIDOMScrollListener : public nsIDOMEventListener {
-
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMSCROLLLISTENER_IID)
-
-  NS_IMETHOD Overflow(nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD Underflow(nsIDOMEvent* aEvent) = 0;
-  NS_IMETHOD OverflowChanged(nsIDOMEvent* aEvent) = 0;
-};
-
-#endif // nsIDOMScrollListener_h__

dom/public/coreEvents/nsIDOMTextListener.h

@@ -53,9 +53,12 @@ class nsIDOMTextListener : public nsIDOMEventListener
 {
 public:
 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMTEXTLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMTEXTLISTENER_IID)
 
   NS_IMETHOD HandleText(nsIDOMEvent* aTextEvent) = 0;
 
 };
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMTextListener, NS_IDOMTEXTLISTENER_IID)
+
 #endif // nsIDOMTextListener_h__

dom/public/coreEvents/nsIDOMUIListener.h

@@ -51,10 +51,13 @@ class nsIDOMEvent;
 
 class nsIDOMUIListener : public nsIDOMEventListener {
  public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMUILISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMUILISTENER_IID)
 
   NS_IMETHOD Activate(nsIDOMEvent* aEvent) = 0;
   NS_IMETHOD FocusIn(nsIDOMEvent* aEvent) = 0;
   NS_IMETHOD FocusOut(nsIDOMEvent* aEvent) = 0;
 };
+
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMUIListener, NS_IDOMUILISTENER_IID)
+
 #endif // nsIDOMUIListener_h__

dom/public/coreEvents/nsIDOMXULListener.h

@@ -49,7 +49,7 @@
 class nsIDOMXULListener : public nsIDOMEventListener {
 
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMXULLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMXULLISTENER_IID)
 
   NS_IMETHOD PopupShowing(nsIDOMEvent* aEvent) = 0;
   NS_IMETHOD PopupShown(nsIDOMEvent* aEvent) = 0;
@@ -62,4 +62,6 @@ public:
   NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMXULListener, NS_IDOMXULLISTENER_IID)
+
 #endif // nsIDOMXULListener_h__

dom/public/nsIBaseDOMException.h

@@ -54,13 +54,14 @@
 
 class nsIBaseDOMException : public nsISupports {
 public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBASEDOMEXCEPTION_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IBASEDOMEXCEPTION_IID)
 
   NS_IMETHOD Init(nsresult aNSResult, const char* aName,
                   const char* aMessage,
                   nsIException* aDefaultException) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIBaseDOMException, NS_IBASEDOMEXCEPTION_IID)
 
 #define IMPL_DOM_EXCEPTION_HEAD(classname, ifname)                           \
 class classname : public nsIException,                                       \

dom/public/nsIDOMClassInfo.h

@@ -467,12 +467,13 @@ class nsIDOMScriptObjectFactory;
 
 class nsIDOMCIExtension : public nsISupports {
 public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOMCI_EXTENSION_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMCI_EXTENSION_IID)
 
   NS_IMETHOD RegisterDOMCI(const char* aName,
                            nsIDOMScriptObjectFactory* aDOMSOFactory) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMCIExtension, NS_IDOMCI_EXTENSION_IID)
 
 #define NS_DOMCI_EXTENSION_NAME(_module) ns##_module##DOMCIExtension
 #define NS_DOMCI_EXTENSION_CONSTRUCTOR(_module) \

dom/public/nsIDOMScriptObjectFactory.h

@@ -52,7 +52,7 @@ class nsIDOMEventListener;
 
 class nsIDOMScriptObjectFactory : public nsISupports {
 public:  
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOM_SCRIPT_OBJECT_FACTORY_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOM_SCRIPT_OBJECT_FACTORY_IID)
 
   NS_IMETHOD NewScriptContext(nsIScriptGlobalObject *aGlobal,
                               nsIScriptContext **aContext) = 0;
@@ -77,4 +77,7 @@ public:
                                   const nsCID *aConstructorCID) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMScriptObjectFactory,
+                              NS_IDOM_SCRIPT_OBJECT_FACTORY_IID)
+
 #endif /* nsIDOMScriptObjectFactory_h__ */

dom/public/nsIJSEventListener.h

@@ -54,7 +54,7 @@ struct JSObject;
 class nsIJSEventListener : public nsISupports
 {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IJSEVENTLISTENER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IJSEVENTLISTENER_IID)
 
   nsIJSEventListener(nsIScriptContext *aContext, JSObject *aScopeObject,
                      nsISupports *aTarget)
@@ -96,6 +96,8 @@ protected:
   nsISupports *mTarget;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIJSEventListener, NS_IJSEVENTLISTENER_IID)
+
 /* factory function */
 nsresult NS_NewJSEventListener(nsIScriptContext *aContext,
                                JSObject *aScopeObject, nsISupports *aObject,

dom/public/nsIJSNativeInitializer.h

@@ -54,7 +54,7 @@
 
 class nsIJSNativeInitializer : public nsISupports {
 public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IJSNATIVEINITIALIZER_IID)
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IJSNATIVEINITIALIZER_IID)
 
   /**
    * Intialize a newly created native instance using the parameters
@@ -64,5 +64,7 @@ public:
                         PRUint32 argc, jsval *argv) = 0;
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIJSNativeInitializer,
+                              NS_IJSNATIVEINITIALIZER_IID)
 
 #endif // nsIJSNativeInitializer_h__