1 files changed, 181 insertions, 149 deletions

diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index 06ae48c8e80c..f79a3efdfa9d 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -1,5 +1,6 @@
 include/mozilla/CNavDTD.h
 include/mozilla/COtherDTD.h
+include/mozilla/ImageLogging.h
 include/mozilla/MailNewsTypes.h
 include/mozilla/MailNewsTypes2.h
 include/mozilla/NSReg.h
@@ -9,12 +10,17 @@ include/mozilla/bool.h
 include/mozilla/cdefs.h
 include/mozilla/comi18n.h
 include/mozilla/csid.h
+include/mozilla/disptmpl.h
 include/mozilla/domstubs.h
 include/mozilla/dummy_nc.h
 include/mozilla/fdlibm.h
 include/mozilla/ftpCore.h
-include/mozilla/gbdate.h
 include/mozilla/gdksuperwin.h
+include/mozilla/gfx2types.h
+include/mozilla/gfxIFormats.h
+include/mozilla/gfxIImageFrame.h
+include/mozilla/gfxcompat.h
+include/mozilla/gfxtypes.h
 include/mozilla/gtkmozarea.h
 include/mozilla/gtkmozbox.h
 include/mozilla/gtkmozembed.h
@@ -33,6 +39,13 @@ include/mozilla/il_strm.h
 include/mozilla/il_types.h
 include/mozilla/il_util.h
 include/mozilla/il_utilp.h
+include/mozilla/imgICache.h
+include/mozilla/imgIContainer.h
+include/mozilla/imgIContainerObserver.h
+include/mozilla/imgIDecoder.h
+include/mozilla/imgIDecoderObserver.h
+include/mozilla/imgILoader.h
+include/mozilla/imgIRequest.h
 include/mozilla/interpreter.h
 include/mozilla/javaString.h
 include/mozilla/javaThreads.h
@@ -89,47 +102,11 @@ include/mozilla/jstypes.h
 include/mozilla/jsutil.h
 include/mozilla/jsxdrapi.h
 include/mozilla/jvmmgr.h
+include/mozilla/lber.h
+include/mozilla/ldap.h
 include/mozilla/libimg.h
-include/mozilla/libmng.h
-include/mozilla/libmng_conf.h
-include/mozilla/libmng_types.h
 include/mozilla/mcom_db.h
-include/mozilla/md/_aix32.cfg
-include/mozilla/md/_aix32in6.cfg
-include/mozilla/md/_aix64.cfg
-include/mozilla/md/_beos.cfg
-include/mozilla/md/_bsdi.cfg
-include/mozilla/md/_dgux.cfg
-include/mozilla/md/_freebsd.cfg
-include/mozilla/md/_hpux32.cfg
-include/mozilla/md/_hpux64.cfg
-include/mozilla/md/_irix32.cfg
-include/mozilla/md/_irix64.cfg
-include/mozilla/md/_linux.cfg
-include/mozilla/md/_ncr.cfg
-include/mozilla/md/_nec.cfg
-include/mozilla/md/_netbsd.cfg
-include/mozilla/md/_nextstep.cfg
-include/mozilla/md/_nto.cfg
-include/mozilla/md/_openbsd.cfg
-include/mozilla/md/_openvms.cfg
-include/mozilla/md/_os2.cfg
-include/mozilla/md/_osf1.cfg
-include/mozilla/md/_qnx.cfg
-include/mozilla/md/_reliantunix.cfg
-include/mozilla/md/_rhapsody.cfg
-include/mozilla/md/_scoos.cfg
-include/mozilla/md/_solaris32.cfg
-include/mozilla/md/_solaris64.cfg
-include/mozilla/md/_sony.cfg
-include/mozilla/md/_sunos4.cfg
-include/mozilla/md/_unixware.cfg
-include/mozilla/md/_unixware7.cfg
-include/mozilla/md/_win16.cfg
-include/mozilla/md/_win95.cfg
-include/mozilla/md/_winnt.cfg
 include/mozilla/mdb.h
-include/mozilla/merrors.h
 include/mozilla/mimecont.h
 include/mozilla/mimecth.h
 include/mozilla/mimehdrs.h
@@ -145,9 +122,7 @@ include/mozilla/modmimee.h
 include/mozilla/mozIJSSubScriptLoader.h
 include/mozilla/mozITXTToHTMLConv.h
 include/mozilla/msgCore.h
-include/mozilla/msgtypes.h
 include/mozilla/ncompat.h
-include/mozilla/net.h
 include/mozilla/netCore.h
 include/mozilla/netscape_javascript_JSException.h
 include/mozilla/netscape_javascript_JSObject.h
@@ -156,18 +131,24 @@ include/mozilla/nntpCore.h
 include/mozilla/npapi.h
 include/mozilla/npupp.h
 include/mozilla/nsABSyncDriver.h
