diff --git a/mozilla/build/mac/CopyExports.script b/mozilla/build/mac/CopyExports.script
new file mode 100644
index 00000000000..ac61564be48
--- /dev/null
+++ b/mozilla/build/mac/CopyExports.script
@@ -0,0 +1,70 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 1
+	echo "CopyExports requires 1 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	Exit 1
+end if
+
+
+Set SourceList "{SourceRootDir}{1}"
+
+Set ScriptsDir "{SourceRootDir}mozilla:build:mac:"
+
+#set sourceList "{SourceRootDir}mozilla:{1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{SourceList}¶""
+	echo "Scripts directory is ¶"{ScriptsDir}¶""
+end if
+
+#delete -i temp2
+
+#Strip all comment lines, and quote each line
+#streamedit "{sourceList}" -e '/#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""' > temp2
+
+#set debugEcho ""
+#set debugEcho "echo"
+
+for curLine in `streamedit "{sourceList}" -e '/#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
+	
+	if `evaluate "{curLine}" =~ /([Â ¶t]+)¨1[ ¶t]+[:]*(Å)¨2/`
+	
+		if {verbose}
+			echo "Cur line is {curLine}"
+		end if
+	
+		set exportFile "{¨1}"
+		set theTarget "{¨2}"
+		
+		if {verbose}
+			echo "Export file name is {exportFile}"
+			echo "Target directory is {theTarget}"
+		end if
+		
+		"{ScriptsDir}CopyList.script" "{exportFile}" "{theTarget}"
+	
+	end if
+	
+end for
+
+
+#delete -i temp2
diff --git a/mozilla/build/mac/CopyList.script b/mozilla/build/mac/CopyList.script
new file mode 100644
index 00000000000..f04e0c38f17
--- /dev/null
+++ b/mozilla/build/mac/CopyList.script
@@ -0,0 +1,78 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 2
+	echo "CopyList requires 2 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	echo "Parameter 2: path relative to {DestRootDir} of the directory where all the"
+	echo "             files are to be copied.  No initial colons!"
+	echo
+	Exit 1
+end if
+
+set debugEcho "" # This setting will actually duplicate the files
+#set debugEcho "echo" # This setting will merely print the "duplicate" commands.
+
+set sourceList "{SourceRootDir}{1}"
+set targetDir "{DestRootDir}{2}"
+
+# targetDir may not end in a colon for this script to work.
+if `Evaluate "{targetDir}" =~ /(Å)¨1:/`
+	#echo "Removed a colon"
+	set targetDir "{¨1}"
+end if
+
+#Ensure the target hierarchy exists
+# Volume name
+(Evaluate "{TargetDir}" =~ /([Â:]+)¨1:Å/) ·· dev:null
+Set PartialPath "{¨1}"
+Loop
+	(Evaluate "{TargetDir}" =~ /("{PartialPath}":[Â:]+)¨1([:]*)¨2Å/) ·· dev:null
+	Set PartialPath "{¨1}"
+	Set Exit 0
+	(NewFolder "{PartialPath}") ·· dev:null
+	Set Exit 1
+	break if "{¨2}" == ""
+End Loop
+
+#Calculate the source directory by stripping off the leaf name.
+(Evaluate "{SourceList}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set SourceDir "{¨1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{sourceList}¶""
+	echo "Source directory is  ¶"{SourceDir}¶""
+	echo "Target directory is ¶"{targetDir}¶""
+end if
+
+#delete -i temp1
+
+#Strip all comment lines
+#streamedit "{sourceList}" -e '/#Å/ Delete' > temp1
+
+#Strip all comment lines, pipe the stripped lines into this "for" loop:
+for f in `streamedit "{sourceList}" -e '/#Å/ Delete'`
+	if `Newer "{sourceDir}{f}" "{targetDir}:{f}"` #|| !`Exists "{targetDir}:{f}"`
+		if {verbose} ; echo "{sourceDir}{f} is newer than {targetDir}:{f}" ; end if
+		{debugEcho} duplicate -y "{sourceDir}{f}" "{targetDir}"
+	end if
+end for
+
+#delete -i temp1
diff --git a/mozilla/build/mac/DoCopyHeaders b/mozilla/build/mac/DoCopyHeaders
new file mode 100644
index 00000000000..faa4a5e95fa
--- /dev/null
+++ b/mozilla/build/mac/DoCopyHeaders
@@ -0,0 +1,71 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# To execute this script, select everything from "# Get the..." to 
+# " the end" and hit the Enter key.
+# 
+# Known bugs:
+# 	Header files are always copied if the export.mac file contains
+#	non-local paths.
+#	Spurious output is produced even when verbose is off.
+#
+
+# Uncomment this to get some progress information
+# set -e verbose 1
+
+# Get the root of everything
+
+set moz ""
+loop
+	set mozillaDir `GetFileName -d -m "Please select the ÒmozillaÓ directory"`
+	#set SourceRootDir
+	(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/) #·· dev:null
+	set moz "{¨2}"
+	break if "{moz}" == "mozilla"
+	Alert "Sorry, this only works if you select the folder called ÒmozillaÓ."
+end loop
+
+#Calculate the root directory by stripping off the leaf name.
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+# the end
diff --git a/mozilla/build/mac/MacExportListPublic b/mozilla/build/mac/MacExportListPublic
new file mode 100644
index 00000000000..91791e23086
--- /dev/null
+++ b/mozilla/build/mac/MacExportListPublic
@@ -0,0 +1,140 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# This is a list of paths to export.mac files, and destination
+# directories for the copied headers. Destinations are relative
+# to "mozilla:dist".
+
+###################
+# PUBLIC TREE
+###################
+
+#INCLUDE
+mozilla:include:export.mac							:include
+mozilla:cmd:macfe:pch:export.mac					:include
+
+#MAC_COMMON
+mozilla:build:mac:export.mac						:mac:common
+mozilla:lib:mac:NSStdLib:include:export.mac			:mac:common
+mozilla:lib:mac:MacMemoryAllocator:include:export.mac	:mac:common
+mozilla:lib:mac:MoreFiles:export.mac				:mac:common:morefiles
+
+#NSPR
+mozilla:nsprpub:pr:include:export.mac				:nspr
+mozilla:nsprpub:pr:src:md:mac:export.mac			:nspr:mac
+mozilla:nsprpub:lib:ds:export.mac					:nspr
+mozilla:nsprpub:lib:libc:include:export.mac			:nspr
+
+#DBM
+mozilla:dbm:include:export.mac						:dbm
+
+#LIBIMAGE
+mozilla:modules:libimg:png:export.mac				:libimg
+mozilla:modules:libimg:src:export.mac				:libimg
+mozilla:modules:libimg:public:export.mac			:libimg
+
+#SECURITY_freenav
+mozilla:modules:security:freenav:export.mac			:security
+
+#XPCOM
+mozilla:xpcom:src:export.mac						:xpcom
+
+#ZLIB
+mozilla:modules:zlib:src:export.mac					:zlib
+
+#JPEG
+mozilla:jpeg:export.mac								:jpeg
+
+#JSJ
+mozilla:js:jsj:export.mac							:jsj
+
+#JSDEBUG
+mozilla:js:jsd:export.mac							:jsdebug
+
+#JS
+mozilla:js:src:export.mac							:js
+
+#RDF
+mozilla:modules:rdf:include:export.mac				:rdf
+
+#XML
+mozilla:modules:xml:glue:export.mac					:xml
+mozilla:modules:xml:expat:xmlparse:export.mac		:xml
+
+#LIBFONT
+mozilla:modules:libfont:public:export.mac			:libfont
+
+#SCHEDULER
+mozilla:modules:schedulr:public:export.mac			:schedulr
+
+#NETWORK
+mozilla:network:cache:export.mac					:network
+mozilla:network:client:export.mac					:network
+mozilla:network:cnvts:export.mac					:network
+mozilla:network:cstream:export.mac					:network
+mozilla:network:main:export.mac						:network
+mozilla:network:protocol:about:export.mac			:network
+mozilla:network:protocol:certld:export.mac			:network
+mozilla:network:protocol:dataurl:export.mac			:network
+mozilla:network:protocol:file:export.mac			:network
+mozilla:network:protocol:ftp:export.mac				:network
+mozilla:network:protocol:gopher:export.mac			:network
+mozilla:network:protocol:http:export.mac			:network
+mozilla:network:protocol:js:export.mac				:network
+mozilla:network:protocol:mailbox:export.mac			:network
+mozilla:network:protocol:marimba:export.mac			:network
+mozilla:network:protocol:nntp:export.mac			:network
+mozilla:network:protocol:pop3:export.mac			:network
+mozilla:network:protocol:remote:export.mac			:network
+mozilla:network:protocol:smtp:export.mac			:network
+
+#HTML_DIALOGS
+mozilla:lib:htmldlgs:export.mac						:htmldlgs
+
+#LAYOUT
+mozilla:lib:layout:export.mac						:layout
+
+#LAYERS
+mozilla:lib:liblayer:include:export.mac				:layers
+
+#PARSE
+mozilla:lib:libparse:export.mac						:libparse
+
+#STYLE
+mozilla:lib:libstyle:export.mac						:libstyle
+
+#LIBHOOK
+mozilla:modules:libhook:public:export.mac			:libhook
+
+#LIBPREF
+mozilla:modules:libpref:public:export.mac			:libpref
+
+#LIBREG
+mozilla:modules:libreg:include:export.mac			:libreg
+
+#LIBUTIL
+mozilla:modules:libutil:public:export.mac			:libutil
+
+#PROGRESS
+mozilla:modules:progress:public:export.mac			:progress
+
+#SOFTUPDATE
+mozilla:modules:softupdt:include:export.mac			:softupdate
+
+#SUN_JAVA
+mozilla:sun-java:stubs:include:export.mac			:sun-java:include
+mozilla:sun-java:stubs:macjri:export.mac			:sun-java:macjri
diff --git a/mozilla/build/mac/export.mac b/mozilla/build/mac/export.mac
new file mode 100644
index 00000000000..59321d01e16
--- /dev/null
+++ b/mozilla/build/mac/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+IDE_Options.h
+NSCrossProductDefines.h
diff --git a/mozilla/cmd/macfe/pch/export.mac b/mozilla/cmd/macfe/pch/export.mac
new file mode 100644
index 00000000000..ee7016ffab6
--- /dev/null
+++ b/mozilla/cmd/macfe/pch/export.mac
@@ -0,0 +1,18 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+Component_Config.h
+Comm_Config.h
+Comm_DebugConfig.h
+Comm_DebugPrefix.h
+Comm_Defines.h
+Comm_Prefix.h
+Moz_Config.h
+Moz_DebugConfig.h
+Moz_DebugPrefix.h
+Moz_Prefix.h
+Nav_Config.h
+Nav_DebugConfig.h
+Nav_DebugPrefix.h
+Nav_Prefix.h
diff --git a/mozilla/dbm/include/export.mac b/mozilla/dbm/include/export.mac
new file mode 100644
index 00000000000..5626a3e87ff
--- /dev/null
+++ b/mozilla/dbm/include/export.mac
@@ -0,0 +1,17 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+cdefs.h
+extern.h
+hash.h
+hsearch.h
+mcom_db.h
+mpool.h
+ncompat.h
+ndbm.h
+nsres.h
+page.h
+queue.h
+search.h
+watcomfx.h
diff --git a/mozilla/include/export.mac b/mozilla/include/export.mac
new file mode 100644
index 00000000000..513b83a196a
--- /dev/null
+++ b/mozilla/include/export.mac
@@ -0,0 +1,104 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+abcom.h
+abdefn.h
+addrbook.h
+allxpstr.h
+bkmks.h
+cdefs.h
+cgi.h
+client.h
+csid.h
+ctxtfunc.h
+cvactive.h
+dirprefs.h
+ds.h
+dserr.h
+edt.h
+edttypes.h
+fe_proto.h
+fe_rgn.h
+fullsoft.h
+garray.h
+glhist.h
+gui.h
+hotlist.h
+imap.h
+intl_csi.h
+itapefs.h
+libcnv.h
+libc_r.h
+libevent.h
+libi18n.h
+libmime.h
+libmocha.h
+libnet.h
+libstyle.h
+lo_ele.h
+mcom_db.h
+mcom_ndbm.h
+merrors.h
+mime.h
+mimeenc.h
+minicom.h
+mk_cx_fn.h
+msgcom.h
+msgmapi.h
+msgnet.h
+msgtypes.h
+msg_filt.h
+msg_srch.h
+m_cvstrm.h
+ncompat.h
+net.h
+np.h
+npapi.h
+npassoc.h
+nsldap.h
+nslocks.h
+ntos.h
+ntypes.h
+pics.h
+prefetch.h
+proto.h
+pwcacapi.h
+resdef.h
+shist.h
+shistele.h
+shr_str.h
+spellchk.h
+structs.h
+undo.h
+unix-dns.h
+vcc.h
+vobject.h
+winfile.h
+xlate.h
+xp.h
+xpassert.h
+xpgetstr.h
+xplocale.h
+xp_core.h
+xp_debug.h
+xp_error.h
+xp_file.h
+xp_hash.h
+xp_help.h
+xp_list.h
+xp_mcom.h
+xp_md5.h
+xp_mem.h
+xp_mesg.h
+xp_ncent.h
+xp_qsort.h
+xp_reg.h
+xp_rgb.h
+xp_sec.h
+xp_sock.h
+xp_str.h
+xp_thrmo.h
+xp_time.h
+xp_trace.h
+xupfonts.h
diff --git a/mozilla/jpeg/export.mac b/mozilla/jpeg/export.mac
new file mode 100644
index 00000000000..e2529f99096
--- /dev/null
+++ b/mozilla/jpeg/export.mac
@@ -0,0 +1,10 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jconfig.h
+jerror.h
+jinclude.h
+jmorecfg.h
+jpeglib.h
+jpegint.h
diff --git a/mozilla/js/jsd/export.mac b/mozilla/js/jsd/export.mac
new file mode 100644
index 00000000000..ea5b1cc1ca9
--- /dev/null
+++ b/mozilla/js/jsd/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsdebug.h
diff --git a/mozilla/js/jsj/export.mac b/mozilla/js/jsj/export.mac
new file mode 100644
index 00000000000..5d9978dd239
--- /dev/null
+++ b/mozilla/js/jsj/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsjava.h
diff --git a/mozilla/js/src/export.mac b/mozilla/js/src/export.mac
new file mode 100644
index 00000000000..62953772690
--- /dev/null
+++ b/mozilla/js/src/export.mac
@@ -0,0 +1,30 @@
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsapi.h
+jsarray.h
+jsatom.h
+jsbool.h
+jscntxt.h
+jscompat.h
+jsconfig.h
+jsdate.h
+jsdbgapi.h
+jsemit.h
+jsfun.h
+jsgc.h
+jsinterp.h
+jslock.h
+jsmath.h
+jsnum.h
+jsobj.h
+jsopcode.def
+jsopcode.h
+jsparse.h
+jsprvtd.h
+jspubtd.h
+jsregexp.h
+jsscan.h
+jsscope.h
+jsscript.h
+jsstr.h
diff --git a/mozilla/lib/htmldlgs/export.mac b/mozilla/lib/htmldlgs/export.mac
new file mode 100644
index 00000000000..c84c238d645
--- /dev/null
+++ b/mozilla/lib/htmldlgs/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+htmldlgs.h
diff --git a/mozilla/lib/layout/export.mac b/mozilla/lib/layout/export.mac
new file mode 100644
index 00000000000..fcc78d4253f
--- /dev/null
+++ b/mozilla/lib/layout/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+layout.h
diff --git a/mozilla/lib/liblayer/include/export.mac b/mozilla/lib/liblayer/include/export.mac
new file mode 100644
index 00000000000..f5fc7922e22
--- /dev/null
+++ b/mozilla/lib/liblayer/include/export.mac
@@ -0,0 +1,7 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+cl_types.h
+layers.h
+xp_rect.h
diff --git a/mozilla/lib/libparse/export.mac b/mozilla/lib/libparse/export.mac
new file mode 100644
index 00000000000..f946b8d56a7
--- /dev/null
+++ b/mozilla/lib/libparse/export.mac
@@ -0,0 +1,7 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+pa_parse.h
+pa_tags.h
+pa_amp.h
diff --git a/mozilla/lib/libstyle/export.mac b/mozilla/lib/libstyle/export.mac
new file mode 100644
index 00000000000..035b059410b
--- /dev/null
+++ b/mozilla/lib/libstyle/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+stystruc.h
+stystack.h
diff --git a/mozilla/lib/mac/MacMemoryAllocator/include/export.mac b/mozilla/lib/mac/MacMemoryAllocator/include/export.mac
new file mode 100644
index 00000000000..27c5ef334f9
--- /dev/null
+++ b/mozilla/lib/mac/MacMemoryAllocator/include/export.mac
@@ -0,0 +1,10 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+# Dunno if we really need this one
+#FlushAllocator.h
+MacMemAllocator.h
+
+
+
diff --git a/mozilla/lib/mac/MoreFiles/export.mac b/mozilla/lib/mac/MoreFiles/export.mac
new file mode 100644
index 00000000000..483570f1fc6
--- /dev/null
+++ b/mozilla/lib/mac/MoreFiles/export.mac
@@ -0,0 +1,13 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+FileCopy.h
+DirectoryCopy.h
+FSpCompat.h
+FullPath.h
+IterateDirectory.h
+MoreDesktopMgr.h
+MoreFiles.h
+MoreFilesExtras.h
+MoreFilesSearch.h
diff --git a/mozilla/lib/mac/NSStdLib/include/export.mac b/mozilla/lib/mac/NSStdLib/include/export.mac
new file mode 100644
index 00000000000..e97b7bea386
--- /dev/null
+++ b/mozilla/lib/mac/NSStdLib/include/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+macstdlibextras.h
diff --git a/mozilla/modules/libfont/public/export.mac b/mozilla/modules/libfont/public/export.mac
new file mode 100644
index 00000000000..c300a9eddb5
--- /dev/null
+++ b/mozilla/modules/libfont/public/export.mac
@@ -0,0 +1,15 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+:jmcgen:include:Mnfdoer.h
+:jmcgen:include:Mnff.h
+:jmcgen:include:Mnffbc.h
+:jmcgen:include:Mnffbp.h
+:jmcgen:include:Mnffbu.h
+:jmcgen:include:Mnffmi.h
+:jmcgen:include:Mnffp.h
+:jmcgen:include:Mnfrc.h
+:jmcgen:include:Mnfrf.h
+:jmcgen:include:Mnfstrm.h
+:jmcgen:include:Mnfdlm.h
diff --git a/mozilla/modules/libhook/public/export.mac b/mozilla/modules/libhook/public/export.mac
new file mode 100644
index 00000000000..42640dada24
--- /dev/null
+++ b/mozilla/modules/libhook/public/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+hk_types.h
+hk_funcs.h
diff --git a/mozilla/modules/libimg/png/export.mac b/mozilla/modules/libimg/png/export.mac
new file mode 100644
index 00000000000..d140449b68a
--- /dev/null
+++ b/mozilla/modules/libimg/png/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+png.h
+pngconf.h
diff --git a/mozilla/modules/libimg/public/export.mac b/mozilla/modules/libimg/public/export.mac
new file mode 100644
index 00000000000..a55c572caf7
--- /dev/null
+++ b/mozilla/modules/libimg/public/export.mac
@@ -0,0 +1,14 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+il_types.h
+ni_pixmp.h
+libimg.h
+il_icons.h
+il_strm.h
+il_util.h
+dummy_nc.h
+MIMGCBIF.h
+MIMGCB.h
+MPSIMGCB.h
diff --git a/mozilla/modules/libimg/src/export.mac b/mozilla/modules/libimg/src/export.mac
new file mode 100644
index 00000000000..b0e79c58396
--- /dev/null
+++ b/mozilla/modules/libimg/src/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+PIMGCB.h
+PPSIMGCB.h
diff --git a/mozilla/modules/libpref/public/export.mac b/mozilla/modules/libpref/public/export.mac
new file mode 100644
index 00000000000..1b7759e4f01
--- /dev/null
+++ b/mozilla/modules/libpref/public/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+prefapi.h
+prefldap.h
diff --git a/mozilla/modules/libreg/include/export.mac b/mozilla/modules/libreg/include/export.mac
new file mode 100644
index 00000000000..e2d1a6222c5
--- /dev/null
+++ b/mozilla/modules/libreg/include/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+VerReg.h
+NSReg.h
diff --git a/mozilla/modules/libutil/public/export.mac b/mozilla/modules/libutil/public/export.mac
new file mode 100644
index 00000000000..028e3860c58
--- /dev/null
+++ b/mozilla/modules/libutil/public/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+xp_obs.h
diff --git a/mozilla/modules/progress/public/export.mac b/mozilla/modules/progress/public/export.mac
new file mode 100644
index 00000000000..4f85ec55081
--- /dev/null
+++ b/mozilla/modules/progress/public/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+pw_public.h
diff --git a/mozilla/modules/rdf/include/export.mac b/mozilla/modules/rdf/include/export.mac
new file mode 100644
index 00000000000..30d8c3fa1b8
--- /dev/null
+++ b/mozilla/modules/rdf/include/export.mac
@@ -0,0 +1,7 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+rdf.h
+vocab.h
+htrdf.h
diff --git a/mozilla/modules/schedulr/public/export.mac b/mozilla/modules/schedulr/public/export.mac
new file mode 100644
index 00000000000..89ca577bef4
--- /dev/null
+++ b/mozilla/modules/schedulr/public/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+schedulr.h
diff --git a/mozilla/modules/security/freenav/export.mac b/mozilla/modules/security/freenav/export.mac
new file mode 100644
index 00000000000..97e9a6e4a2d
--- /dev/null
+++ b/mozilla/modules/security/freenav/export.mac
@@ -0,0 +1,19 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+base64.h
+cert.h
+preenc.h
+seccomon.h
+secerr.h
+sechash.h
+secnav.h
+secrng.h
+secstubn.h
+secstubs.h
+secstubt.h
+ssl.h
+sslerr.h
+zig.h
+rosetta.h
diff --git a/mozilla/modules/softupdt/include/export.mac b/mozilla/modules/softupdt/include/export.mac
new file mode 100644
index 00000000000..b6d2b862df2
--- /dev/null
+++ b/mozilla/modules/softupdt/include/export.mac
@@ -0,0 +1,7 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+softupdt.h
+su_folderspec.h
+gdiff.h
diff --git a/mozilla/modules/xml/expat/xmlparse/export.mac b/mozilla/modules/xml/expat/xmlparse/export.mac
new file mode 100644
index 00000000000..9678b2453fc
--- /dev/null
+++ b/mozilla/modules/xml/expat/xmlparse/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+xmlparse.h
diff --git a/mozilla/modules/xml/glue/export.mac b/mozilla/modules/xml/glue/export.mac
new file mode 100644
index 00000000000..7db3fbc0a48
--- /dev/null
+++ b/mozilla/modules/xml/glue/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+xmlglue.h
diff --git a/mozilla/modules/zlib/src/export.mac b/mozilla/modules/zlib/src/export.mac
new file mode 100644
index 00000000000..da790da19c9
--- /dev/null
+++ b/mozilla/modules/zlib/src/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+zlib.h
+zconf.h
diff --git a/mozilla/network/cache/export.mac b/mozilla/network/cache/export.mac
new file mode 100644
index 00000000000..a917c35bf77
--- /dev/null
+++ b/mozilla/network/cache/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+netcache.h
diff --git a/mozilla/network/client/export.mac b/mozilla/network/client/export.mac
new file mode 100644
index 00000000000..10dfa02912f
--- /dev/null
+++ b/mozilla/network/client/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+cnetinit.h
diff --git a/mozilla/network/cnvts/export.mac b/mozilla/network/cnvts/export.mac
new file mode 100644
index 00000000000..fe423659f3f
--- /dev/null
+++ b/mozilla/network/cnvts/export.mac
@@ -0,0 +1,13 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+cvactive.h
+cvchunk.h
+cvcolor.h
+cvdisk.h
+cvmime.h
+cvpics.h
+cvsimple.h
+cvunzip.h
+cvjscfg.h	
diff --git a/mozilla/network/cstream/export.mac b/mozilla/network/cstream/export.mac
new file mode 100644
index 00000000000..a074a5a6314
--- /dev/null
+++ b/mozilla/network/cstream/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+cstream.h
+strmutil.h
diff --git a/mozilla/network/main/export.mac b/mozilla/network/main/export.mac
new file mode 100644
index 00000000000..cba6b5b5ca2
--- /dev/null
+++ b/mozilla/network/main/export.mac
@@ -0,0 +1,18 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mkstream.h
+mkformat.h
+mkparse.h
+mkfsort.h
+mksort.h
+mkgeturl.h
+mkselect.h
+mktcp.h
+netutils.h
+mkpadpac.h
+mkautocf.h
+mkutils.h
+mktrace.h
+mkhelp.h
diff --git a/mozilla/network/protocol/about/export.mac b/mozilla/network/protocol/about/export.mac
new file mode 100644
index 00000000000..886cf1cdd57
--- /dev/null
+++ b/mozilla/network/protocol/about/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+abouturl.h
diff --git a/mozilla/network/protocol/certld/export.mac b/mozilla/network/protocol/certld/export.mac
new file mode 100644
index 00000000000..7405ac50307
--- /dev/null
+++ b/mozilla/network/protocol/certld/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mkcertld.h
diff --git a/mozilla/network/protocol/dataurl/export.mac b/mozilla/network/protocol/dataurl/export.mac
new file mode 100644
index 00000000000..0a93b26626b
--- /dev/null
+++ b/mozilla/network/protocol/dataurl/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+dataurl.h
diff --git a/mozilla/network/protocol/file/export.mac b/mozilla/network/protocol/file/export.mac
new file mode 100644
index 00000000000..f3e8a623092
--- /dev/null
+++ b/mozilla/network/protocol/file/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+fileurl.h
diff --git a/mozilla/network/protocol/ftp/export.mac b/mozilla/network/protocol/ftp/export.mac
new file mode 100644
index 00000000000..f87eb7f7b5d
--- /dev/null
+++ b/mozilla/network/protocol/ftp/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+ftpurl.h
diff --git a/mozilla/network/protocol/gopher/export.mac b/mozilla/network/protocol/gopher/export.mac
new file mode 100644
index 00000000000..c49eaaa9fd2
--- /dev/null
+++ b/mozilla/network/protocol/gopher/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+gophurl.h
diff --git a/mozilla/network/protocol/http/export.mac b/mozilla/network/protocol/http/export.mac
new file mode 100644
index 00000000000..84770dc335e
--- /dev/null
+++ b/mozilla/network/protocol/http/export.mac
@@ -0,0 +1,8 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+httpurl.h
+cookies.h
+httpauth.h
+jscookie.h
diff --git a/mozilla/network/protocol/js/export.mac b/mozilla/network/protocol/js/export.mac
new file mode 100644
index 00000000000..a36fb83989a
--- /dev/null
+++ b/mozilla/network/protocol/js/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+jsurl.h
diff --git a/mozilla/network/protocol/mailbox/export.mac b/mozilla/network/protocol/mailbox/export.mac
new file mode 100644
index 00000000000..49bf077dd1f
--- /dev/null
+++ b/mozilla/network/protocol/mailbox/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mkmailbx.h
diff --git a/mozilla/network/protocol/marimba/export.mac b/mozilla/network/protocol/marimba/export.mac
new file mode 100644
index 00000000000..c11fc50175c
--- /dev/null
+++ b/mozilla/network/protocol/marimba/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+marimurl.h
diff --git a/mozilla/network/protocol/nntp/export.mac b/mozilla/network/protocol/nntp/export.mac
new file mode 100644
index 00000000000..51fc96dd9c1
--- /dev/null
+++ b/mozilla/network/protocol/nntp/export.mac
@@ -0,0 +1,4 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
diff --git a/mozilla/network/protocol/pop3/export.mac b/mozilla/network/protocol/pop3/export.mac
new file mode 100644
index 00000000000..9510174c7dc
--- /dev/null
+++ b/mozilla/network/protocol/pop3/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mkpop3.h
diff --git a/mozilla/network/protocol/remote/export.mac b/mozilla/network/protocol/remote/export.mac
new file mode 100644
index 00000000000..9879b458ec5
--- /dev/null
+++ b/mozilla/network/protocol/remote/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+remoturl.h
diff --git a/mozilla/network/protocol/smtp/export.mac b/mozilla/network/protocol/smtp/export.mac
new file mode 100644
index 00000000000..6d2e73b9327
--- /dev/null
+++ b/mozilla/network/protocol/smtp/export.mac
@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+mksmtp.h
diff --git a/mozilla/nsprpub/lib/ds/export.mac b/mozilla/nsprpub/lib/ds/export.mac
new file mode 100644
index 00000000000..ce8226bdd8b
--- /dev/null
+++ b/mozilla/nsprpub/lib/ds/export.mac
@@ -0,0 +1,8 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+plarenas.h
+plarena.h
+plevent.h
+plhash.h
diff --git a/mozilla/nsprpub/lib/libc/include/export.mac b/mozilla/nsprpub/lib/libc/include/export.mac
new file mode 100644
index 00000000000..63e8861de2c
--- /dev/null
+++ b/mozilla/nsprpub/lib/libc/include/export.mac
@@ -0,0 +1,9 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+plbase64.h
+plerror.h
+plgetopt.h
+plresolv.h
+plstr.h
diff --git a/mozilla/nsprpub/pr/include/export.mac b/mozilla/nsprpub/pr/include/export.mac
new file mode 100644
index 00000000000..73f9de421e3
--- /dev/null
+++ b/mozilla/nsprpub/pr/include/export.mac
@@ -0,0 +1,38 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+nspr.h
+pratom.h
+prbit.h
+prclist.h
+prcmon.h
+prcvar.h
+prdtoa.h
+prenv.h
+prerror.h
+prinet.h
+prinit.h
+prinrval.h
+prio.h
+prlink.h
+prlock.h
+prlog.h
+prlong.h
+prmem.h
+prmon.h
+prmwait.h
+prnetdb.h
+prpdce.h
+prprf.h
+prproces.h
+prsystem.h
+prthread.h
+prtime.h
+prtypes.h
+prwin16.h
+
+obsolete:protypes.h
+obsolete:prsem.h
+md:prosdep.h
+md:_macos.h
diff --git a/mozilla/nsprpub/pr/src/md/mac/export.mac b/mozilla/nsprpub/pr/src/md/mac/export.mac
new file mode 100644
index 00000000000..c51cbd5a020
--- /dev/null
+++ b/mozilla/nsprpub/pr/src/md/mac/export.mac
@@ -0,0 +1,7 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+MacErrorHandling.h
+macsocket.h
+prcpucfg.h
diff --git a/mozilla/sun-java/stubs/include/export.mac b/mozilla/sun-java/stubs/include/export.mac
new file mode 100644
index 00000000000..876e9c910e4
--- /dev/null
+++ b/mozilla/sun-java/stubs/include/export.mac
@@ -0,0 +1,22 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+bool.h
+interpreter.h 
+javaString.h 
+javaThreads.h 
+jmc.h 
+jni.h 
+jni_md.h 
+jri.h 
+jri_md.h 
+jriext.h 
+jritypes.h 
+nspr_md.h 
+oobj.h 
+sysmacros_md.h 
+tree.h 
+typedefs.h 
+typedefs_md.h 
+zip.h 
diff --git a/mozilla/sun-java/stubs/macjri/export.mac b/mozilla/sun-java/stubs/macjri/export.mac
new file mode 100644
index 00000000000..22b4080f5cf
--- /dev/null
+++ b/mozilla/sun-java/stubs/macjri/export.mac
@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+java_lang_String.h
+jdk_java_lang_String.h
diff --git a/mozilla/xpcom/src/export.mac b/mozilla/xpcom/src/export.mac
new file mode 100644
index 00000000000..abd0d19389b
--- /dev/null
+++ b/mozilla/xpcom/src/export.mac
@@ -0,0 +1,13 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+nsAgg.h
+nsCom.h
+nsDebug.h
+nsHashtable.h
+nsID.h
+nsIFactory.h
+nsISupports.h
+nsRepository.h
+nsIEnumerator.h