6 files changed, 87 insertions, 6 deletions

diff --git a/www/mozilla-embedded-devel/pkg-plist b/www/mozilla-embedded-devel/pkg-plist
index d6800c302471..ab4004741cfd 100644
--- a/www/mozilla-embedded-devel/pkg-plist
+++ b/www/mozilla-embedded-devel/pkg-plist
@@ -1,8 +1,13 @@
+lib/mozilla-embedded/TestGtkEmbed
 lib/mozilla-embedded/chrome/all-locales.rdf
 lib/mozilla-embedded/chrome/all-packages.rdf
 lib/mozilla-embedded/chrome/all-skins.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
+lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
+lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
+lib/mozilla-embedded/chrome/pipnss.jar
+lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/chrome/user-locales.rdf
 lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
@@ -60,6 +65,8 @@ lib/mozilla-embedded/components/libnsgif.so
 lib/mozilla-embedded/components/libnsjpg.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libnspng.so
+lib/mozilla-embedded/components/libpipnss.so
+lib/mozilla-embedded/components/libpippki.so
 lib/mozilla-embedded/components/libpref.so
 lib/mozilla-embedded/components/libprofile.so
 lib/mozilla-embedded/components/librdf.so
@@ -85,6 +92,8 @@ lib/mozilla-embedded/components/necko_http.xpt
 lib/mozilla-embedded/components/necko_jar.xpt
 lib/mozilla-embedded/components/necko_res.xpt
 lib/mozilla-embedded/components/necko_strconv.xpt
+lib/mozilla-embedded/components/pipnss.xpt
+lib/mozilla-embedded/components/pippki.xpt
 lib/mozilla-embedded/components/pref.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
@@ -107,6 +116,7 @@ lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
+lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
@@ -137,5 +147,10 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/defaults/pref
 @dirrm lib/mozilla-embedded/defaults
 @dirrm lib/mozilla-embedded/components
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo
 @dirrm lib/mozilla-embedded/chrome
 @dirrm lib/mozilla-embedded
diff --git a/www/mozilla-embedded-vendor/pkg-plist b/www/mozilla-embedded-vendor/pkg-plist
index d6800c302471..ab4004741cfd 100644
--- a/www/mozilla-embedded-vendor/pkg-plist
+++ b/www/mozilla-embedded-vendor/pkg-plist
@@ -1,8 +1,13 @@
+lib/mozilla-embedded/TestGtkEmbed
 lib/mozilla-embedded/chrome/all-locales.rdf
 lib/mozilla-embedded/chrome/all-packages.rdf
 lib/mozilla-embedded/chrome/all-skins.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
+lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
+lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
+lib/mozilla-embedded/chrome/pipnss.jar
+lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/chrome/user-locales.rdf
 lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
@@ -60,6 +65,8 @@ lib/mozilla-embedded/components/libnsgif.so
 lib/mozilla-embedded/components/libnsjpg.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libnspng.so
+lib/mozilla-embedded/components/libpipnss.so
+lib/mozilla-embedded/components/libpippki.so
 lib/mozilla-embedded/components/libpref.so
 lib/mozilla-embedded/components/libprofile.so
 lib/mozilla-embedded/components/librdf.so
@@ -85,6 +92,8 @@ lib/mozilla-embedded/components/necko_http.xpt
 lib/mozilla-embedded/components/necko_jar.xpt
 lib/mozilla-embedded/components/necko_res.xpt
 lib/mozilla-embedded/components/necko_strconv.xpt
+lib/mozilla-embedded/components/pipnss.xpt
+lib/mozilla-embedded/components/pippki.xpt
 lib/mozilla-embedded/components/pref.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
@@ -107,6 +116,7 @@ lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
+lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
@@ -137,5 +147,10 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/defaults/pref
 @dirrm lib/mozilla-embedded/defaults
 @dirrm lib/mozilla-embedded/components
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo
 @dirrm lib/mozilla-embedded/chrome
 @dirrm lib/mozilla-embedded
