1 files changed, 67 insertions, 32 deletions

diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index 8ba6e0bd7766..b3b5e64c05d9 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -1,6 +1,7 @@
 include/mozilla/CNavDTD.h
 include/mozilla/COtherDTD.h
 include/mozilla/ImageLogging.h
+include/mozilla/InstallCleanupDefines.h
 include/mozilla/MailNewsTypes.h
 include/mozilla/MailNewsTypes2.h
 include/mozilla/NSReg.h
@@ -105,6 +106,9 @@ 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/mdb.h
 include/mozilla/mimecont.h
@@ -135,6 +139,7 @@ include/mozilla/nsAFlatString.h
 include/mozilla/nsAPromiseString.h
 include/mozilla/nsAReadableString.h
 include/mozilla/nsAString.h
+include/mozilla/nsAStringGenerator.h
 include/mozilla/nsAVLTree.h
 include/mozilla/nsAWritableString.h
 include/mozilla/nsAbAddressCollecter.h
@@ -167,6 +172,8 @@ include/mozilla/nsArabicBasicLToPFormBVCID.h
 include/mozilla/nsAtomService.h
 include/mozilla/nsAutoLock.h
 include/mozilla/nsBasePrincipal.h
+include/mozilla/nsBidiFrames.h
+include/mozilla/nsBidiPresUtils.h
 include/mozilla/nsBufferHandle.h
 include/mozilla/nsBufferHandleUtils.h
 include/mozilla/nsBuildID.h
@@ -197,7 +204,6 @@ 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
@@ -211,10 +217,11 @@ include/mozilla/nsDOMCID.h
 include/mozilla/nsDOMCSSDeclaration.h
 include/mozilla/nsDOMError.h
 include/mozilla/nsDOMEventsIIDs.h
-include/mozilla/nsDOMPropEnums.h
-include/mozilla/nsDOMPropNames.h
 include/mozilla/nsDateTimeFormatCID.h
 include/mozilla/nsDebug.h
+include/mozilla/nsDependentConcatenation.h
+include/mozilla/nsDependentString.h
+include/mozilla/nsDependentSubstring.h
 include/mozilla/nsDeque.h
 include/mozilla/nsDetectionConfident.h
 include/mozilla/nsDeviceContext.h
@@ -233,12 +240,12 @@ include/mozilla/nsEscape.h
 include/mozilla/nsExpatDTD.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
-include/mozilla/nsFileLocations.h
 include/mozilla/nsFileSpec.h
 include/mozilla/nsFileSpecStreaming.h
 include/mozilla/nsFileStream.h
 include/mozilla/nsFixedSizeAllocator.h
 include/mozilla/nsFont.h
+include/mozilla/nsFontList.h
 include/mozilla/nsFragmentedString.h
 include/mozilla/nsFrameList.h
 include/mozilla/nsFrameTraversal.h
@@ -256,11 +263,11 @@ include/mozilla/nsHTMLTags.h
 include/mozilla/nsHTMLTokens.h
 include/mozilla/nsHTMLValue.h
 include/mozilla/nsHTTPChunkConv.h
-include/mozilla/nsHTTPEnums.h
 include/mozilla/nsHankakuToZenkakuCID.h
 include/mozilla/nsHashtable.h
 include/mozilla/nsHashtableEnumerator.h
 include/mozilla/nsHelperAppRDF.h
+include/mozilla/nsIASN1Outliner.h
 include/mozilla/nsIAbAddressCollecter.h
 include/mozilla/nsIAbAutoCompleteSession.h
 include/mozilla/nsIAbBase.h
@@ -305,6 +312,7 @@ include/mozilla/nsIAuthenticator.h
 include/mozilla/nsIAutoCompleteListener.h
 include/mozilla/nsIAutoCompleteResults.h
 include/mozilla/nsIAutoCompleteSession.h
+include/mozilla/nsIAutoConfig.h
 include/mozilla/nsIAutoCopy.h
 include/mozilla/nsIBadCertListener.h
 include/mozilla/nsIBaseWindow.h
@@ -326,6 +334,7 @@ include/mozilla/nsIBrowserInstance.h
 include/mozilla/nsIButton.h
 include/mozilla/nsIByteArrayInputStream.h
 include/mozilla/nsIByteBuffer.h
