diff --git a/mailnews/news/public/Makefile.in b/mailnews/news/public/Makefile.in
index 89ef3ca6448..03a4500832d 100644
--- a/mailnews/news/public/Makefile.in
+++ b/mailnews/news/public/Makefile.in
@@ -29,6 +29,7 @@ XPIDLSRCS= \
 		nsINNTPArticleList.idl \
 		nsINNTPCategory.idl \
 		nsINNTPCategoryContainer.idl \
+		nsINNTPHost.idl \
 		nsINNTPNewsgroup.idl \
 		nsINNTPNewsgroupList.idl \
 		nsINntpIncomingServer.idl \
diff --git a/mailnews/news/public/makefile.win b/mailnews/news/public/makefile.win
index b696537c036..bd96d162003 100644
--- a/mailnews/news/public/makefile.win
+++ b/mailnews/news/public/makefile.win
@@ -23,6 +23,7 @@ XPIDLSRCS= \
 	.\nsINNTPArticleList.idl \
 	.\nsINNTPCategory.idl \
 	.\nsINNTPCategoryContainer.idl \
+	.\nsINNTPHost.idl \
 	.\nsINNTPNewsgroup.idl \
 	.\nsINNTPNewsgroupList.idl \
 	.\nsINntpIncomingServer.idl \
diff --git a/mailnews/news/public/nsINNTPHost.h b/mailnews/news/public/nsINNTPHost.h
index aff2439514e..4360ab96e54 100644
--- a/mailnews/news/public/nsINNTPHost.h
+++ b/mailnews/news/public/nsINNTPHost.h
@@ -7,15 +7,9 @@
 
 #include "nsISupports.h" /* interface nsISupports */
 #include "nsINNTPNewsgroup.h" /* interface nsINNTPNewsgroup */
-#include "nsID.h" /* interface nsID */
+#include "nsrootidl.h" /* interface nsrootidl */
 #include "nsINNTPNewsgroupList.h" /* interface nsINNTPNewsgroupList */
 
-#ifdef XPIDL_JS_STUBS
-#include "jsapi.h"
-#endif
-
-#include "prtime.h"
-
 /* starting interface:    nsINNTPHost */
 
 /* {6b128da0-d74f-11d2-b7f9-00805f05ffa5} */
@@ -36,7 +30,7 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD AddExtension(const char *extension) = 0;
 
   /* boolean QueryExtension (in string extension); */
-  NS_IMETHOD QueryExtension(const char *extension, PRBool *retval) = 0;
+  NS_IMETHOD QueryExtension(const char *extension, PRBool *_retval) = 0;
 
   /* attribute boolean postingAllowed; */
   NS_IMETHOD GetPostingAllowed(PRBool *aPostingAllowed) = 0;
@@ -46,27 +40,27 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD GetPushAuth(PRBool *aPushAuth) = 0;
   NS_IMETHOD SetPushAuth(PRBool aPushAuth) = 0;
 
-  /* attribute PRTime lastUpdatedTime; */
+  /* attribute unsigned long lastUpdatedTime; */
   NS_IMETHOD GetLastUpdatedTime(PRUint32 *aLastUpdatedTime) = 0;
   NS_IMETHOD SetLastUpdatedTime(PRUint32 aLastUpdatedTime) = 0;
 
   /* nsINNTPNewsgroupList GetNewsgroupList (in string name); */
-  NS_IMETHOD GetNewsgroupList(const char *name, nsINNTPNewsgroupList **retval) = 0;
+  NS_IMETHOD GetNewsgroupList(const char *name, nsINNTPNewsgroupList **_retval) = 0;
 
   /* nsINNTPNewsgroup FindNewsgroup (in string name, in boolean create); */
-  NS_IMETHOD FindNewsgroup(const char *name, PRBool create, nsINNTPNewsgroup **retval) = 0;
+  NS_IMETHOD FindNewsgroup(const char *name, PRBool create, nsINNTPNewsgroup **_retval) = 0;
 
   /* void AddPropertyForGet (in string name, in string value); */
   NS_IMETHOD AddPropertyForGet(const char *name, const char *value) = 0;
 
   /* string QueryPropertyForGet (in string name); */
-  NS_IMETHOD QueryPropertyForGet(const char *name, char **retval) = 0;
+  NS_IMETHOD QueryPropertyForGet(const char *name, char **_retval) = 0;
 
   /* void AddSearchableGroup (in string name); */
   NS_IMETHOD AddSearchableGroup(const char *name) = 0;
 
   /* boolean QuerySearchableGroup (in string name); */