+include/mozilla/nsAFlatString.h
+include/mozilla/nsAPromiseString.h
 include/mozilla/nsAReadableString.h
+include/mozilla/nsAString.h
 include/mozilla/nsAVLTree.h
 include/mozilla/nsAWritableString.h
 include/mozilla/nsAbAddressCollecter.h
 include/mozilla/nsAbAutoCompleteSession.h
+include/mozilla/nsAbBSDirectory.h
 include/mozilla/nsAbBaseCID.h
-include/mozilla/nsAbCard.h
 include/mozilla/nsAbCardProperty.h
 include/mozilla/nsAbDirProperty.h
-include/mozilla/nsAbDirectory.h
+include/mozilla/nsAbMDBCard.h
+include/mozilla/nsAbMDBCardProperty.h
+include/mozilla/nsAbMDBDirProperty.h
+include/mozilla/nsAbMDBDirectory.h
+include/mozilla/nsAbMDBRDFResource.h
 include/mozilla/nsAbRDFDataSource.h
-include/mozilla/nsAbRDFResource.h
 include/mozilla/nsAbSync.h
 include/mozilla/nsAbSyncCID.h
 include/mozilla/nsAbSyncCRCModel.h
@@ -204,7 +185,7 @@ include/mozilla/nsCSSValue.h
 include/mozilla/nsCURILoader.h
 include/mozilla/nsCWeakReference.h
 include/mozilla/nsCWebBrowser.h
-include/mozilla/nsCacheManager.h
+include/mozilla/nsCacheService.h
 include/mozilla/nsCardDataSource.h
 include/mozilla/nsCertificatePrincipal.h
 include/mozilla/nsCharTraits.h
@@ -216,16 +197,15 @@ include/mozilla/nsColor.h
 include/mozilla/nsColorNameList.h
 include/mozilla/nsColorNames.h
 include/mozilla/nsCom.h
+include/mozilla/nsCommonString.h
 include/mozilla/nsComponentManagerUtils.h
 include/mozilla/nsContentCID.h
 include/mozilla/nsContentPolicyUtils.h
 include/mozilla/nsContentUtils.h
-include/mozilla/nsCookie.h
 include/mozilla/nsCookieHTTPNotify.h
 include/mozilla/nsCoord.h
 include/mozilla/nsCopyMessageStreamListener.h
 include/mozilla/nsCppSharedAllocator.h
-include/mozilla/nsDBAccessor.h
 include/mozilla/nsDBFolderInfo.h
 include/mozilla/nsDOMCID.h
 include/mozilla/nsDOMCSSDeclaration.h
@@ -267,7 +247,6 @@ include/mozilla/nsGfxCIID.h
 include/mozilla/nsGfxPSCID.h
 include/mozilla/nsHTMLAtomList.h
 include/mozilla/nsHTMLAtoms.h
-include/mozilla/nsHTMLContentSinkStream.h
 include/mozilla/nsHTMLEntities.h
 include/mozilla/nsHTMLEntityList.h
 include/mozilla/nsHTMLParts.h
@@ -288,6 +267,8 @@ include/mozilla/nsIAbBase.h
 include/mozilla/nsIAbCard.h
 include/mozilla/nsIAbDirectory.h
 include/mozilla/nsIAbListener.h
+include/mozilla/nsIAbMDBCard.h
+include/mozilla/nsIAbMDBDirectory.h
 include/mozilla/nsIAbSync.h
 include/mozilla/nsIAbSyncDriver.h
 include/mozilla/nsIAbSyncListener.h
@@ -297,6 +278,10 @@ include/mozilla/nsIAbSyncPostListener.h
 include/mozilla/nsIAbUpgrader.h
 include/mozilla/nsIAboutModule.h
 include/mozilla/nsIAcceptLang.h
+include/mozilla/nsIAccessibilityService.h
+include/mozilla/nsIAccessible.h
+include/mozilla/nsIAccessibleEventListener.h
+include/mozilla/nsIAccessibleEventReceiver.h
 include/mozilla/nsIAddbookUrl.h
 include/mozilla/nsIAddrBookSession.h
 include/mozilla/nsIAddrDBAnnouncer.h
@@ -310,10 +295,12 @@ include/mozilla/nsIAppShell.h
 include/mozilla/nsIAppShellComponent.h
 include/mozilla/nsIAppShellComponentImpl.h
 include/mozilla/nsIAppShellService.h
+include/mozilla/nsIAppStartupNotifier.h
 include/mozilla/nsIArena.h
 include/mozilla/nsIAtom.h
 include/mozilla/nsIAtomService.h
 include/mozilla/nsIAttributeContent.h
+include/mozilla/nsIAuthPrompt.h
 include/mozilla/nsIAuthenticator.h
 include/mozilla/nsIAutoCompleteListener.h
 include/mozilla/nsIAutoCompleteResults.h