+include/mozilla/nsIByteRangeRequest.h
 include/mozilla/nsICSSCharsetRule.h
 include/mozilla/nsICSSDeclaration.h
 include/mozilla/nsICSSFrameConstructor.h
@@ -348,10 +357,12 @@ include/mozilla/nsICacheService.h
 include/mozilla/nsICacheSession.h
 include/mozilla/nsICacheVisitor.h
 include/mozilla/nsICachingChannel.h
+include/mozilla/nsICanvasFrame.h
 include/mozilla/nsICaret.h
 include/mozilla/nsICaseConversion.h
 include/mozilla/nsICategoryHandler.h
 include/mozilla/nsICategoryManager.h
+include/mozilla/nsICertOutliner.h
 include/mozilla/nsICertSelect.h
 include/mozilla/nsICertificatePrincipal.h
 include/mozilla/nsIChannel.h
@@ -371,6 +382,7 @@ include/mozilla/nsIClassInfo.h
 include/mozilla/nsIClipView.h
 include/mozilla/nsIClipboard.h
 include/mozilla/nsIClipboardCommands.h
+include/mozilla/nsIClipboardHelper.h
 include/mozilla/nsIClipboardOwner.h
 include/mozilla/nsICmdLineHandler.h
 include/mozilla/nsICmdLineService.h
@@ -390,6 +402,7 @@ include/mozilla/nsIConsoleService.h
 include/mozilla/nsIContent.h
 include/mozilla/nsIContentHandler.h
 include/mozilla/nsIContentIterator.h
+include/mozilla/nsIContentList.h
 include/mozilla/nsIContentPolicy.h
 include/mozilla/nsIContentSerializer.h
 include/mozilla/nsIContentSink.h
@@ -421,6 +434,7 @@ include/mozilla/nsIDOMBarProp.h
 include/mozilla/nsIDOMCDATASection.h
 include/mozilla/nsIDOMCRMFObject.h
 include/mozilla/nsIDOMCSS2Properties.h
+include/mozilla/nsIDOMCSSCharsetRule.h
 include/mozilla/nsIDOMCSSFontFaceRule.h
 include/mozilla/nsIDOMCSSImportRule.h
 include/mozilla/nsIDOMCSSMediaRule.h
@@ -434,6 +448,7 @@ include/mozilla/nsIDOMCSSStyleSheet.h
 include/mozilla/nsIDOMCSSUnknownRule.h
 include/mozilla/nsIDOMCSSValue.h
 include/mozilla/nsIDOMCharacterData.h
+include/mozilla/nsIDOMClassInfo.h
 include/mozilla/nsIDOMComment.h
 include/mozilla/nsIDOMCompositionListener.h
 include/mozilla/nsIDOMContextMenuListener.h
@@ -445,12 +460,14 @@ include/mozilla/nsIDOMDocument.h
 include/mozilla/nsIDOMDocumentCSS.h
 include/mozilla/nsIDOMDocumentEvent.h
 include/mozilla/nsIDOMDocumentFragment.h
+include/mozilla/nsIDOMDocumentRange.h
 include/mozilla/nsIDOMDocumentStyle.h
 include/mozilla/nsIDOMDocumentType.h
 include/mozilla/nsIDOMDocumentView.h
 include/mozilla/nsIDOMDocumentXBL.h
 include/mozilla/nsIDOMDragListener.h
 include/mozilla/nsIDOMElement.h
+include/mozilla/nsIDOMElementCSSInlineStyle.h
 include/mozilla/nsIDOMEntity.h
 include/mozilla/nsIDOMEntityReference.h
 include/mozilla/nsIDOMEvent.h
@@ -477,7 +494,6 @@ include/mozilla/nsIDOMHTMLElement.h
 include/mozilla/nsIDOMHTMLEmbedElement.h
 include/mozilla/nsIDOMHTMLFieldSetElement.h
 include/mozilla/nsIDOMHTMLFontElement.h
-include/mozilla/nsIDOMHTMLFormControlList.h
 include/mozilla/nsIDOMHTMLFormElement.h
 include/mozilla/nsIDOMHTMLFrameElement.h
 include/mozilla/nsIDOMHTMLFrameSetElement.h
