diff --git a/mozilla/dom/macbuild/dom.toc b/mozilla/dom/macbuild/dom.toc
index b163c6a75d2..7a388cb2fd9 100644
--- a/mozilla/dom/macbuild/dom.toc
+++ b/mozilla/dom/macbuild/dom.toc
@@ -4,6 +4,8 @@ mozilla/dom/src/base/nsGlobalWindow.cpp
 mozilla/dom/src/base/nsJSEnvironment.cpp
 mozilla/dom/src/base/nsJSLocation.cpp
 mozilla/dom/src/base/nsJSNavigator.cpp
+mozilla/dom/src/base/nsJSSecurityManager.cpp
+mozilla/dom/src/base/nsJSUtils.cpp
 mozilla/dom/src/base/nsJSWindow.cpp
 mozilla/dom/src/base/nsJSWindowCollection.cpp
 mozilla/dom/src/base/nsLocation.cpp
@@ -28,9 +30,11 @@ mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp
 mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp
 mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp
 mozilla/dom/src/coreDOM/nsJSText.cpp
+mozilla/dom/src/css/nsJSCSS2Properties.cpp
 mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp
 mozilla/dom/src/css/nsJSCSSMediaRule.cpp
 mozilla/dom/src/css/nsJSCSSPageRule.cpp
+mozilla/dom/src/css/nsJSCSSRule.cpp
 mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp
 mozilla/dom/src/css/nsJSCSSStyleRule.cpp
 mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp
diff --git a/mozilla/gfx/macbuild/gfx.toc b/mozilla/gfx/macbuild/gfx.toc
index b167766bc18..edd3f3058be 100644
--- a/mozilla/gfx/macbuild/gfx.toc
+++ b/mozilla/gfx/macbuild/gfx.toc
@@ -1,5 +1,7 @@
 # target: gfxDebug.shlb
 mozilla/gfx/src/mac/nsDeviceContextMac.cpp
+mozilla/gfx/src/mac/nsDeviceContextSpecFactoryM.cpp
+mozilla/gfx/src/mac/nsDeviceContextSpecMac.cpp
 mozilla/gfx/src/mac/nsFontMetricsMac.cpp
 mozilla/gfx/src/mac/nsGfxFactoryMac.cpp
 mozilla/gfx/src/mac/nsImageMac.cpp
diff --git a/mozilla/layout/macbuild/layout.toc b/mozilla/layout/macbuild/layout.toc
index 711ad7f251d..f6e9e7ec6bf 100644
--- a/mozilla/layout/macbuild/layout.toc
+++ b/mozilla/layout/macbuild/layout.toc
@@ -1,11 +1,18 @@
-# target: layout.shlb
+# target: layoutDebug.shlb
 mozilla/layout/base/src/nsContentList.cpp
 mozilla/layout/base/src/nsDocument.cpp
+mozilla/layout/base/src/nsDocumentFragment.cpp
 mozilla/layout/base/src/nsFrameImageLoader.cpp
+mozilla/layout/base/src/nsFrameUtil.cpp
 mozilla/layout/base/src/nsGalleyContext.cpp
 mozilla/layout/base/src/nsGenericElement.cpp
+mozilla/layout/base/src/nsLayoutAtoms.cpp
+mozilla/layout/base/src/nsNameSpaceManager.cpp
 mozilla/layout/base/src/nsPresContext.cpp
+mozilla/layout/base/src/nsPrintContext.cpp
 mozilla/layout/base/src/nsPrintPreviewContext.cpp
+mozilla/layout/base/src/nsRange.cpp
+mozilla/layout/base/src/nsRangeList.cpp
 mozilla/layout/base/src/nsSpaceManager.cpp
 mozilla/layout/base/src/nsStyleContext.cpp
 mozilla/layout/base/src/nsStyleCoord.cpp
