diff --git a/image/decoders/icon/mac/Makefile.in b/image/decoders/icon/mac/Makefile.in
index a8abcc25c18b..71e508a90bea 100644
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@@ -13,7 +13,7 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 
-CMMSRCS		= nsIconChannelCocoa.mm
+DISABLED_CMMSRCS = nsIconChannelCocoa.mm
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
diff --git a/image/decoders/icon/mac/moz.build b/image/decoders/icon/mac/moz.build
index 0d482a1a730c..5ad34c100ef1 100644
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -8,3 +8,6 @@ MODULE = 'imgicon'
 
 LIBRARY_NAME = 'imgiconmac_s'
 
+CMMSRCS += [
+    'nsIconChannelCocoa.mm',
+]
diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in
index 3753c5b69fa5..55c7ba947603 100644
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -49,7 +49,7 @@ endif # } OS_POSIX
 
 ifdef OS_MACOSX # {
 
-CMMSRCS += \
+DISABLED_CMMSRCS += \
   base_paths_mac.mm \
   file_util_mac.mm \
   file_version_info_mac.mm \
diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
index ca78ef660993..3da1f4d15fe5 100644
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -166,6 +166,22 @@ if os_macosx:
         'mach_message_source_mac.cc',
         'transport_dib_mac.cc',
     ]
+    CMMSRCS += [
+        'base_paths_mac.mm',
+        'chrome_application_mac.mm',
+        'chrome_paths_mac.mm',
+        'file_util_mac.mm',
+        'file_version_info_mac.mm',
+        'mac_util.mm',
+        'mach_ipc_mac.mm',
+        'message_pump_mac.mm',
+        'platform_thread_mac.mm',
+        'platform_util_mac.mm',
+        'process_util_mac.mm',
+        'scoped_nsautorelease_pool.mm',
+        'sys_string_conversions_mac.mm',
+        'worker_pool_mac.mm',
+    ]
 
 if os_linux:
     CPP_SOURCES += [
diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index e4d14c7f2ac1..b4815e90c573 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -18,7 +18,7 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += xpcshellMacUtils.mm
+DISABLED_CMMSRCS += xpcshellMacUtils.mm
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index 9ab7b07056a0..64b77c59184a 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -11,3 +11,8 @@ PROGRAM = 'xpcshell'
 CPP_SOURCES += [
     'xpcshell.cpp',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'xpcshellMacUtils.mm',
+    ]
diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in
index 61fc801c1aee..cf36e808ae3c 100644
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -17,7 +17,7 @@ FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS		+= \
+DISABLED_CMMSRCS		+= \
 		nsPluginUtilsOSX.mm \
 		$(NULL)
 endif
diff --git a/layout/generic/moz.build b/layout/generic/moz.build
index 088e108916c5..765b5ce9035a 100644
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -87,3 +87,8 @@ CPP_SOURCES += [
     'nsVideoFrame.cpp',
     'nsViewportFrame.cpp',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'nsPluginUtilsOSX.mm',
+    ]
diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in
index 580f64544374..247ba5f3ba5d 100644
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -15,7 +15,7 @@ LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
-CMMSRCS += nsNetworkLinkService.mm
+DISABLED_CMMSRCS += nsNetworkLinkService.mm
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build
index c84eebbe924a..10805e746684 100644
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -8,3 +8,6 @@ MODULE = 'necko'
 
 LIBRARY_NAME = 'neckosystem_s'
 
+CMMSRCS += [
+    'nsNetworkLinkService.mm',
+]
diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in
index 75be11f03935..be1e3ed97339 100644
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -19,7 +19,7 @@ FAIL_ON_WARNINGS := 1
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-CMMSRCS = osx_corewlan.mm
+DISABLED_CMMSRCS = osx_corewlan.mm
 endif
 
 ifeq ($(OS_ARCH),SunOS)
diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index 0211818e308e..5e70211353e9 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -31,6 +31,9 @@ if CONFIG['OS_ARCH'] == 'Darwin':
     CPP_SOURCES += [
         'nsWifiScannerMac.cpp',
     ]
+    CMMSRCS += [
+        'osx_corewlan.mm',
+    ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsWifiScannerWin.cpp',
@@ -46,4 +49,3 @@ if CONFIG['MOZ_ENABLE_DBUS']:
     ]
 
 LIBRARY_NAME = 'neckowifi_s'
-