@@ -353,7 +340,12 @@ include/mozilla/nsICSSRule.h
 include/mozilla/nsICSSStyleRule.h
 include/mozilla/nsICSSStyleRuleProcessor.h
 include/mozilla/nsICSSStyleSheet.h
-include/mozilla/nsICachedNetData.h
+include/mozilla/nsICache.h
+include/mozilla/nsICacheEntryDescriptor.h
+include/mozilla/nsICacheListener.h
+include/mozilla/nsICacheService.h
+include/mozilla/nsICacheSession.h
+include/mozilla/nsICacheVisitor.h
 include/mozilla/nsICachingChannel.h
 include/mozilla/nsICaret.h
 include/mozilla/nsICaseConversion.h
@@ -386,7 +378,6 @@ include/mozilla/nsICollection.h
 include/mozilla/nsIComboBox.h
 include/mozilla/nsIComboboxControlFrame.h
 include/mozilla/nsICommandHandler.h
-include/mozilla/nsICommonDialogs.h
 include/mozilla/nsIComponentLoader.h
 include/mozilla/nsIComponentManager.h
 include/mozilla/nsICompositeListener.h
@@ -409,14 +400,14 @@ include/mozilla/nsIContextMenuListener.h
 include/mozilla/nsIController.h
 include/mozilla/nsIControllerCommand.h
 include/mozilla/nsIControllers.h
+include/mozilla/nsICookie.h
+include/mozilla/nsICookieManager.h
 include/mozilla/nsICookieService.h
 include/mozilla/nsICookieStorage.h
-include/mozilla/nsICookieViewer.h
 include/mozilla/nsICopyMessageListener.h
 include/mozilla/nsICopyMsgStreamListener.h
 include/mozilla/nsICurrentCharsetListener.h
 include/mozilla/nsID.h
-include/mozilla/nsIDBAccessor.h
 include/mozilla/nsIDBChangeAnnouncer.h
 include/mozilla/nsIDBChangeListener.h
 include/mozilla/nsIDBFolderInfo.h
@@ -443,6 +434,7 @@ include/mozilla/nsIDOMCSSValue.h
 include/mozilla/nsIDOMCharacterData.h
 include/mozilla/nsIDOMComment.h
 include/mozilla/nsIDOMCompositionListener.h
+include/mozilla/nsIDOMContextMenuListener.h
 include/mozilla/nsIDOMCounter.h
 include/mozilla/nsIDOMCrypto.h
 include/mozilla/nsIDOMDOMException.h
@@ -722,6 +714,7 @@ include/mozilla/nsIHTTPHeaderListener.h
 include/mozilla/nsIHTTPIndex.h
 include/mozilla/nsIHTTPProtocolHandler.h
 include/mozilla/nsIHelperAppLauncherDialog.h
+include/mozilla/nsIHistoryEntry.h
 include/mozilla/nsIHttpNotify.h
 include/mozilla/nsIID.h
 include/mozilla/nsIIFrameBoxObject.h
@@ -746,6 +739,7 @@ include/mozilla/nsIImapService.h
 include/mozilla/nsIImapUrl.h
 include/mozilla/nsIImgDCallbk.h
 include/mozilla/nsIImgDecoder.h
+include/mozilla/nsIImgManager.h
 include/mozilla/nsIImportABDescriptor.h
 include/mozilla/nsIImportAddressBooks.h
 include/mozilla/nsIImportFieldMap.h
@@ -784,6 +778,13 @@ include/mozilla/nsIJVMPrefsWindow.h
 include/mozilla/nsIJVMWindow.h
 include/mozilla/nsIKBStateControl.h
 include/mozilla/nsIKeyedStreamGenerator.h
+include/mozilla/nsILDAPConnection.h
+include/mozilla/nsILDAPErrors.h
+include/mozilla/nsILDAPMessage.h
+include/mozilla/nsILDAPMessageListener.h
+include/mozilla/nsILDAPOperation.h
+include/mozilla/nsILDAPServer.h
+include/mozilla/nsILDAPURL.h
 include/mozilla/nsILabel.h
 include/mozilla/nsILanguageAtom.h
 include/mozilla/nsILanguageAtomService.h
@@ -834,8 +835,6 @@ include/mozilla/nsIMenuFrame.h
 include/mozilla/nsIMenuItem.h
 include/mozilla/nsIMenuListener.h
 include/mozilla/nsIMenuRollup.h
-include/mozilla/nsIMessage.h
-include/mozilla/nsIMessageView.h
 include/mozilla/nsIMessenger.h
 include/mozilla/nsIMessengerMigrator.h
 include/mozilla/nsIMessengerWindowService.h
@@ -857,9 +856,11 @@ include/mozilla/nsIMsgBiffManager.h
 include/mozilla/nsIMsgCompFields.h
 include/mozilla/nsIMsgCompose.h
 include/mozilla/nsIMsgComposeParams.h
