diff --git a/mailnews/base/public/Makefile.in b/mailnews/base/public/Makefile.in
index 5b4fcb3c547..afb5c865116 100644
--- a/mailnews/base/public/Makefile.in
+++ b/mailnews/base/public/Makefile.in
@@ -24,6 +24,7 @@ MODULE		= mailnews
 include $(DEPTH)/config/autoconf.mk
 NO_GEN_XPT=1
 XPIDLSRCS =				  \
+		nsIFolder.idl		\
 		nsIMsgHost.idl		  \
 		nsIMsgFolder.idl	  \
 		nsIDOMMsgAppCore.idl	\
@@ -33,6 +34,7 @@ XPIDLSRCS =				  \
 		nsIMsgThread.idl	\
 		nsIMsgMessageService.idl \
 		nsIUrlListener.idl	\
+		nsIFolderListener.idl	\
 		$(NULL)
 
 EXPORTS =				\
diff --git a/mailnews/base/public/nsIFolder.h b/mailnews/base/public/nsIFolder.h
index 8cca0d3cf43..ada53868a5d 100644
--- a/mailnews/base/public/nsIFolder.h
+++ b/mailnews/base/public/nsIFolder.h
@@ -14,7 +14,6 @@
 #ifdef XPIDL_JS_STUBS
 #include "jsapi.h"
 #endif
-class nsIFolderListener; /* forward decl */
 
 /* starting interface:    nsIFolder */
 
@@ -45,6 +44,9 @@ class nsIFolder : public nsICollection {
   /* nsIEnumerator GetSubFolders (); */
   NS_IMETHOD GetSubFolders(nsIEnumerator **_retval) = 0;
 
+  /* readonly attribute boolean hasSubFolders; */
+  NS_IMETHOD GetHasSubFolders(PRBool *aHasSubFolders) = 0;
+
   /* void AddFolderListener (in nsIFolderListener listener); */
   NS_IMETHOD AddFolderListener(nsIFolderListener *listener) = 0;
 
diff --git a/mailnews/base/public/nsIFolder.idl b/mailnews/base/public/nsIFolder.idl
index f48c488665f..56efba30ab2 100644
--- a/mailnews/base/public/nsIFolder.idl
+++ b/mailnews/base/public/nsIFolder.idl
@@ -19,9 +19,6 @@
 #include "nsICollection.idl"
 #include "nsIFolderListener.idl"
 
-interface nsIFolderListener;
-interface nsICollection;
-
 [uuid(361c89b0-c481-11d2-8614-000000000001)]    /* XXX regenerate */
 interface nsIFolder : nsICollection {
 
diff --git a/mailnews/base/public/nsIFolderListener.h b/mailnews/base/public/nsIFolderListener.h
index 546e697a301..879158db65d 100644
--- a/mailnews/base/public/nsIFolderListener.h
+++ b/mailnews/base/public/nsIFolderListener.h
@@ -6,10 +6,7 @@
 #define __gen_nsIFolderListener_h__
 
 #include "nsISupports.h" /* interface nsISupports */
-#include "nsICollection.h" /* interface nsICollection */
 #include "nsrootidl.h" /* interface nsrootidl */
-#include "nsIEnumerator.h" /* interface nsIEnumerator */
-#include "nsIFolder.h" /* interface nsIFolder */
 
 #ifdef XPIDL_JS_STUBS
 #include "jsapi.h"
diff --git a/mailnews/base/public/nsIFolderListener.idl b/mailnews/base/public/nsIFolderListener.idl
index 202cd3bf115..ed47416533d 100644
--- a/mailnews/base/public/nsIFolderListener.idl
+++ b/mailnews/base/public/nsIFolderListener.idl
@@ -17,7 +17,6 @@
  */
 
 #include "nsISupports.idl"
-#include "nsIFolder.idl"
 
 interface nsIFolder;
 
diff --git a/mailnews/base/public/nsIMsgMessageService.h b/mailnews/base/public/nsIMsgMessageService.h
index a12f752c25d..1fe437d2d49 100644
--- a/mailnews/base/public/nsIMsgMessageService.h
+++ b/mailnews/base/public/nsIMsgMessageService.h
@@ -14,8 +14,6 @@
 class nsIURL; /* forward decl */
 class nsIUrlListener; /* forward decl */
 class nsIStreamListener; /* forward decl */
-    
-
 
 /* starting interface:    nsIMsgMessageService */
 
diff --git a/mailnews/base/public/nsIMsgMessageService.idl b/mailnews/base/public/nsIMsgMessageService.idl
index 3e17e76b198..c7f54841e23 100644
--- a/mailnews/base/public/nsIMsgMessageService.idl
+++ b/mailnews/base/public/nsIMsgMessageService.idl
@@ -24,12 +24,6 @@ interface nsIURL;
 interface nsIUrlListener;
 interface nsIStreamListener;
 
-%{C++
-
-#include "nsIStreamListener.h"
-    
-%}
-
 [uuid(F11009C1-F697-11d2-807F-006008128C4E)]
 interface nsIMsgMessageService : nsISupports {