-  NS_IMETHOD QuerySearchableGroup(const char *name, PRBool *retval) = 0;
+  NS_IMETHOD QuerySearchableGroup(const char *name, PRBool *_retval) = 0;
 
   /* void AddVirtualGroup (in string responseText); */
   NS_IMETHOD AddVirtualGroup(const char *responseText) = 0;
@@ -75,13 +69,13 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD SetIsVirtualGroup(const char *name, PRBool isVirtual) = 0;
 
   /* boolean GetIsVirtualGroup (in string name); */
-  NS_IMETHOD GetIsVirtualGroup(const char *name, PRBool *retval) = 0;
+  NS_IMETHOD GetIsVirtualGroup(const char *name, PRBool *_retval) = 0;
 
   /* void AddSearchableHeader (in string headerName); */
   NS_IMETHOD AddSearchableHeader(const char *headerName) = 0;
 
   /* boolean QuerySearchableHeader (in string headerName); */
-  NS_IMETHOD QuerySearchableHeader(const char *headerName, PRBool *retval) = 0;
+  NS_IMETHOD QuerySearchableHeader(const char *headerName, PRBool *_retval) = 0;
 
   /* void GroupNotFound (in string group, in boolean opening); */
   NS_IMETHOD GroupNotFound(const char *group, PRBool opening) = 0;
@@ -90,16 +84,16 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD AddNewNewsgroup(const char *name, PRInt32 first, PRInt32 last, const char *flags, PRBool xactiveFlags) = 0;
 
   /* long GetNumGroupsNeedingCounts (); */
-  NS_IMETHOD GetNumGroupsNeedingCounts(PRInt32 *retval) = 0;
+  NS_IMETHOD GetNumGroupsNeedingCounts(PRInt32 *_retval) = 0;
 
   /* string GetFirstGroupNeedingCounts (); */
-  NS_IMETHOD GetFirstGroupNeedingCounts(char **retval) = 0;
+  NS_IMETHOD GetFirstGroupNeedingCounts(char **_retval) = 0;
 
   /* void DisplaySubscribedGroup (in string name, in long first_message, in long last_message, in long total_messages, in boolean visit_now); */
   NS_IMETHOD DisplaySubscribedGroup(const char *name, PRInt32 first_message, PRInt32 last_message, PRInt32 total_messages, PRBool visit_now) = 0;
 
   /* string GetFirstGroupNeedingExtraInfo (); */
-  NS_IMETHOD GetFirstGroupNeedingExtraInfo(char **retval) = 0;
+  NS_IMETHOD GetFirstGroupNeedingExtraInfo(char **_retval) = 0;
 
   /* void SetGroupNeedsExtraInfo (in string name, in boolean needsExtraInfo); */
   NS_IMETHOD SetGroupNeedsExtraInfo(const char *name, PRBool needsExtraInfo) = 0;
@@ -110,7 +104,7 @@ class nsINNTPHost : public nsISupports {
   /* void SetPrettyName (in string name, in string prettyName); */
   NS_IMETHOD SetPrettyName(const char *name, const char *prettyName) = 0;
 
-  /* void LoadNewsrc (); */
+  /* void LoadNewsrc (in string uri); */
   NS_IMETHOD LoadNewsrc(const char *uri) = 0;
 
   /* void WriteNewsrc (); */
@@ -127,10 +121,10 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD SetNewsRCFilename(char * aNewsRCFilename) = 0;
 
   /* nsINNTPNewsgroup FindGroup (in string name); */
-  NS_IMETHOD FindGroup(const char *name, nsINNTPNewsgroup **retval) = 0;
+  NS_IMETHOD FindGroup(const char *name, nsINNTPNewsgroup **_retval) = 0;
 
   /* nsINNTPNewsgroup AddGroup (in string name); */
-  NS_IMETHOD AddGroup(const char *name, nsINNTPNewsgroup **retval) = 0;
+  NS_IMETHOD AddGroup(const char *name, nsINNTPNewsgroup **_retval) = 0;
 
   /* void RemoveGroupByName (in string name); */
   NS_IMETHOD RemoveGroupByName(const char *name) = 0;
@@ -142,12 +136,7 @@ class nsINNTPHost : public nsISupports {
   NS_IMETHOD GetDbDirName(char * *aDbDirName) = 0;
 
   /* string GetGroupList (); */
-  NS_IMETHOD GetGroupList(char **retval) = 0;
-
-#ifdef XPIDL_JS_STUBS
-  static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
-  static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsINNTPHost *priv);
-#endif
+  NS_IMETHOD GetGroupList(char **_retval) = 0;
 };
 
 #endif /* __gen_nsINNTPHost_h__ */