+include/mozilla/nsIMsgComposeProgress.h
 include/mozilla/nsIMsgComposeService.h
 include/mozilla/nsIMsgCopyService.h
 include/mozilla/nsIMsgCopyServiceListener.h
+include/mozilla/nsIMsgDBView.h
 include/mozilla/nsIMsgDatabase.h
 include/mozilla/nsIMsgDraft.h
 include/mozilla/nsIMsgFilter.h
@@ -884,6 +885,7 @@ include/mozilla/nsIMsgMailSession.h
 include/mozilla/nsIMsgMessageService.h
 include/mozilla/nsIMsgNewsFolder.h
 include/mozilla/nsIMsgOfflineImapOperation.h
+include/mozilla/nsIMsgOfflineManager.h
 include/mozilla/nsIMsgOfflineNewsState.h
 include/mozilla/nsIMsgParseMailMsgState.h
 include/mozilla/nsIMsgPrintEngine.h
@@ -908,14 +910,10 @@ include/mozilla/nsIMsgStatusFeedback.h
 include/mozilla/nsIMsgStringService.h
 include/mozilla/nsIMsgThread.h
 include/mozilla/nsIMsgVCard.h
-include/mozilla/nsIMsgViewNavigationService.h
 include/mozilla/nsIMsgWindow.h
+include/mozilla/nsIMutableAccessible.h
 include/mozilla/nsIMutableStyleContext.h
 include/mozilla/nsINNTPArticleList.h
-include/mozilla/nsINNTPCategory.h
-include/mozilla/nsINNTPCategoryContainer.h
-include/mozilla/nsINNTPHost.h
-include/mozilla/nsINNTPNewsgroup.h
 include/mozilla/nsINNTPNewsgroupList.h
 include/mozilla/nsINNTPNewsgroupPost.h
 include/mozilla/nsINNTPProtocol.h
@@ -923,14 +921,9 @@ include/mozilla/nsINSEvent.h
 include/mozilla/nsINameSpace.h
 include/mozilla/nsINameSpaceManager.h
 include/mozilla/nsINativeAppSupport.h
-include/mozilla/nsINetDataCache.h
-include/mozilla/nsINetDataCacheManager.h
-include/mozilla/nsINetDataCacheRecord.h
-include/mozilla/nsINetDataDiskCache.h
 include/mozilla/nsINetModRegEntry.h
 include/mozilla/nsINetModuleMgr.h
 include/mozilla/nsINetNotify.h
-include/mozilla/nsINetSupportDialogService.h
 include/mozilla/nsINewsDatabase.h
 include/mozilla/nsINewsDownloadDialogArgs.h
 include/mozilla/nsINntpIncomingServer.h
@@ -955,9 +948,11 @@ include/mozilla/nsIParser.h
 include/mozilla/nsIParserFilter.h
 include/mozilla/nsIParserNode.h
 include/mozilla/nsIParserService.h
+include/mozilla/nsIPassword.h
 include/mozilla/nsIPasswordManager.h
-include/mozilla/nsIPasswordManagerUtils.h
 include/mozilla/nsIPasswordSink.h
+include/mozilla/nsIPermission.h
+include/mozilla/nsIPermissionManager.h
 include/mozilla/nsIPersistentProperties2.h
 include/mozilla/nsIPipe.h
 include/mozilla/nsIPlaintextEditor.h
@@ -1009,6 +1004,7 @@ include/mozilla/nsIProfileInternal.h
 include/mozilla/nsIProfileStartupListener.h
 include/mozilla/nsIProgressEventSink.h
 include/mozilla/nsIPrompt.h
+include/mozilla/nsIPromptService.h
 include/mozilla/nsIProperties.h
 include/mozilla/nsIProtocolHandler.h
 include/mozilla/nsIProtocolProxyService.h
@@ -1048,6 +1044,8 @@ include/mozilla/nsIRelatedLinksHandler.h
 include/mozilla/nsIRemoteBrowserControl.h
 include/mozilla/nsIRenderingContext.h
 include/mozilla/nsIRequest.h
+include/mozilla/nsIRequestObserver.h
+include/mozilla/nsIRequestObserverProxy.h
 include/mozilla/nsIResChannel.h
 include/mozilla/nsIResProtocolHandler.h
 include/mozilla/nsIRollupListener.h
@@ -1056,6 +1054,7 @@ include/mozilla/nsISHContainer.h
 include/mozilla/nsISHEntry.h
 include/mozilla/nsISHTransaction.h
 include/mozilla/nsISHistory.h
+include/mozilla/nsISHistoryInternal.h
 include/mozilla/nsISHistoryListener.h
 include/mozilla/nsISOCKSSocketInfo.h
 include/mozilla/nsISOCKSSocketProvider.h
@@ -1127,14 +1126,12 @@ include/mozilla/nsISpellChecker.h
 include/mozilla/nsISplashScreen.h
 include/mozilla/nsIStatefulFrame.h
 include/mozilla/nsIStorageStream.h
