diff --git a/mailnews/base/public/nsIMsgFolder.idl b/mailnews/base/public/nsIMsgFolder.idl
index 1b1ffeadaba1..1f4068c09a1c 100644
--- a/mailnews/base/public/nsIMsgFolder.idl
+++ b/mailnews/base/public/nsIMsgFolder.idl
@@ -16,7 +16,6 @@
  * Reserved.
  */
  
-#include "nsISupportsArray.idl"
 #include "nsISupports.idl"
 #include "nsIFolder.idl"
 #include "nsIMessage.idl"
@@ -24,8 +23,11 @@
 
 %{ C++
 #include "nsFileSpec.h"
+#include "nsISupportsArray.h"
 %}
+interface nsISupportsArray;
 interface nsIMessage;
+
 native nsNativeFileSpec(nsNativeFileSpec*);
 
 [uuid(85e39ff0-b248-11d2-b7ef-00805f05ffa5)]
diff --git a/mailnews/base/public/nsIMsgMessageService.idl b/mailnews/base/public/nsIMsgMessageService.idl
index b516832961a9..cff48f00fb81 100644
--- a/mailnews/base/public/nsIMsgMessageService.idl
+++ b/mailnews/base/public/nsIMsgMessageService.idl
@@ -19,10 +19,18 @@
  */
 
 #include "nsISupports.idl"
-interface nsIUrlListener;
+#include "nsIUrlListener.idl"
+
 interface nsIURL;
 interface nsIStreamListener;
 
+%{C++
+
+#include "nsIURL.h"
+#include "nsIStreamListener.h"
+    
+%}
+
 [uuid(F11009C1-F697-11d2-807F-006008128C4E)]
 interface nsIMsgMessageService : nsISupports {