diff --git a/mailnews/news/public/nsINNTPHost.idl b/mailnews/news/public/nsINNTPHost.idl
index ca2eaad75ed..335bca1e507 100644
--- a/mailnews/news/public/nsINNTPHost.idl
+++ b/mailnews/news/public/nsINNTPHost.idl
@@ -19,10 +19,6 @@
 #include "nsINNTPNewsgroupList.idl"
 #include "nsINNTPNewsgroup.idl"
 
-%{ C++
-#include prtime.h
-%}
-
 [object, uuid(6b128da0-d74f-11d2-b7f9-00805f05ffa5)]
 interface nsINNTPHost : nsISupports {
 
diff --git a/mailnews/news/src/nsNNTPHost.cpp b/mailnews/news/src/nsNNTPHost.cpp
index 096254cf0c6..04ade646102 100644
--- a/mailnews/news/src/nsNNTPHost.cpp
+++ b/mailnews/news/src/nsNNTPHost.cpp
@@ -81,7 +81,7 @@ public:
                          m_supportsExtensions);
     
 	NS_IMETHOD AddExtension (const char *ext);
-	NS_IMETHOD QueryExtension (const char *ext, PRBool *retval);
+	NS_IMETHOD QueryExtension (const char *ext, PRBool *_retval);
     
     NS_IMPL_CLASS_GETSET(PostingAllowed, PRBool, m_postingAllowed);
     
@@ -90,7 +90,7 @@ public:
     
     NS_IMPL_CLASS_GETSET(LastUpdatedTime, PRUint32, m_lastGroupUpdate);
 
-    NS_IMETHOD GetNewsgroupList(const char *name,nsINNTPNewsgroupList **retval);
+    NS_IMETHOD GetNewsgroupList(const char *name,nsINNTPNewsgroupList **_retval);
 	
     NS_IMETHOD GetNewsgroupAndNumberOfID(const char *message_id,
                                          nsINNTPNewsgroup **group,
@@ -98,10 +98,10 @@ public:
 
     /* get this from MSG_Master::FindNewsFolder */
     NS_IMETHOD FindNewsgroup(const char *name, PRBool create,
-		nsINNTPNewsgroup **retval) { NS_ASSERTION(0, "unimplemented!"); return NS_OK;}
+		nsINNTPNewsgroup **_retval) { NS_ASSERTION(0, "unimplemented!"); return NS_OK;}
     
 	NS_IMETHOD AddPropertyForGet (const char *property, const char *value);
-	NS_IMETHOD QueryPropertyForGet (const char *property, char **retval);
+	NS_IMETHOD QueryPropertyForGet (const char *property, char **_retval);
 
     NS_IMETHOD AddSearchableGroup(const char *name);
     // should these go into interfaces?
@@ -113,11 +113,11 @@ public:
     NS_IMETHOD SetIsVirtualGroup(const char *name, PRBool isVirtual);
     NS_IMETHOD SetIsVirtualGroup(const char *name, PRBool isVirtual,
                                  nsMsgGroupRecord *inGroupRecord);
-    NS_IMETHOD GetIsVirtualGroup(const char *name, PRBool *retval);
+    NS_IMETHOD GetIsVirtualGroup(const char *name, PRBool *_retval);
 
     // custom/searchable headers
     NS_IMETHOD AddSearchableHeader(const char *headerName);
-    NS_IMETHOD QuerySearchableHeader(const char *headerName, PRBool *retval);
+    NS_IMETHOD QuerySearchableHeader(const char *headerName, PRBool *_retval);
     
 	// Go load the newsrc for this host.  Creates the subscribed hosts as
 	// children of the given nsIMsgFolder.
@@ -144,13 +144,13 @@ public:
     // (this is what the pre-mozilla API looked like)
     char *GetNewsrcFileName() { return m_filename; };
     