@@ -491,7 +507,6 @@ include/mozilla/nsIDOMHTMLInputElement.h
 include/mozilla/nsIDOMHTMLIsIndexElement.h
 include/mozilla/nsIDOMHTMLLIElement.h
 include/mozilla/nsIDOMHTMLLabelElement.h
-include/mozilla/nsIDOMHTMLLayerElement.h
 include/mozilla/nsIDOMHTMLLegendElement.h
 include/mozilla/nsIDOMHTMLLinkElement.h
 include/mozilla/nsIDOMHTMLMapElement.h
@@ -509,19 +524,19 @@ include/mozilla/nsIDOMHTMLQuoteElement.h
 include/mozilla/nsIDOMHTMLScriptElement.h
 include/mozilla/nsIDOMHTMLSelectElement.h
 include/mozilla/nsIDOMHTMLStyleElement.h
-include/mozilla/nsIDOMHTMLTableCaptionElement.h
+include/mozilla/nsIDOMHTMLTableCaptionElem.h
 include/mozilla/nsIDOMHTMLTableCellElement.h
 include/mozilla/nsIDOMHTMLTableColElement.h
 include/mozilla/nsIDOMHTMLTableElement.h
 include/mozilla/nsIDOMHTMLTableRowElement.h
-include/mozilla/nsIDOMHTMLTableSectionElement.h
+include/mozilla/nsIDOMHTMLTableSectionElem.h
 include/mozilla/nsIDOMHTMLTextAreaElement.h
 include/mozilla/nsIDOMHTMLTitleElement.h
 include/mozilla/nsIDOMHTMLUListElement.h
 include/mozilla/nsIDOMHistory.h
-include/mozilla/nsIDOMImage.h
 include/mozilla/nsIDOMInstallTriggerGlobal.h
 include/mozilla/nsIDOMInstallVersion.h
+include/mozilla/nsIDOMJSWindow.h
 include/mozilla/nsIDOMKeyEvent.h
 include/mozilla/nsIDOMKeyListener.h
 include/mozilla/nsIDOMLinkStyle.h
@@ -541,21 +556,23 @@ include/mozilla/nsIDOMNSHTMLAnchorElement.h
 include/mozilla/nsIDOMNSHTMLAreaElement.h
 include/mozilla/nsIDOMNSHTMLButtonElement.h
 include/mozilla/nsIDOMNSHTMLDocument.h
+include/mozilla/nsIDOMNSHTMLElement.h
+include/mozilla/nsIDOMNSHTMLFormControlList.h
 include/mozilla/nsIDOMNSHTMLFormElement.h
+include/mozilla/nsIDOMNSHTMLImageElement.h
 include/mozilla/nsIDOMNSHTMLInputElement.h
-include/mozilla/nsIDOMNSHTMLOptionCollection.h
+include/mozilla/nsIDOMNSHTMLOptionCollectn.h
 include/mozilla/nsIDOMNSHTMLSelectElement.h
 include/mozilla/nsIDOMNSHTMLTextAreaElement.h
+include/mozilla/nsIDOMNSHistory.h
 include/mozilla/nsIDOMNSLocation.h
 include/mozilla/nsIDOMNSRange.h
 include/mozilla/nsIDOMNSUIEvent.h
 include/mozilla/nsIDOMNamedNodeMap.h
-include/mozilla/nsIDOMNativeObjectRegistry.h
 include/mozilla/nsIDOMNavigator.h
 include/mozilla/nsIDOMNode.h
 include/mozilla/nsIDOMNodeList.h
 include/mozilla/nsIDOMNotation.h
-include/mozilla/nsIDOMOption.h
 include/mozilla/nsIDOMPaintListener.h
 include/mozilla/nsIDOMParser.h
 include/mozilla/nsIDOMPkcs11.h
@@ -577,7 +594,6 @@ include/mozilla/nsIDOMUIEvent.h
 include/mozilla/nsIDOMViewCSS.h
 include/mozilla/nsIDOMWindow.h
 include/mozilla/nsIDOMWindowCollection.h