-include/mozilla/nsIStreamAsFile.h
 include/mozilla/nsIStreamConverter.h
 include/mozilla/nsIStreamConverterService.h
 include/mozilla/nsIStreamIO.h
 include/mozilla/nsIStreamIOChannel.h
 include/mozilla/nsIStreamListener.h
 include/mozilla/nsIStreamLoader.h
-include/mozilla/nsIStreamObserver.h
 include/mozilla/nsIStreamProvider.h
 include/mozilla/nsIStreamTransfer.h
 include/mozilla/nsIStreamTransferOperation.h
@@ -1179,6 +1176,7 @@ include/mozilla/nsITimeRecorder.h
 include/mozilla/nsITimer.h
 include/mozilla/nsITimerCallback.h
 include/mozilla/nsITimerQueue.h
+include/mozilla/nsITimingService.h
 include/mozilla/nsITokenizer.h
 include/mozilla/nsIToolkit.h
 include/mozilla/nsITooltipListener.h
@@ -1200,6 +1198,7 @@ include/mozilla/nsIURIContentListener.h
 include/mozilla/nsIURIFixup.h
 include/mozilla/nsIURILoader.h
 include/mozilla/nsIURL.h
+include/mozilla/nsIURLFetcher.h
 include/mozilla/nsIURLParser.h
 include/mozilla/nsIUnicharBuffer.h
 include/mozilla/nsIUnicharInputStream.h
@@ -1215,15 +1214,18 @@ include/mozilla/nsIUserInfo.h
 include/mozilla/nsIView.h
 include/mozilla/nsIViewManager.h
 include/mozilla/nsIViewObserver.h
+include/mozilla/nsIViewSourceChannel.h
 include/mozilla/nsIWalletEditor.h
 include/mozilla/nsIWalletPreview.h
 include/mozilla/nsIWalletService.h
 include/mozilla/nsIWeakReference.h
 include/mozilla/nsIWebBrowser.h
 include/mozilla/nsIWebBrowserChrome.h
+include/mozilla/nsIWebBrowserChromeFocus.h
 include/mozilla/nsIWebBrowserFind.h
 include/mozilla/nsIWebBrowserFocus.h
 include/mozilla/nsIWebBrowserPersist.h
+include/mozilla/nsIWebBrowserPrint.h
 include/mozilla/nsIWebBrowserSetup.h
 include/mozilla/nsIWebFilters.h
 include/mozilla/nsIWebNavigation.h
@@ -1272,12 +1274,12 @@ include/mozilla/nsIXULWindow.h
 include/mozilla/nsIXmlRpcClient.h
 include/mozilla/nsIXmlRpcClientListener.h
 include/mozilla/nsIZipReader.h
+include/mozilla/nsImageMapUtils.h
 include/mozilla/nsImapCore.h
 include/mozilla/nsImapFlagAndUidState.h
 include/mozilla/nsImapIncomingServer.h
 include/mozilla/nsImapMailDatabase.h
 include/mozilla/nsImapMailFolder.h
-include/mozilla/nsImapMessage.h
 include/mozilla/nsImapProtocol.h
 include/mozilla/nsImapProxyEvent.h
 include/mozilla/nsImapSearchResults.h
@@ -1292,16 +1294,18 @@ include/mozilla/nsJSProtocolHandler.h
 include/mozilla/nsJSUtils.h
 include/mozilla/nsJVMManager.h
 include/mozilla/nsJVMPluginTagInfo.h
+include/mozilla/nsLDAP.h
 include/mozilla/nsLWBrkCIID.h
 include/mozilla/nsLayoutAtomList.h
 include/mozilla/nsLayoutAtoms.h
 include/mozilla/nsLayoutCID.h
 include/mozilla/nsLinebreakConverter.h
+include/mozilla/nsLiteralString.h
 include/mozilla/nsLocalFile.h
 include/mozilla/nsLocalFileUnix.h
 include/mozilla/nsLocalFolderSummarySpec.h
 include/mozilla/nsLocalMailFolder.h
-include/mozilla/nsLocalMessage.h
+include/mozilla/nsLocalString.h
 include/mozilla/nsLocalStringBundle.h
 include/mozilla/nsLocaleCID.h
 include/mozilla/nsLocaleFactory.h
@@ -1312,11 +1316,7 @@ include/mozilla/nsMailboxProtocol.h
 include/mozilla/nsMailboxService.h
 include/mozilla/nsMailboxUrl.h
 include/mozilla/nsMargin.h
-include/mozilla/nsMemCache.h
-include/mozilla/nsMemCacheCID.h
 include/mozilla/nsMemory.h
-include/mozilla/nsMessage.h
-include/mozilla/nsMessageView.h
 include/mozilla/nsMessenger.h
 include/mozilla/nsMessengerBootstrap.h
 include/mozilla/nsMessengerMigrator.h