-    NS_IMETHOD FindGroup(const char* name, nsINNTPNewsgroup* *retval);
+    NS_IMETHOD FindGroup(const char* name, nsINNTPNewsgroup* *_retval);
     NS_IMETHOD AddGroup(const char *name,
-                        nsINNTPNewsgroup **retval);
+                        nsINNTPNewsgroup **_retval);
     
     NS_IMETHOD AddGroup(const char *name,
                         nsMsgGroupRecord *groupRecord,
-                        nsINNTPNewsgroup **retval);
+                        nsINNTPNewsgroup **_retval);
     
     NS_IMETHOD RemoveGroupByName(const char *name);
     NS_IMETHOD RemoveGroup(nsINNTPNewsgroup*);
@@ -173,7 +173,7 @@ public:
     /* Returns a list of newsgroups.  The result
        must be free'd using PR_Free(); the
        individual strings must not be free'd. */
-    NS_IMETHOD GetGroupList(char **retval) { return NS_OK;}
+    NS_IMETHOD GetGroupList(char **_retval) { return NS_OK;}
 
     NS_IMETHOD DisplaySubscribedGroup(const char *name,
                                       PRInt32 first_message,
@@ -1996,7 +1996,7 @@ nsNNTPHost::EmptyInhale()
 
 
 nsresult
-nsNNTPHost::FindGroup(const char* name, nsINNTPNewsgroup* *retval)
+nsNNTPHost::FindGroup(const char* name, nsINNTPNewsgroup* *_retval)
 {
     nsresult result = NS_ERROR_NOT_INITIALIZED;
 
@@ -2024,7 +2024,7 @@ nsNNTPHost::FindGroup(const char* name, nsINNTPNewsgroup* *retval)
 #endif
 
 		if (NS_SUCCEEDED(rv) && (name != nsnull) && PL_strcmp(name, groupname) == 0) {
-			*retval = info;
+			*_retval = info;
             result = NS_OK;
 		}
 	}
@@ -2033,16 +2033,16 @@ nsNNTPHost::FindGroup(const char* name, nsINNTPNewsgroup* *retval)
 
 nsresult
 nsNNTPHost::AddGroup(const char *name,
-                     nsINNTPNewsgroup **retval)
+                     nsINNTPNewsgroup **_retval)
 {
-    return AddGroup(name, NULL, retval);
+    return AddGroup(name, NULL, _retval);
 }
 
 
 nsresult
 nsNNTPHost::AddGroup(const char *name,
                      nsMsgGroupRecord *inGroupRecord,
-                     nsINNTPNewsgroup **retval)
+                     nsINNTPNewsgroup **_retval)
 {
 #ifdef DEBUG_NEWS
 	printf("nsNNTPHost::AddGroup(%s)\n",name);
@@ -2216,7 +2216,7 @@ DONE:
     NS_IF_RELEASE(categoryContainer);
 
 	if (containerName) delete [] containerName;
-    if (retval) *retval = newsInfo;
+    if (_retval) *_retval = newsInfo;
     return NS_OK;
 }
 
@@ -2510,12 +2510,12 @@ nsNNTPHost::AddExtension (const char *ext)
 }
 
 nsresult
-nsNNTPHost::QueryExtension (const char *ext, PRBool *retval)
+nsNNTPHost::QueryExtension (const char *ext, PRBool *_retval)
 {
-    *retval = PR_FALSE;
+    *_retval = PR_FALSE;
 	for (int i = 0; i < m_supportedExtensions.Count(); i++)
 		if (!PL_strcmp(ext, (char*) m_supportedExtensions[i])) {
-			*retval=PR_TRUE;
+			*_retval=PR_TRUE;
             return NS_OK;
         }
 	return NS_OK;
@@ -2547,27 +2547,27 @@ nsNNTPHost::AddSearchableGroup (const char *group)
 }
 
 nsresult