diff --git a/www/mozilla-embedded/pkg-plist b/www/mozilla-embedded/pkg-plist
index d6800c302471..ab4004741cfd 100644
--- a/www/mozilla-embedded/pkg-plist
+++ b/www/mozilla-embedded/pkg-plist
@@ -1,8 +1,13 @@
+lib/mozilla-embedded/TestGtkEmbed
 lib/mozilla-embedded/chrome/all-locales.rdf
 lib/mozilla-embedded/chrome/all-packages.rdf
 lib/mozilla-embedded/chrome/all-skins.rdf
 lib/mozilla-embedded/chrome/embed.jar
 lib/mozilla-embedded/chrome/installed-chrome.txt
+lib/mozilla-embedded/chrome/overlayinfo/communicator/content/overlays.rdf
+lib/mozilla-embedded/chrome/overlayinfo/navigator/content/overlays.rdf
+lib/mozilla-embedded/chrome/pipnss.jar
+lib/mozilla-embedded/chrome/pippki.jar
 lib/mozilla-embedded/chrome/user-locales.rdf
 lib/mozilla-embedded/chrome/user-skins.rdf
 lib/mozilla-embedded/component.reg
@@ -60,6 +65,8 @@ lib/mozilla-embedded/components/libnsgif.so
 lib/mozilla-embedded/components/libnsjpg.so
 lib/mozilla-embedded/components/libnslocale.so
 lib/mozilla-embedded/components/libnspng.so
+lib/mozilla-embedded/components/libpipnss.so
+lib/mozilla-embedded/components/libpippki.so
 lib/mozilla-embedded/components/libpref.so
 lib/mozilla-embedded/components/libprofile.so
 lib/mozilla-embedded/components/librdf.so
@@ -85,6 +92,8 @@ lib/mozilla-embedded/components/necko_http.xpt
 lib/mozilla-embedded/components/necko_jar.xpt
 lib/mozilla-embedded/components/necko_res.xpt
 lib/mozilla-embedded/components/necko_strconv.xpt
+lib/mozilla-embedded/components/pipnss.xpt
+lib/mozilla-embedded/components/pippki.xpt
 lib/mozilla-embedded/components/pref.xpt
 lib/mozilla-embedded/components/profile.xpt
 lib/mozilla-embedded/components/rdf.xpt
@@ -107,6 +116,7 @@ lib/mozilla-embedded/components/xpti.dat
 lib/mozilla-embedded/components/xptitemp.dat
 lib/mozilla-embedded/defaults/pref/all.js
 lib/mozilla-embedded/defaults/pref/initpref.js
+lib/mozilla-embedded/defaults/pref/security-prefs.js
 lib/mozilla-embedded/defaults/pref/unix.js
 lib/mozilla-embedded/gtkEmbed
 lib/mozilla-embedded/libgkgfx.so
@@ -137,5 +147,10 @@ lib/mozilla-embedded/run-mozilla.sh
 @dirrm lib/mozilla-embedded/defaults/pref
 @dirrm lib/mozilla-embedded/defaults
 @dirrm lib/mozilla-embedded/components
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/navigator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator/content
+@dirrm lib/mozilla-embedded/chrome/overlayinfo/communicator
+@dirrm lib/mozilla-embedded/chrome/overlayinfo
 @dirrm lib/mozilla-embedded/chrome
 @dirrm lib/mozilla-embedded
diff --git a/www/mozilla-headers-devel/pkg-plist b/www/mozilla-headers-devel/pkg-plist
index e799eaf54367..8da46170eb65 100644
--- a/www/mozilla-headers-devel/pkg-plist
+++ b/www/mozilla-headers-devel/pkg-plist
@@ -47,6 +47,7 @@ include/mozilla/imgIDecoder.h
 include/mozilla/imgIDecoderObserver.h
 include/mozilla/imgILoader.h
 include/mozilla/imgIRequest.h
+include/mozilla/imgScaler.h
 include/mozilla/interpreter.h
 include/mozilla/javaString.h
 include/mozilla/javaThreads.h