@@ -1345,12 +1345,11 @@ include/mozilla/nsMsgBiffManager.h
 include/mozilla/nsMsgBodyHandler.h
 include/mozilla/nsMsgCompCID.h
 include/mozilla/nsMsgCompFields.h
-include/mozilla/nsMsgCompFieldsFact.h
 include/mozilla/nsMsgCompUtils.h
 include/mozilla/nsMsgCompose.h
 include/mozilla/nsMsgComposeContentHandler.h
-include/mozilla/nsMsgComposeFact.h
 include/mozilla/nsMsgComposeParams.h
+include/mozilla/nsMsgComposeProgress.h
 include/mozilla/nsMsgComposeService.h
 include/mozilla/nsMsgComposeStringBundle.h
 include/mozilla/nsMsgCopy.h
@@ -1382,10 +1381,8 @@ include/mozilla/nsMsgKeySet.h
 include/mozilla/nsMsgLineBuffer.h
 include/mozilla/nsMsgLocalCID.h
 include/mozilla/nsMsgLocalFolderHdrs.h
-include/mozilla/nsMsgMD5.h
 include/mozilla/nsMsgMailNewsUrl.h
 include/mozilla/nsMsgMailSession.h
-include/mozilla/nsMsgMessageDataSource.h
 include/mozilla/nsMsgMessageFlags.h
 include/mozilla/nsMsgMimeCID.h
 include/mozilla/nsMsgNewsCID.h
@@ -1402,38 +1399,27 @@ include/mozilla/nsMsgSearchAdapter.h
 include/mozilla/nsMsgSearchArray.h
 include/mozilla/nsMsgSearchBoolExpression.h
 include/mozilla/nsMsgSearchCore.h
-include/mozilla/nsMsgSearchDataSource.h
 include/mozilla/nsMsgSearchScopeTerm.h
 include/mozilla/nsMsgSearchSession.h
 include/mozilla/nsMsgSearchTerm.h
 include/mozilla/nsMsgSend.h
-include/mozilla/nsMsgSendFact.h
 include/mozilla/nsMsgSendLater.h
-include/mozilla/nsMsgSendLaterFact.h
 include/mozilla/nsMsgServiceProvider.h
 include/mozilla/nsMsgStatusFeedback.h
 include/mozilla/nsMsgThread.h
 include/mozilla/nsMsgTxn.h
 include/mozilla/nsMsgUtils.h
-include/mozilla/nsMsgViewNavigationService.h
 include/mozilla/nsMsgWindow.h
-include/mozilla/nsMsgZapIt.h
 include/mozilla/nsMutationEvent.h
 include/mozilla/nsNNTPArticleList.h
-include/mozilla/nsNNTPCategoryContainer.h
-include/mozilla/nsNNTPHost.h
-include/mozilla/nsNNTPNewsgroup.h
 include/mozilla/nsNNTPNewsgroupList.h
 include/mozilla/nsNNTPNewsgroupPost.h
 include/mozilla/nsNNTPProtocol.h
 include/mozilla/nsNetCID.h
-include/mozilla/nsNetDiskCache.h
-include/mozilla/nsNetDiskCacheCID.h
 include/mozilla/nsNetUtil.h
 include/mozilla/nsNewsDatabase.h
 include/mozilla/nsNewsDownloadDialogArgs.h
 include/mozilla/nsNewsFolder.h
-include/mozilla/nsNewsMessage.h
 include/mozilla/nsNewsSummarySpec.h
 include/mozilla/nsNewsUtils.h
 include/mozilla/nsNntpIncomingServer.h
@@ -1448,6 +1434,8 @@ include/mozilla/nsOutlinerSelection.h
 include/mozilla/nsPIBoxObject.h
 include/mozilla/nsPIDOMWindow.h
 include/mozilla/nsPIEditorTransaction.h
+include/mozilla/nsPIPluginHost.h
+include/mozilla/nsPIPromptService.h
 include/mozilla/nsPIWindowRoot.h
 include/mozilla/nsPIWindowWatcher.h
 include/mozilla/nsPIXPIManagerCallbacks.h
@@ -1471,6 +1459,9 @@ include/mozilla/nsPrefMigrationFactory.h
 include/mozilla/nsPrintfCString.h
 include/mozilla/nsPrivateSharableString.h
 include/mozilla/nsProcess.h
+include/mozilla/nsPromiseConcatenation.h
+include/mozilla/nsPromiseFlatString.h
+include/mozilla/nsPromiseSubstring.h
 include/mozilla/nsProxiedService.h
 include/mozilla/nsProxyEvent.h
 include/mozilla/nsQuickSort.h
@@ -1502,7 +1493,12 @@ include/mozilla/nsStr.h
 include/mozilla/nsStreamConverter.h
 include/mozilla/nsString.h
 include/mozilla/nsString2.h