-include/mozilla/nsIDOMWindowEventOwner.h
 include/mozilla/nsIDOMWindowInternal.h
 include/mozilla/nsIDOMXPConnectFactory.h
 include/mozilla/nsIDOMXULCommandDispatcher.h
@@ -597,6 +613,7 @@ include/mozilla/nsIDialogParamBlock.h
 include/mozilla/nsIDictionary.h
 include/mozilla/nsIDirectoryService.h
 include/mozilla/nsIDiskDocument.h
+include/mozilla/nsIDocCharset.h
 include/mozilla/nsIDocShell.h
 include/mozilla/nsIDocShellHistory.h
 include/mozilla/nsIDocShellLoadInfo.h
@@ -610,7 +627,6 @@ include/mozilla/nsIDocumentContainer.h
 include/mozilla/nsIDocumentEncoder.h
 include/mozilla/nsIDocumentLoader.h
 include/mozilla/nsIDocumentLoaderFactory.h
-include/mozilla/nsIDocumentLoaderObserver.h
 include/mozilla/nsIDocumentObserver.h
 include/mozilla/nsIDocumentStateListener.h
 include/mozilla/nsIDocumentTransformer.h
@@ -649,6 +665,8 @@ include/mozilla/nsIEventListenerManager.h
 include/mozilla/nsIEventQueue.h
 include/mozilla/nsIEventQueueService.h
 include/mozilla/nsIEventStateManager.h
+include/mozilla/nsIException.h
+include/mozilla/nsIExceptionService.h
 include/mozilla/nsIExpatTokenizer.h
 include/mozilla/nsIExternalHelperAppService.h
 include/mozilla/nsIExternalProtocolService.h
@@ -656,7 +674,6 @@ include/mozilla/nsIFTPChannel.h
 include/mozilla/nsIFactory.h
 include/mozilla/nsIFile.h
 include/mozilla/nsIFileChannel.h
-include/mozilla/nsIFileLocator.h
 include/mozilla/nsIFilePicker.h
 include/mozilla/nsIFileSpec.h
 include/mozilla/nsIFileSpecWithUI.h
@@ -667,11 +684,13 @@ include/mozilla/nsIFileUtilities.h
 include/mozilla/nsIFileWidget.h
 include/mozilla/nsIFindAndReplace.h
 include/mozilla/nsIFindComponent.h
+include/mozilla/nsIFindService.h
 include/mozilla/nsIFocusController.h
 include/mozilla/nsIFocusTracker.h
 include/mozilla/nsIFolder.h
 include/mozilla/nsIFolderListener.h
 include/mozilla/nsIFontEnumerator.h
+include/mozilla/nsIFontList.h
 include/mozilla/nsIFontMetrics.h
 include/mozilla/nsIFontNameIterator.h
 include/mozilla/nsIFontPackageHandler.h
@@ -709,15 +728,15 @@ include/mozilla/nsIHTMLStyleSheet.h
 include/mozilla/nsIHTMLTableCellElement.h
 include/mozilla/nsIHTMLTableColElement.h
 include/mozilla/nsIHTMLToTextSink.h
-include/mozilla/nsIHTTPChannel.h
-include/mozilla/nsIHTTPEventSink.h
-include/mozilla/nsIHTTPHeader.h
 include/mozilla/nsIHTTPHeaderListener.h
 include/mozilla/nsIHTTPIndex.h
-include/mozilla/nsIHTTPProtocolHandler.h
 include/mozilla/nsIHelperAppLauncherDialog.h
 include/mozilla/nsIHistoryEntry.h
+include/mozilla/nsIHttpAuthenticator.h
+include/mozilla/nsIHttpChannel.h
+include/mozilla/nsIHttpEventSink.h
 include/mozilla/nsIHttpNotify.h
+include/mozilla/nsIHttpProtocolHandler.h
 include/mozilla/nsIID.h
 include/mozilla/nsIIFrameBoxObject.h
 include/mozilla/nsIIMAPHostSessionList.h
@@ -766,11 +785,11 @@ include/mozilla/nsIJARURI.h
 include/mozilla/nsIJRILiveConnectPlugInstPeer.h
 include/mozilla/nsIJRILiveConnectPlugin.h
 include/mozilla/nsIJRIPlugin.h