@@ -234,7 +235,7 @@ include/mozilla/nsEmitterUtils.h
 include/mozilla/nsEnumeratorUtils.h
 include/mozilla/nsError.h
 include/mozilla/nsEscape.h
-include/mozilla/nsExpatDTD.h
+include/mozilla/nsEvent.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
 include/mozilla/nsFileSpec.h
@@ -285,8 +286,10 @@ include/mozilla/nsIAboutModule.h
 include/mozilla/nsIAcceptLang.h
 include/mozilla/nsIAccessibilityService.h
 include/mozilla/nsIAccessible.h
+include/mozilla/nsIAccessibleDocument.h
 include/mozilla/nsIAccessibleEventListener.h
 include/mozilla/nsIAccessibleEventReceiver.h
+include/mozilla/nsIAccessibleSelectable.h
 include/mozilla/nsIAddbookUrl.h
 include/mozilla/nsIAddrBookSession.h
 include/mozilla/nsIAddrDBAnnouncer.h
@@ -460,6 +463,7 @@ include/mozilla/nsIDOMDocumentEvent.h
 include/mozilla/nsIDOMDocumentFragment.h
 include/mozilla/nsIDOMDocumentRange.h
 include/mozilla/nsIDOMDocumentStyle.h
+include/mozilla/nsIDOMDocumentTraversal.h
 include/mozilla/nsIDOMDocumentType.h
 include/mozilla/nsIDOMDocumentView.h
 include/mozilla/nsIDOMDocumentXBL.h
@@ -569,6 +573,8 @@ include/mozilla/nsIDOMNSUIEvent.h
 include/mozilla/nsIDOMNamedNodeMap.h
 include/mozilla/nsIDOMNavigator.h
 include/mozilla/nsIDOMNode.h
+include/mozilla/nsIDOMNodeFilter.h
+include/mozilla/nsIDOMNodeIterator.h
 include/mozilla/nsIDOMNodeList.h
 include/mozilla/nsIDOMNotation.h
 include/mozilla/nsIDOMPaintListener.h
@@ -588,6 +594,7 @@ include/mozilla/nsIDOMStyleSheet.h
 include/mozilla/nsIDOMStyleSheetList.h
 include/mozilla/nsIDOMText.h
 include/mozilla/nsIDOMTextListener.h
+include/mozilla/nsIDOMTreeWalker.h
 include/mozilla/nsIDOMUIEvent.h
 include/mozilla/nsIDOMViewCSS.h
 include/mozilla/nsIDOMWindow.h
@@ -816,6 +823,7 @@ include/mozilla/nsILayoutDebugger.h
 include/mozilla/nsILayoutHistoryState.h
 include/mozilla/nsILineBreaker.h
 include/mozilla/nsILineBreakerFactory.h
+include/mozilla/nsILineInputStream.h
 include/mozilla/nsILineIterator.h
 include/mozilla/nsILinearIterator.h
 include/mozilla/nsILink.h
@@ -1095,6 +1103,8 @@ include/mozilla/nsISHTransaction.h
 include/mozilla/nsISHistory.h
 include/mozilla/nsISHistoryInternal.h
 include/mozilla/nsISHistoryListener.h
+include/mozilla/nsISOCKS4SocketInfo.h
+include/mozilla/nsISOCKS4SocketProvider.h
 include/mozilla/nsISOCKSSocketInfo.h
 include/mozilla/nsISOCKSSocketProvider.h
 include/mozilla/nsISSLSocketControl.h
@@ -1512,11 +1522,13 @@ include/mozilla/nsProxyEvent.h
 include/mozilla/nsQuickSort.h
 include/mozilla/nsRDFCID.h
 include/mozilla/nsRDFResource.h
+include/mozilla/nsReadLine.h
 include/mozilla/nsReadableUtils.h
 include/mozilla/nsRect.h
 include/mozilla/nsRenderingContextImpl.h
 include/mozilla/nsRepeater.h
 include/mozilla/nsRepository.h