+include/mozilla/nsStringFragment.h
+include/mozilla/nsStringFwd.h
 include/mozilla/nsStringIO.h
+include/mozilla/nsStringIterator.h
+include/mozilla/nsStringIteratorUtils.h
+include/mozilla/nsStringTraits.h
 include/mozilla/nsStringUtil.h
 include/mozilla/nsStyleChangeList.h
 include/mozilla/nsStyleConsts.h
@@ -1537,6 +1533,7 @@ include/mozilla/nsUCvTWCID.h
 include/mozilla/nsUInt32Array.h
 include/mozilla/nsURILoader.h
 include/mozilla/nsURLFetcher.h
+include/mozilla/nsUint8Array.h
 include/mozilla/nsUnicharUtilCIID.h
 include/mozilla/nsUnitConversion.h
 include/mozilla/nsUnixColorPrintf.h
@@ -1566,73 +1563,107 @@ include/mozilla/nslayout.h
 include/mozilla/nslog.h
 include/mozilla/nsplugin.h
 include/mozilla/nsplugindefs.h
-include/mozilla/nspr.h
+include/mozilla/nspr/md/_aix32.cfg
+include/mozilla/nspr/md/_aix32in6.cfg
+include/mozilla/nspr/md/_aix64.cfg
+include/mozilla/nspr/md/_beos.cfg
+include/mozilla/nspr/md/_bsdi.cfg
+include/mozilla/nspr/md/_dgux.cfg
+include/mozilla/nspr/md/_freebsd.cfg
+include/mozilla/nspr/md/_hpux32.cfg
+include/mozilla/nspr/md/_hpux64.cfg
+include/mozilla/nspr/md/_irix32.cfg
+include/mozilla/nspr/md/_irix64.cfg
+include/mozilla/nspr/md/_linux.cfg
+include/mozilla/nspr/md/_ncr.cfg
+include/mozilla/nspr/md/_nec.cfg
+include/mozilla/nspr/md/_netbsd.cfg
+include/mozilla/nspr/md/_nextstep.cfg
+include/mozilla/nspr/md/_nto.cfg
+include/mozilla/nspr/md/_openbsd.cfg
+include/mozilla/nspr/md/_openvms.cfg
+include/mozilla/nspr/md/_os2.cfg
+include/mozilla/nspr/md/_osf1.cfg
+include/mozilla/nspr/md/_qnx.cfg
+include/mozilla/nspr/md/_reliantunix.cfg
+include/mozilla/nspr/md/_rhapsody.cfg
+include/mozilla/nspr/md/_scoos.cfg
+include/mozilla/nspr/md/_solaris32.cfg
+include/mozilla/nspr/md/_solaris64.cfg
+include/mozilla/nspr/md/_sony.cfg
+include/mozilla/nspr/md/_sunos4.cfg
+include/mozilla/nspr/md/_unixware.cfg
+include/mozilla/nspr/md/_unixware7.cfg
+include/mozilla/nspr/md/_win16.cfg
+include/mozilla/nspr/md/_win95.cfg
+include/mozilla/nspr/md/_winnt.cfg
+include/mozilla/nspr/nspr.h
+include/mozilla/nspr/obsolete/pralarm.h
+include/mozilla/nspr/obsolete/probslet.h
+include/mozilla/nspr/obsolete/protypes.h
+include/mozilla/nspr/obsolete/prsem.h
+include/mozilla/nspr/plarena.h
+include/mozilla/nspr/plarenas.h
+include/mozilla/nspr/plbase64.h
+include/mozilla/nspr/plerror.h
+include/mozilla/nspr/plgetopt.h
+include/mozilla/nspr/plhash.h
+include/mozilla/nspr/plresolv.h
+include/mozilla/nspr/plstr.h
+include/mozilla/nspr/pratom.h
+include/mozilla/nspr/prbit.h
+include/mozilla/nspr/prclist.h
+include/mozilla/nspr/prcmon.h
+include/mozilla/nspr/prcountr.h
+include/mozilla/nspr/prcpucfg.h
+include/mozilla/nspr/prcvar.h
+include/mozilla/nspr/prdtoa.h
+include/mozilla/nspr/prenv.h
+include/mozilla/nspr/prerr.h
+include/mozilla/nspr/prerror.h
+include/mozilla/nspr/prinet.h
+include/mozilla/nspr/prinit.h
+include/mozilla/nspr/prinrval.h
+include/mozilla/nspr/prio.h
+include/mozilla/nspr/pripcsem.h
+include/mozilla/nspr/private/pprio.h
+include/mozilla/nspr/private/pprthred.h
+include/mozilla/nspr/private/prpriv.h
+include/mozilla/nspr/prlink.h
+include/mozilla/nspr/prlock.h
+include/mozilla/nspr/prlog.h
+include/mozilla/nspr/prlong.h
+include/mozilla/nspr/prmem.h
+include/mozilla/nspr/prmon.h
+include/mozilla/nspr/prmwait.h
+include/mozilla/nspr/prnetdb.h
+include/mozilla/nspr/prolock.h
+include/mozilla/nspr/prpdce.h
+include/mozilla/nspr/prprf.h
+include/mozilla/nspr/prproces.h
+include/mozilla/nspr/prrng.h
+include/mozilla/nspr/prrwlock.h
+include/mozilla/nspr/prshm.h
+include/mozilla/nspr/prshma.h
+include/mozilla/nspr/prsystem.h
+include/mozilla/nspr/prthread.h
+include/mozilla/nspr/prtime.h
+include/mozilla/nspr/prtpool.h
+include/mozilla/nspr/prtrace.h
+include/mozilla/nspr/prtypes.h
+include/mozilla/nspr/prvrsion.h
+include/mozilla/nspr/prwin16.h
 include/mozilla/nspr_md.h
 include/mozilla/nsres.h
 include/mozilla/nsrootidl.h