-nsNNTPHost::QuerySearchableGroup (const char *group, PRBool *retval)
+nsNNTPHost::QuerySearchableGroup (const char *group, PRBool *_retval)
 {
-    *retval = FALSE;
+    *_retval = PR_FALSE;
 	for (int i = 0; i < m_searchableGroups.Count(); i++)
 	{
 		const char *searchableGroup = (const char*) m_searchableGroups[i];
 		char *starInSearchableGroup = NULL;
 
 		if (!PL_strcmp(searchableGroup, "*")) {
-			*retval = PR_TRUE; // everything is searchable
+			*_retval = PR_TRUE; // everything is searchable
             return NS_OK;
         }
 		else if (NULL != (starInSearchableGroup = PL_strchr(searchableGroup, '*')))
 		{
 			if (!PL_strncasecmp(group, searchableGroup, PL_strlen(searchableGroup)-2)) {
-				*retval = PR_TRUE; // this group is in a searchable hierarchy
+				*_retval = PR_TRUE; // this group is in a searchable hierarchy
                 return NS_OK;
             }
 		}
 		else if (!PL_strcasecmp(group, searchableGroup)) {
-            *retval = PR_TRUE; // this group is individually searchable
+            *_retval = PR_TRUE; // this group is individually searchable
             return NS_OK;
         }
 	}
@@ -2624,12 +2624,12 @@ nsNNTPHost::AddSearchableHeader (const char *header)
 }
 
 nsresult
-nsNNTPHost::QuerySearchableHeader(const char *header, PRBool *retval)
+nsNNTPHost::QuerySearchableHeader(const char *header, PRBool *_retval)
 {
-    *retval=PR_FALSE;
+    *_retval=PR_FALSE;
 	for (int i = 0; i < m_searchableHeaders.Count(); i++)
 		if (!PL_strncasecmp(header, (char*) m_searchableHeaders[i], PL_strlen(header))) {
-			*retval = PR_TRUE;
+			*_retval = PR_TRUE;
             return NS_OK;
         }
 	return NS_OK;
@@ -2653,12 +2653,12 @@ nsNNTPHost::AddPropertyForGet (const char *property, const char *value)
 }
 
 nsresult
-nsNNTPHost::QueryPropertyForGet (const char *property, char **retval)
+nsNNTPHost::QueryPropertyForGet (const char *property, char **_retval)
 {
-    *retval=NULL;
+    *_retval=NULL;
 	for (int i = 0; i < m_propertiesForGet.Count(); i++)
 		if (!PL_strcasecmp(property, (const char *) m_propertiesForGet[i])) {
-            *retval = (char *)m_valuesForGet[i];
+            *_retval = (char *)m_valuesForGet[i];
 			return NS_OK;
         }
     
@@ -2923,15 +2923,15 @@ nsNNTPHost::GetCategoryContainerFolderInfo(const char *name)
 
 
 nsresult
-nsNNTPHost::GetIsVirtualGroup(const char* name, PRBool *retval)
+nsNNTPHost::GetIsVirtualGroup(const char* name, PRBool *_retval)
 {
 	nsMsgGroupRecord* group = FindOrCreateGroup(name);
 	if (!group) {
-        *retval = PR_FALSE;
+        *_retval = PR_FALSE;
         return NS_OK;
     }
 	else
-        return group->IsVirtual(retval);
+        return group->IsVirtual(_retval);
 }
 
 
@@ -3493,7 +3493,7 @@ int nsNNTPHost::DeleteFiles ()
 }
 
 nsresult
-nsNNTPHost::GetNewsgroupList(const char* name, nsINNTPNewsgroupList **retval)
+nsNNTPHost::GetNewsgroupList(const char* name, nsINNTPNewsgroupList **_retval)
 {
 	nsresult result = NS_ERROR_NOT_INITIALIZED;
 
@@ -3519,7 +3519,7 @@ nsNNTPHost::GetNewsgroupList(const char* name, nsINNTPNewsgroupList **retval)
 #endif
 
 		if (NS_SUCCEEDED(rv) && (newsgroupname != nsnull) && PL_strcmp(name,newsgroupname) == 0) {
-			*retval = list;
+			*_retval = list;
             result = NS_OK;
 		}
 	}
diff --git a/mailnews/news/src/nsNNTPHost.h b/mailnews/news/src/nsNNTPHost.h
index 1e6d547971e..c4258d181d0 100644
--- a/mailnews/news/src/nsNNTPHost.h
+++ b/mailnews/news/src/nsNNTPHost.h
@@ -24,8 +24,12 @@
 /* some platforms (like Windows and Mac) use a map file, because of
  * file name length limitations. */
 #ifndef XP_UNIX
+#if defined(XP_MAC) || defined(XP_WIN) 
 #define USE_NEWSRC_MAP_FILE
-#endif
+#else
+#error do_you_need_a_newsrc_map_file
+#endif /* XP_MAC || XP_WIN */
+#endif /* XP_UNIX */
 
 NS_BEGIN_EXTERN_C