+include/mozilla/nsRootAccessible.h
 include/mozilla/nsScriptSecurityManager.h
 include/mozilla/nsScriptableInputStream.h
 include/mozilla/nsSharableString.h
@@ -1540,6 +1552,7 @@ include/mozilla/nsStr.h
 include/mozilla/nsStreamConverter.h
 include/mozilla/nsString.h
 include/mozilla/nsString2.h
+include/mozilla/nsStringDefines.h
 include/mozilla/nsStringFragment.h
 include/mozilla/nsStringFwd.h
 include/mozilla/nsStringIO.h
@@ -1719,7 +1732,6 @@ include/mozilla/typedefs.h
 include/mozilla/typedefs_md.h
 include/mozilla/uconvutil.h
 include/mozilla/winfile.h
-include/mozilla/xlibrgb.h
 include/mozilla/xmlparse.h
 include/mozilla/xp_core.h
 include/mozilla/xp_file.h
diff --git a/www/mozilla-headers-vendor/pkg-plist b/www/mozilla-headers-vendor/pkg-plist
index e799eaf54367..8da46170eb65 100644
--- a/www/mozilla-headers-vendor/pkg-plist
+++ b/www/mozilla-headers-vendor/pkg-plist
@@ -47,6 +47,7 @@ include/mozilla/imgIDecoder.h
 include/mozilla/imgIDecoderObserver.h
 include/mozilla/imgILoader.h
 include/mozilla/imgIRequest.h
+include/mozilla/imgScaler.h
 include/mozilla/interpreter.h
 include/mozilla/javaString.h
 include/mozilla/javaThreads.h
@@ -234,7 +235,7 @@ include/mozilla/nsEmitterUtils.h
 include/mozilla/nsEnumeratorUtils.h
 include/mozilla/nsError.h
 include/mozilla/nsEscape.h
-include/mozilla/nsExpatDTD.h
+include/mozilla/nsEvent.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
 include/mozilla/nsFileSpec.h
@@ -285,8 +286,10 @@ include/mozilla/nsIAboutModule.h
 include/mozilla/nsIAcceptLang.h
 include/mozilla/nsIAccessibilityService.h
 include/mozilla/nsIAccessible.h
+include/mozilla/nsIAccessibleDocument.h
 include/mozilla/nsIAccessibleEventListener.h
 include/mozilla/nsIAccessibleEventReceiver.h
+include/mozilla/nsIAccessibleSelectable.h
 include/mozilla/nsIAddbookUrl.h
 include/mozilla/nsIAddrBookSession.h
 include/mozilla/nsIAddrDBAnnouncer.h
@@ -460,6 +463,7 @@ include/mozilla/nsIDOMDocumentEvent.h
 include/mozilla/nsIDOMDocumentFragment.h
 include/mozilla/nsIDOMDocumentRange.h
 include/mozilla/nsIDOMDocumentStyle.h
+include/mozilla/nsIDOMDocumentTraversal.h
 include/mozilla/nsIDOMDocumentType.h
 include/mozilla/nsIDOMDocumentView.h
 include/mozilla/nsIDOMDocumentXBL.h
@@ -569,6 +573,8 @@ include/mozilla/nsIDOMNSUIEvent.h
 include/mozilla/nsIDOMNamedNodeMap.h
 include/mozilla/nsIDOMNavigator.h
 include/mozilla/nsIDOMNode.h
+include/mozilla/nsIDOMNodeFilter.h
+include/mozilla/nsIDOMNodeIterator.h
 include/mozilla/nsIDOMNodeList.h
 include/mozilla/nsIDOMNotation.h
 include/mozilla/nsIDOMPaintListener.h
@@ -588,6 +594,7 @@ include/mozilla/nsIDOMStyleSheet.h
 include/mozilla/nsIDOMStyleSheetList.h
 include/mozilla/nsIDOMText.h
 include/mozilla/nsIDOMTextListener.h
+include/mozilla/nsIDOMTreeWalker.h
 include/mozilla/nsIDOMUIEvent.h
 include/mozilla/nsIDOMViewCSS.h
 include/mozilla/nsIDOMWindow.h