+include/mozilla/nsIJSConsoleService.h
 include/mozilla/nsIJSContextStack.h
 include/mozilla/nsIJSEventListener.h
 include/mozilla/nsIJSNativeInitializer.h
 include/mozilla/nsIJSRuntimeService.h
-include/mozilla/nsIJSScriptObject.h
 include/mozilla/nsIJVMConsole.h
 include/mozilla/nsIJVMManager.h
 include/mozilla/nsIJVMPlugin.h
@@ -780,12 +799,14 @@ include/mozilla/nsIJVMPrefsWindow.h
 include/mozilla/nsIJVMWindow.h
 include/mozilla/nsIKBStateControl.h
 include/mozilla/nsIKeyedStreamGenerator.h
+include/mozilla/nsILDAPAutoCompleteSession.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/nsILDAPService.h
 include/mozilla/nsILDAPURL.h
 include/mozilla/nsILabel.h
 include/mozilla/nsILanguageAtom.h
@@ -858,7 +879,7 @@ include/mozilla/nsIMsgBiffManager.h
 include/mozilla/nsIMsgCompFields.h
 include/mozilla/nsIMsgCompose.h
 include/mozilla/nsIMsgComposeParams.h
-include/mozilla/nsIMsgComposeProgress.h
+include/mozilla/nsIMsgComposeProgressParams.h
 include/mozilla/nsIMsgComposeService.h
 include/mozilla/nsIMsgCopyService.h
 include/mozilla/nsIMsgCopyServiceListener.h
@@ -891,6 +912,7 @@ include/mozilla/nsIMsgOfflineManager.h
 include/mozilla/nsIMsgOfflineNewsState.h
 include/mozilla/nsIMsgParseMailMsgState.h
 include/mozilla/nsIMsgPrintEngine.h
+include/mozilla/nsIMsgProgress.h
 include/mozilla/nsIMsgProtocolInfo.h
 include/mozilla/nsIMsgQuote.h
 include/mozilla/nsIMsgRDFDataSource.h
@@ -913,13 +935,11 @@ include/mozilla/nsIMsgStringService.h
 include/mozilla/nsIMsgThread.h
 include/mozilla/nsIMsgVCard.h
 include/mozilla/nsIMsgWindow.h
-include/mozilla/nsIMutableAccessible.h
 include/mozilla/nsIMutableStyleContext.h
 include/mozilla/nsINNTPArticleList.h
 include/mozilla/nsINNTPNewsgroupList.h
 include/mozilla/nsINNTPNewsgroupPost.h
 include/mozilla/nsINNTPProtocol.h
-include/mozilla/nsINSEvent.h
 include/mozilla/nsINSSDialogs.h
 include/mozilla/nsINameSpace.h
 include/mozilla/nsINameSpaceManager.h
@@ -976,6 +996,7 @@ include/mozilla/nsIPluginManager2.h
 include/mozilla/nsIPluginStream.h
 include/mozilla/nsIPluginStreamInfo.h
 include/mozilla/nsIPluginStreamListener.h
+include/mozilla/nsIPluginStreamListener2.h
 include/mozilla/nsIPluginStreamPeer.h
 include/mozilla/nsIPluginStreamPeer2.h
 include/mozilla/nsIPluginTagInfo.h
@@ -989,8 +1010,12 @@ include/mozilla/nsIPopupSetBoxObject.h
 include/mozilla/nsIPopupSetFrame.h
 include/mozilla/nsIPosixLocale.h
 include/mozilla/nsIPref.h
+include/mozilla/nsIPrefBranch.h
+include/mozilla/nsIPrefBranchInternal.h
+include/mozilla/nsIPrefLocalizedString.h
 include/mozilla/nsIPrefMigration.h
 include/mozilla/nsIPrefMigrationProgress.h
+include/mozilla/nsIPrefService.h
 include/mozilla/nsIPresContext.h
 include/mozilla/nsIPresShell.h
 include/mozilla/nsIPresState.h
@@ -1008,6 +1033,7 @@ include/mozilla/nsIProfile.h
 include/mozilla/nsIProfileChangeStatus.h
 include/mozilla/nsIProfileInternal.h
 include/mozilla/nsIProfileStartupListener.h