-include/mozilla/ntypes.h
-include/mozilla/obsolete/pralarm.h
-include/mozilla/obsolete/probslet.h
-include/mozilla/obsolete/protypes.h
-include/mozilla/obsolete/prsem.h
 include/mozilla/oobj.h
-include/mozilla/plarena.h
-include/mozilla/plarenas.h
 include/mozilla/platform.h
-include/mozilla/plbase64.h
 include/mozilla/pldhash.h
-include/mozilla/plerror.h
 include/mozilla/plevent.h
-include/mozilla/plgetopt.h
-include/mozilla/plhash.h
-include/mozilla/plresolv.h
-include/mozilla/plstr.h
 include/mozilla/plvector.h
-include/mozilla/pratom.h
-include/mozilla/prbit.h
-include/mozilla/prclist.h
-include/mozilla/prcmon.h
-include/mozilla/prcountr.h
-include/mozilla/prcpucfg.h
-include/mozilla/prcvar.h
-include/mozilla/prdtoa.h
 include/mozilla/prefldap.h
-include/mozilla/prenv.h
-include/mozilla/prerr.h
-include/mozilla/prerror.h
-include/mozilla/prinet.h
-include/mozilla/prinit.h
-include/mozilla/prinrval.h
-include/mozilla/prio.h
-include/mozilla/pripcsem.h
-include/mozilla/private/pprio.h
-include/mozilla/private/pprthred.h
-include/mozilla/private/prpriv.h
-include/mozilla/prlink.h
-include/mozilla/prlock.h
-include/mozilla/prlog.h
-include/mozilla/prlong.h
-include/mozilla/prmem.h
-include/mozilla/prmon.h
-include/mozilla/prmwait.h
-include/mozilla/prnetdb.h
-include/mozilla/prolock.h
-include/mozilla/prpdce.h
-include/mozilla/prprf.h
-include/mozilla/prproces.h
-include/mozilla/prrng.h
-include/mozilla/prrwlock.h
-include/mozilla/prshm.h
-include/mozilla/prshma.h
-include/mozilla/prsystem.h
-include/mozilla/prthread.h
-include/mozilla/prtime.h
-include/mozilla/prtpool.h
-include/mozilla/prtrace.h
-include/mozilla/prtypes.h
-include/mozilla/prvrsion.h
-include/mozilla/prwin16.h
 include/mozilla/rdf.h
+include/mozilla/srchpref.h
 include/mozilla/stopwatch.h
 include/mozilla/sysmacros_md.h
 include/mozilla/tree.h
@@ -1646,7 +1677,6 @@ include/mozilla/xp_file.h
 include/mozilla/xp_mem.h
 include/mozilla/xp_obs.h
 include/mozilla/xp_path.h
-include/mozilla/xp_regexp.h
 include/mozilla/xp_str.h
 include/mozilla/xpccomponents.h
 include/mozilla/xpcexception.h
@@ -1657,6 +1687,7 @@ include/mozilla/xpctest2.h
 include/mozilla/xpctest_attributes.h
 include/mozilla/xpctest_calljs.h
 include/mozilla/xpctest_const.h
+include/mozilla/xpctest_domstring.h
 include/mozilla/xpctest_in.h
 include/mozilla/xpctest_inout.h
 include/mozilla/xpctest_multiple.h
@@ -1672,7 +1703,8 @@ include/mozilla/xulstubs.h
 include/mozilla/zip.h
 include/mozilla/zipfile.h
 include/mozilla/zipstub.h
-@dirrm include/mozilla/private
-@dirrm include/mozilla/obsolete
-@dirrm include/mozilla/md
+@dirrm include/mozilla/nspr/private
+@dirrm include/mozilla/nspr/obsolete
+@dirrm include/mozilla/nspr/md
+@dirrm include/mozilla/nspr
 @dirrm include/mozilla