diff --git a/build/unix/modules.mk b/build/unix/modules.mk
index 82d8135dfd3f..b31a53657393 100644
--- a/build/unix/modules.mk
+++ b/build/unix/modules.mk
@@ -66,8 +66,8 @@ BM_CVS_NS_xpidl		= xpcom/typelib xpcom/typelib/xpidl
 
 # xpcom
 #
-BM_DIRS_xpcom		= $(NSPRPUB_DIR) modules/libreg string xpcom
-BM_CVS_xpcom		= $(NSPRPUB_DIR) modules/libreg string xpcom
+BM_DIRS_xpcom		= $(NSPRPUB_DIR) lib/mac/MoreFiles modules/libreg string xpcom
+BM_CVS_xpcom		= $(NSPRPUB_DIR) lib/mac/MoreFiles modules/libreg string xpcom
 
 #
 # xpconnect
diff --git a/lib/mac/MoreFiles/Makefile.in b/lib/mac/MoreFiles/Makefile.in
index e442f0d1b6a8..5a0961f5afc8 100644
--- a/lib/mac/MoreFiles/Makefile.in
+++ b/lib/mac/MoreFiles/Makefile.in
@@ -24,6 +24,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
+# ifeq for standalone builds
+ifeq ($(OS_ARCH),Darwin)
 MODULE		= macmorefiles
 LIBRARY_NAME	= macmorefiles_s
 
@@ -60,4 +64,6 @@ EXPORTS		+=  \
 # static lib.
 FORCE_STATIC_LIB=1
 
+endif
+
 include $(topsrcdir)/config/rules.mk