+include/mozilla/nsIProgrammingLanguage.h
 include/mozilla/nsIProgressEventSink.h
 include/mozilla/nsIPrompt.h
 include/mozilla/nsIPromptService.h
@@ -1035,10 +1061,13 @@ include/mozilla/nsIRDFPurgeableDataSource.h
 include/mozilla/nsIRDFRemoteDataSource.h
 include/mozilla/nsIRDFResource.h
 include/mozilla/nsIRDFService.h
+include/mozilla/nsIRDFXMLParser.h
+include/mozilla/nsIRDFXMLSerializer.h
 include/mozilla/nsIRDFXMLSink.h
 include/mozilla/nsIRDFXMLSource.h
 include/mozilla/nsIRadioButton.h
 include/mozilla/nsIRadioControlFrame.h
+include/mozilla/nsIRangeUtils.h
 include/mozilla/nsIReflowCallback.h
 include/mozilla/nsIReflowCommand.h
 include/mozilla/nsIRefreshURI.h
@@ -1066,6 +1095,7 @@ include/mozilla/nsISOCKSSocketInfo.h
 include/mozilla/nsISOCKSSocketProvider.h
 include/mozilla/nsISSLSocketControl.h
 include/mozilla/nsISSLSocketProvider.h
+include/mozilla/nsISSLStatus.h
 include/mozilla/nsISVGFrame.h
 include/mozilla/nsISample.h
 include/mozilla/nsISaveAsCharset.h
@@ -1073,14 +1103,17 @@ include/mozilla/nsIScreen.h
 include/mozilla/nsIScreenManager.h
 include/mozilla/nsIScriptContext.h
 include/mozilla/nsIScriptContextOwner.h
+include/mozilla/nsIScriptElement.h
 include/mozilla/nsIScriptError.h
 include/mozilla/nsIScriptEventListener.h
 include/mozilla/nsIScriptExternalNameSet.h
 include/mozilla/nsIScriptGlobalObject.h
 include/mozilla/nsIScriptGlobalObjectOwner.h
-include/mozilla/nsIScriptNameSetRegistry.h
+include/mozilla/nsIScriptLoader.h
+include/mozilla/nsIScriptLoaderObserver.h
 include/mozilla/nsIScriptNameSpaceManager.h
 include/mozilla/nsIScriptObjectOwner.h
+include/mozilla/nsIScriptObjectPrincipal.h
 include/mozilla/nsIScriptSecurityManager.h
 include/mozilla/nsIScriptableDateFormat.h
 include/mozilla/nsIScriptableInputStream.h
@@ -1161,6 +1194,7 @@ include/mozilla/nsISupportsPrimitives.h
 include/mozilla/nsISupportsUtils.h
 include/mozilla/nsISymantecDebugManager.h
 include/mozilla/nsISymantecDebugger.h
+include/mozilla/nsISyncLoader.h
 include/mozilla/nsITXTToHTMLConv.h
 include/mozilla/nsITableCellLayout.h
 include/mozilla/nsITableEditor.h
@@ -1168,6 +1202,7 @@ include/mozilla/nsITableLayout.h
 include/mozilla/nsITestProxy.h
 include/mozilla/nsITextAreaWidget.h
 include/mozilla/nsITextContent.h
+include/mozilla/nsITextFrame.h
 include/mozilla/nsITextScroll.h
 include/mozilla/nsITextService.h
 include/mozilla/nsITextServicesDocument.h
@@ -1212,7 +1247,6 @@ include/mozilla/nsIUnicodeDecodeHelper.h
 include/mozilla/nsIUnicodeDecoder.h
 include/mozilla/nsIUnicodeEncodeHelper.h
 include/mozilla/nsIUnicodeEncoder.h
-include/mozilla/nsIUnkContentTypeHandler.h
 include/mozilla/nsIUrlListener.h
 include/mozilla/nsIUrlListenerManager.h
 include/mozilla/nsIUrlbarHistory.h
@@ -1268,6 +1302,7 @@ include/mozilla/nsIXPCSecurityManager.h
 include/mozilla/nsIXPConnect.h
 include/mozilla/nsIXPINotifier.h
 include/mozilla/nsIXPIProgressDlg.h