@@ -18,9 +25,12 @@ mozilla/layout/events/src/nsDOMEventsIIDs.cpp
 mozilla/layout/events/src/nsEventListenerManager.cpp
 mozilla/layout/events/src/nsEventStateManager.cpp
 mozilla/layout/html/base/src/nsAbsoluteFrame.cpp
+mozilla/layout/html/base/src/nsBlockBandData.cpp
 mozilla/layout/html/base/src/nsBlockFrame.cpp
+mozilla/layout/html/base/src/nsBlockReflowContext.cpp
 mozilla/layout/html/base/src/nsBodyFrame.cpp
 mozilla/layout/html/base/src/nsBRFrame.cpp
+mozilla/layout/html/base/src/nsBulletFrame.cpp
 mozilla/layout/html/base/src/nsContainerFrame.cpp
 mozilla/layout/html/base/src/nsFrame.cpp
 mozilla/layout/html/base/src/nsFrameReflowState.cpp
@@ -36,6 +46,7 @@ mozilla/layout/html/base/src/nsImageMap.cpp
 mozilla/layout/html/base/src/nsInlineFrame.cpp
 mozilla/layout/html/base/src/nsInlineReflow.cpp
 mozilla/layout/html/base/src/nsLeafFrame.cpp
+mozilla/layout/html/base/src/nsLineBox.cpp
 mozilla/layout/html/base/src/nsLineLayout.cpp
 mozilla/layout/html/base/src/nsObjectFrame.cpp
 mozilla/layout/html/base/src/nsPageFrame.cpp
@@ -133,6 +144,7 @@ mozilla/layout/html/forms/src/nsLegendFrame.cpp
 mozilla/layout/html/forms/src/nsRadioControlFrame.cpp
 mozilla/layout/html/forms/src/nsSelectControlFrame.cpp
 mozilla/layout/html/forms/src/nsTextControlFrame.cpp
+mozilla/layout/html/style/src/nsCSSAtoms.cpp
 mozilla/layout/html/style/src/nsCSSDeclaration.cpp
 mozilla/layout/html/style/src/nsCSSKeywords.cpp
 mozilla/layout/html/style/src/nsCSSParser.cpp
diff --git a/mozilla/network/macbuild/network.toc b/mozilla/network/macbuild/network.toc
index 3b892a21204..ed7b524f5e1 100644
--- a/mozilla/network/macbuild/network.toc
+++ b/mozilla/network/macbuild/network.toc
@@ -62,3 +62,4 @@ mozilla/network/protocol/http/mkhttp.c
 mozilla/network/protocol/remote/mkremote.c
 mozilla/network/util/mkreg.c
 mozilla/webshell/tests/viewer/macToBeImplemented.cp
+mozilla/webshell/tests/viewer/nsMacFile.cp
diff --git a/mozilla/widget/macbuild/widget.toc b/mozilla/widget/macbuild/widget.toc
index 94dd998009a..17dbd1f5b43 100644
--- a/mozilla/widget/macbuild/widget.toc
+++ b/mozilla/widget/macbuild/widget.toc
@@ -21,8 +21,15 @@ mozilla/widget/src/mac/nsWidgetFactory.cpp
 mozilla/widget/src/mac/nsWidgetSupport.cpp
 mozilla/widget/src/mac/nsWindow.cpp
 mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+mozilla/widget/src/xpwidgets/nsHTColumn.cpp
+mozilla/widget/src/xpwidgets/nsHTControlStripItem.cpp
+mozilla/widget/src/xpwidgets/nsHTDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTItem.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp
 mozilla/widget/src/xpwidgets/nsImageButton.cpp
 mozilla/widget/src/xpwidgets/nsMenuButton.cpp
 mozilla/widget/src/xpwidgets/nsToolbar.cpp
 mozilla/widget/src/xpwidgets/nsToolbarItemHolder.cpp
 mozilla/widget/src/xpwidgets/nsToolbarManager.cpp
+mozilla/widget/src/xpwidgets/nsTreeView.cpp