@@ -816,6 +823,7 @@ include/mozilla/nsILayoutDebugger.h
 include/mozilla/nsILayoutHistoryState.h
 include/mozilla/nsILineBreaker.h
 include/mozilla/nsILineBreakerFactory.h
+include/mozilla/nsILineInputStream.h
 include/mozilla/nsILineIterator.h
 include/mozilla/nsILinearIterator.h
 include/mozilla/nsILink.h
@@ -1095,6 +1103,8 @@ include/mozilla/nsISHTransaction.h
 include/mozilla/nsISHistory.h
 include/mozilla/nsISHistoryInternal.h
 include/mozilla/nsISHistoryListener.h
+include/mozilla/nsISOCKS4SocketInfo.h
+include/mozilla/nsISOCKS4SocketProvider.h
 include/mozilla/nsISOCKSSocketInfo.h
 include/mozilla/nsISOCKSSocketProvider.h
 include/mozilla/nsISSLSocketControl.h
@@ -1512,11 +1522,13 @@ include/mozilla/nsProxyEvent.h
 include/mozilla/nsQuickSort.h
 include/mozilla/nsRDFCID.h
 include/mozilla/nsRDFResource.h
+include/mozilla/nsReadLine.h
 include/mozilla/nsReadableUtils.h
 include/mozilla/nsRect.h
 include/mozilla/nsRenderingContextImpl.h
 include/mozilla/nsRepeater.h
 include/mozilla/nsRepository.h
+include/mozilla/nsRootAccessible.h
 include/mozilla/nsScriptSecurityManager.h
 include/mozilla/nsScriptableInputStream.h
 include/mozilla/nsSharableString.h
@@ -1540,6 +1552,7 @@ include/mozilla/nsStr.h
 include/mozilla/nsStreamConverter.h
 include/mozilla/nsString.h
 include/mozilla/nsString2.h
+include/mozilla/nsStringDefines.h
 include/mozilla/nsStringFragment.h
 include/mozilla/nsStringFwd.h
 include/mozilla/nsStringIO.h
@@ -1719,7 +1732,6 @@ include/mozilla/typedefs.h
 include/mozilla/typedefs_md.h
 include/mozilla/uconvutil.h
 include/mozilla/winfile.h
-include/mozilla/xlibrgb.h
 include/mozilla/xmlparse.h
 include/mozilla/xp_core.h
 include/mozilla/xp_file.h
diff --git a/www/mozilla-headers/pkg-plist b/www/mozilla-headers/pkg-plist
index e799eaf54367..8da46170eb65 100644
--- a/www/mozilla-headers/pkg-plist
+++ b/www/mozilla-headers/pkg-plist
@@ -47,6 +47,7 @@ include/mozilla/imgIDecoder.h
 include/mozilla/imgIDecoderObserver.h
 include/mozilla/imgILoader.h
 include/mozilla/imgIRequest.h
+include/mozilla/imgScaler.h
 include/mozilla/interpreter.h
 include/mozilla/javaString.h
 include/mozilla/javaThreads.h
@@ -234,7 +235,7 @@ include/mozilla/nsEmitterUtils.h
 include/mozilla/nsEnumeratorUtils.h
 include/mozilla/nsError.h
 include/mozilla/nsEscape.h
-include/mozilla/nsExpatDTD.h
+include/mozilla/nsEvent.h
 include/mozilla/nsExternalHelperAppService.h
 include/mozilla/nsExternalProtocolHandler.h
 include/mozilla/nsFileSpec.h
@@ -285,8 +286,10 @@ include/mozilla/nsIAboutModule.h
 include/mozilla/nsIAcceptLang.h
 include/mozilla/nsIAccessibilityService.h
 include/mozilla/nsIAccessible.h
+include/mozilla/nsIAccessibleDocument.h
 include/mozilla/nsIAccessibleEventListener.h
 include/mozilla/nsIAccessibleEventReceiver.h
+include/mozilla/nsIAccessibleSelectable.h
 include/mozilla/nsIAddbookUrl.h
 include/mozilla/nsIAddrBookSession.h
 include/mozilla/nsIAddrDBAnnouncer.h