+include/mozilla/nsIXPathNodeSelector.h
 include/mozilla/nsIXRemoteClient.h
 include/mozilla/nsIXULBrowserWindow.h
 include/mozilla/nsIXULContent.h
@@ -1299,7 +1334,6 @@ include/mozilla/nsImgDCallbk.h
 include/mozilla/nsInt64.h
 include/mozilla/nsJSPrincipals.h
 include/mozilla/nsJSProtocolHandler.h
-include/mozilla/nsJSUtils.h
 include/mozilla/nsJVMManager.h
 include/mozilla/nsJVMPluginTagInfo.h
 include/mozilla/nsLDAP.h
@@ -1313,7 +1347,6 @@ include/mozilla/nsLocalFile.h
 include/mozilla/nsLocalFileUnix.h
 include/mozilla/nsLocalFolderSummarySpec.h
 include/mozilla/nsLocalMailFolder.h
-include/mozilla/nsLocalString.h
 include/mozilla/nsLocalStringBundle.h
 include/mozilla/nsLocaleCID.h
 include/mozilla/nsLocaleFactory.h
@@ -1357,7 +1390,7 @@ include/mozilla/nsMsgCompUtils.h
 include/mozilla/nsMsgCompose.h
 include/mozilla/nsMsgComposeContentHandler.h
 include/mozilla/nsMsgComposeParams.h
-include/mozilla/nsMsgComposeProgress.h
+include/mozilla/nsMsgComposeProgressParams.h
 include/mozilla/nsMsgComposeService.h
 include/mozilla/nsMsgComposeStringBundle.h
 include/mozilla/nsMsgCopy.h
@@ -1396,6 +1429,7 @@ include/mozilla/nsMsgMimeCID.h
 include/mozilla/nsMsgNewsCID.h
 include/mozilla/nsMsgNotificationManager.h
 include/mozilla/nsMsgPrintEngine.h
+include/mozilla/nsMsgProgress.h
 include/mozilla/nsMsgPrompts.h
 include/mozilla/nsMsgProtocol.h
 include/mozilla/nsMsgQuote.h
@@ -1416,6 +1450,7 @@ include/mozilla/nsMsgServiceProvider.h
 include/mozilla/nsMsgStatusFeedback.h
 include/mozilla/nsMsgThread.h
 include/mozilla/nsMsgTxn.h
+include/mozilla/nsMsgUtf7Utils.h
 include/mozilla/nsMsgUtils.h
 include/mozilla/nsMsgWindow.h
 include/mozilla/nsMutationEvent.h
@@ -1467,9 +1502,7 @@ 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
@@ -1482,6 +1515,7 @@ include/mozilla/nsRepeater.h
 include/mozilla/nsRepository.h
 include/mozilla/nsScriptSecurityManager.h
 include/mozilla/nsScriptableInputStream.h
+include/mozilla/nsSharableString.h
 include/mozilla/nsSharedBufferList.h
 include/mozilla/nsSize.h
 include/mozilla/nsSlidingString.h
@@ -1522,6 +1556,7 @@ include/mozilla/nsSystemPrincipal.h
 include/mozilla/nsTextFormatter.h
 include/mozilla/nsTextFragment.h
 include/mozilla/nsTextServicesCID.h
+include/mozilla/nsTextTransformer.h
 include/mozilla/nsTime.h
 include/mozilla/nsTimeBomb.h
 include/mozilla/nsTimer.h
@@ -1686,6 +1721,7 @@ include/mozilla/xp_mem.h
 include/mozilla/xp_obs.h
 include/mozilla/xp_path.h
 include/mozilla/xp_str.h
+include/mozilla/xpc_map_end.h
 include/mozilla/xpccomponents.h
 include/mozilla/xpcexception.h
 include/mozilla/xpcjsid.h
@@ -1707,7 +1743,6 @@ include/mozilla/xptcall.h
 include/mozilla/xptcstubsdecl.inc
 include/mozilla/xptcstubsdef.inc
 include/mozilla/xptinfo.h
-include/mozilla/xulstubs.h
 include/mozilla/zip.h
 include/mozilla/zipfile.h
 include/mozilla/zipstub.h