diff --git a/mailnews/base/public/Makefile.in b/mailnews/base/public/Makefile.in
index 38f74aa8e40..e64496c8df1 100644
--- a/mailnews/base/public/Makefile.in
+++ b/mailnews/base/public/Makefile.in
@@ -50,16 +50,8 @@ EXPORTS =				\
 		nsMsgLocalFolderHdrs.h  \
 		nsMsgMD5.h	\
 		nsIMsg.h \
-		nsIMsgHost.h		\
-		nsIFolder.h		\
-		nsIMsgFolder.h		\
 		nsIMsgMailNewsUrl.h	\
-		nsIUrlListener.h	\
 		nsIUrlListenerManager.h \
-		nsIMsgMailSession.h	\
-		nsIMsgIdentity.h	\
-		nsIFolderListener.h	\
-		nsIDOMMsgAppCore.h	\
 		nsIMsgGroupRecord.h	\
 		nsIMsgSignature.h	\
 		nsIMsgVCard.h		\
diff --git a/mailnews/base/public/nsIMsgIncomingServer.h b/mailnews/base/public/nsIMsgIncomingServer.h
index c78b251bf61..e69de29bb2d 100644
--- a/mailnews/base/public/nsIMsgIncomingServer.h
+++ b/mailnews/base/public/nsIMsgIncomingServer.h
@@ -1,72 +0,0 @@
-/*
- * DO NOT EDIT.  THIS FILE IS GENERATED FROM nsIMsgIncomingServer.idl
- */
-
-#ifndef __gen_nsIMsgIncomingServer_h__
-#define __gen_nsIMsgIncomingServer_h__
-
-#include "nsISupports.h" /* interface nsISupports */
-#include "nsrootidl.h" /* interface nsrootidl */
-class nsIFolder; /* forward decl */
-
-/* starting interface:    nsIMsgIncomingServer */
-
-/* {60dcb100-e3f2-11d2-b7fc-00805f05ffa5} */
-#define NS_IMSGINCOMINGSERVER_IID_STR "60dcb100-e3f2-11d2-b7fc-00805f05ffa5"
-#define NS_IMSGINCOMINGSERVER_IID \
-  {0x60dcb100, 0xe3f2, 0x11d2, \
-    { 0xb7, 0xfc, 0x00, 0x80, 0x5f, 0x05, 0xff, 0xa5 }}
-
-class nsIMsgIncomingServer : public nsISupports {
- public: 
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMSGINCOMINGSERVER_IID)
-
-  /* attribute string key; */
-  NS_IMETHOD GetKey(char * *aKey) = 0;
-  NS_IMETHOD SetKey(char * aKey) = 0;
-
-  /* attribute string prettyName; */
-  NS_IMETHOD GetPrettyName(char * *aPrettyName) = 0;
-  NS_IMETHOD SetPrettyName(char * aPrettyName) = 0;
-
-  /* attribute string hostName; */
-  NS_IMETHOD GetHostName(char * *aHostName) = 0;
-  NS_IMETHOD SetHostName(char * aHostName) = 0;
-
-  /* attribute string userName; */
-  NS_IMETHOD GetUserName(char * *aUserName) = 0;
-  NS_IMETHOD SetUserName(char * aUserName) = 0;
-
-  /* attribute boolean rememberPassword; */
-  NS_IMETHOD GetRememberPassword(PRBool *aRememberPassword) = 0;
-  NS_IMETHOD SetRememberPassword(PRBool aRememberPassword) = 0;
-
-  /* attribute string password; */
-  NS_IMETHOD GetPassword(char * *aPassword) = 0;
-  NS_IMETHOD SetPassword(char * aPassword) = 0;
-
-  /* attribute boolean downloadOnBiff; */
-  NS_IMETHOD GetDownloadOnBiff(PRBool *aDownloadOnBiff) = 0;
-  NS_IMETHOD SetDownloadOnBiff(PRBool aDownloadOnBiff) = 0;
-
-  /* attribute boolean doBiff; */
-  NS_IMETHOD GetDoBiff(PRBool *aDoBiff) = 0;
-  NS_IMETHOD SetDoBiff(PRBool aDoBiff) = 0;
-
-  /* attribute long biffMinutes; */
-  NS_IMETHOD GetBiffMinutes(PRInt32 *aBiffMinutes) = 0;
-  NS_IMETHOD SetBiffMinutes(PRInt32 aBiffMinutes) = 0;
-
-  /* attribute string localPath; */
-  NS_IMETHOD GetLocalPath(char * *aLocalPath) = 0;
-  NS_IMETHOD SetLocalPath(char * aLocalPath) = 0;
-
-  /* readonly attribute string serverURI; */
-  NS_IMETHOD GetServerURI(char * *aServerURI) = 0;
-
-  /* attribute nsIFolder RootFolder; */
-  NS_IMETHOD GetRootFolder(nsIFolder * *aRootFolder) = 0;
-  NS_IMETHOD SetRootFolder(nsIFolder * aRootFolder) = 0;
-};
-
-#endif /* __gen_nsIMsgIncomingServer_h__ */
diff --git a/mailnews/base/public/nsIMsgIncomingServer.idl b/mailnews/base/public/nsIMsgIncomingServer.idl
index f43685f8e65..b4b56669a2e 100644
--- a/mailnews/base/public/nsIMsgIncomingServer.idl
+++ b/mailnews/base/public/nsIMsgIncomingServer.idl
@@ -29,7 +29,7 @@ interface nsIMsgIncomingServer : nsISupports {
   
   attribute string prettyName;
   attribute string hostName;
-  attribute string userName;
+  attribute string username;
   attribute boolean rememberPassword;
   attribute string password;
 
diff --git a/mailnews/base/util/nsMsgIncomingServer.cpp b/mailnews/base/util/nsMsgIncomingServer.cpp
index ed2a3e544eb..6d03b4f679e 100644
--- a/mailnews/base/util/nsMsgIncomingServer.cpp
+++ b/mailnews/base/util/nsMsgIncomingServer.cpp
@@ -238,7 +238,7 @@ nsMsgIncomingServer::setCharPref(const char *prefname,
 // use the convenience macros to implement the accessors
 NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, PrettyName, "name")
 NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, HostName, "hostname");
-NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, UserName, "userName");
+NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Username, "userName");
 NS_IMPL_SERVERPREF_STR(nsMsgIncomingServer, Password, "password");
 NS_IMPL_SERVERPREF_BOOL(nsMsgIncomingServer, DoBiff, "check_new_mail");
 NS_IMPL_SERVERPREF_INT(nsMsgIncomingServer, BiffMinutes, "check_time");
diff --git a/mailnews/base/util/nsMsgIncomingServer.h b/mailnews/base/util/nsMsgIncomingServer.h
index c4cafbc4952..555504d582f 100644
--- a/mailnews/base/util/nsMsgIncomingServer.h
+++ b/mailnews/base/util/nsMsgIncomingServer.h
@@ -48,8 +48,8 @@ class NS_MSG_BASE nsMsgIncomingServer : public nsIMsgIncomingServer {
   NS_IMETHOD SetHostName(char * aHostName);
 
   /* attribute string userName; */
-  NS_IMETHOD GetUserName(char * *aUserName);
-  NS_IMETHOD SetUserName(char * aUserName);
+  NS_IMETHOD GetUsername(char * *aUserName);
+  NS_IMETHOD SetUsername(char * aUserName);
 
   /* attribute boolean rememberPassword; */
   NS_IMETHOD GetRememberPassword(PRBool *aRememberPassword);