diff --git a/mozilla/mailnews/base/public/nsIDOMMsgAppCore.h b/mozilla/mailnews/base/public/nsIDOMMsgAppCore.h
index 9f8a88e1765..01e6d68fe5b 100644
--- a/mozilla/mailnews/base/public/nsIDOMMsgAppCore.h
+++ b/mozilla/mailnews/base/public/nsIDOMMsgAppCore.h
@@ -8,9 +8,10 @@
 #include "nsISupports.h" /* interface nsISupports */
 #include "nsIDOMWindow.h" /* interface nsIDOMWindow */
 #include "nsID.h" /* interface nsID */
+#include "nsIDOMXULTreeElement.h" /* interface nsIDOMXULTreeElement */
 #include "nsIDOMBaseAppCore.h" /* interface nsIDOMBaseAppCore */
-#include "nsIDOMNodeList.h" /*interface nsIDOMNodeList*/
-#include "nsIDOMXULTreeElement.h" /*interface nsIDOMXULTreeElement*/
+#include "nsIDOMNodeList.h" /* interface nsIDOMNodeList */
+
 #ifdef XPIDL_JS_STUBS
 #include "jsapi.h"
 #endif
@@ -42,16 +43,16 @@ class nsIDOMMsgAppCore : public nsIDOMBaseAppCore {
   /* void OpenURL (in string str); */
   NS_IMETHOD OpenURL(const char *str) = 0;
 
-  /* void DeleteMessage (in string str); */
-  NS_IMETHOD DeleteMessage(nsIDOMXULTreeElement *tree, nsIDOMNodeList *nodeList) = 0;
+  /* void DeleteMessage (in nsIDOMXULTreeElement tree, in nsIDOMNodeList node); */
+  NS_IMETHOD DeleteMessage(nsIDOMXULTreeElement *tree, nsIDOMNodeList *node) = 0;
 
-  /* void GetRDFResourceForMessage (in string str); */
-  NS_IMETHOD GetRDFResourceForMessage(nsIDOMXULTreeElement *tree, nsIDOMNodeList *nodeList, nsISupports **_retval) = 0;
+  /* nsISupports GetRDFResourceForMessage (in nsIDOMXULTreeElement tree, in nsIDOMNodeList node); */
+  NS_IMETHOD GetRDFResourceForMessage(nsIDOMXULTreeElement *tree, nsIDOMNodeList *node, nsISupports **_retval) = 0;
 
-  /* void exit(); */
-  NS_IMETHOD Exit()= 0;
+  /* void Exit (); */
+  NS_IMETHOD Exit() = 0;
 
- #ifdef XPIDL_JS_STUBS
+#ifdef XPIDL_JS_STUBS
   static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
   static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIDOMMsgAppCore *priv);
 #endif
diff --git a/mozilla/mailnews/base/public/nsIMsgFolder.h b/mozilla/mailnews/base/public/nsIMsgFolder.h
index 181aa0b9e97..e6026e98a6b 100644
--- a/mozilla/mailnews/base/public/nsIMsgFolder.h
+++ b/mozilla/mailnews/base/public/nsIMsgFolder.h
@@ -10,6 +10,7 @@
 #include "nsICollection.h" /* interface nsICollection */
 #include "nsIFolderListener.h" /* interface nsIFolderListener */
 #include "nsIEnumerator.h" /* interface nsIEnumerator */
+#include "nsID.h" /* interface nsID */
 #include "nsIFolder.h" /* interface nsIFolder */
 #include "nsIMessage.h" /* interface nsIMessage */