@@ -460,6 +463,7 @@ include/mozilla/nsIDOMDocumentEvent.h
 include/mozilla/nsIDOMDocumentFragment.h
 include/mozilla/nsIDOMDocumentRange.h
 include/mozilla/nsIDOMDocumentStyle.h
+include/mozilla/nsIDOMDocumentTraversal.h
 include/mozilla/nsIDOMDocumentType.h
 include/mozilla/nsIDOMDocumentView.h
 include/mozilla/nsIDOMDocumentXBL.h
@@ -569,6 +573,8 @@ include/mozilla/nsIDOMNSUIEvent.h
 include/mozilla/nsIDOMNamedNodeMap.h
 include/mozilla/nsIDOMNavigator.h
 include/mozilla/nsIDOMNode.h
+include/mozilla/nsIDOMNodeFilter.h
+include/mozilla/nsIDOMNodeIterator.h
 include/mozilla/nsIDOMNodeList.h
 include/mozilla/nsIDOMNotation.h
 include/mozilla/nsIDOMPaintListener.h
@@ -588,6 +594,7 @@ include/mozilla/nsIDOMStyleSheet.h
 include/mozilla/nsIDOMStyleSheetList.h
 include/mozilla/nsIDOMText.h
 include/mozilla/nsIDOMTextListener.h
+include/mozilla/nsIDOMTreeWalker.h
 include/mozilla/nsIDOMUIEvent.h
 include/mozilla/nsIDOMViewCSS.h
 include/mozilla/nsIDOMWindow.h
@@ -816,6 +823,7 @@ include/mozilla/nsILayoutDebugger.h
 include/mozilla/nsILayoutHistoryState.h
 include/mozilla/nsILineBreaker.h
 include/mozilla/nsILineBreakerFactory.h
+include/mozilla/nsILineInputStream.h
 include/mozilla/nsILineIterator.h
 include/mozilla/nsILinearIterator.h
 include/mozilla/nsILink.h
@@ -1095,6 +1103,8 @@ include/mozilla/nsISHTransaction.h
 include/mozilla/nsISHistory.h
 include/mozilla/nsISHistoryInternal.h
 include/mozilla/nsISHistoryListener.h
+include/mozilla/nsISOCKS4SocketInfo.h
+include/mozilla/nsISOCKS4SocketProvider.h
 include/mozilla/nsISOCKSSocketInfo.h
 include/mozilla/nsISOCKSSocketProvider.h
 include/mozilla/nsISSLSocketControl.h
@@ -1512,11 +1522,13 @@ include/mozilla/nsProxyEvent.h
 include/mozilla/nsQuickSort.h
 include/mozilla/nsRDFCID.h
 include/mozilla/nsRDFResource.h
+include/mozilla/nsReadLine.h
 include/mozilla/nsReadableUtils.h
 include/mozilla/nsRect.h
 include/mozilla/nsRenderingContextImpl.h
 include/mozilla/nsRepeater.h
 include/mozilla/nsRepository.h
+include/mozilla/nsRootAccessible.h
 include/mozilla/nsScriptSecurityManager.h
 include/mozilla/nsScriptableInputStream.h
 include/mozilla/nsSharableString.h
@@ -1540,6 +1552,7 @@ include/mozilla/nsStr.h
 include/mozilla/nsStreamConverter.h
 include/mozilla/nsString.h
 include/mozilla/nsString2.h
+include/mozilla/nsStringDefines.h
 include/mozilla/nsStringFragment.h
 include/mozilla/nsStringFwd.h
 include/mozilla/nsStringIO.h
@@ -1719,7 +1732,6 @@ include/mozilla/typedefs.h
 include/mozilla/typedefs_md.h
 include/mozilla/uconvutil.h
 include/mozilla/winfile.h
-include/mozilla/xlibrgb.h
 include/mozilla/xmlparse.h
 include/mozilla/xp_core.h
 include/mozilla/xp_file.h