diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 9dfc44b535a5..17caef312acd 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -37,9 +37,16 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
+else
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS = nsNativeAppSupportCocoa.mm
+endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+CMMSRCS += MacLaunchHelper.mm
+CMMSRCS += MacApplicationDelegate.mm
+CMMSRCS += MacAutoreleasePool.mm
 ENABLE_CXX_EXCEPTIONS = 1
 endif
 
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 249f92613366..01df06809dcf 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -87,11 +87,3 @@ if CONFIG['MOZ_UPDATER']:
         CPP_SOURCES += [
             'nsUpdateDriver.cpp',
         ]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS += [
-        'MacApplicationDelegate.mm',
-        'MacAutoreleasePool.mm',
-        'MacLaunchHelper.mm',
-        'nsNativeAppSupportCocoa.mm',
-    ]
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
index 956bbad92148..e89bfbe79a14 100644
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -32,6 +32,11 @@ endif # !_MSC_VER
 # Uncomment for better debugging in opt builds
 #MOZ_OPTIMIZE_FLAGS += -O0 -g
 
-endif # MOZ_ENABLE_PROFILER_SPS
+ifeq ($(OS_TARGET),Darwin)
+CMMSRCS += \
+  shim_mac_dump_syms.mm
+endif
+
+endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build
index 6964f46ec282..aefb0c793767 100644
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -64,8 +64,3 @@ EXPORTS.mozilla += [
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
-
-if CONFIG['MOZ_ENABLE_PROFILER_SPS'] and CONFIG['OS_TARGET'] == 'Darwin':
-    CMMSRCS += [
-        'shim_mac_dump_syms.mm',
-    ]
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index cc1b3ab8df17..7d980de99862 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -37,6 +37,15 @@ LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+
+CMMSRCS	= nsOSHelperAppService.mm \
+			nsMIMEInfoMac.mm \
+			nsLocalHandlerAppMac.mm \
+			$(NULL)
+endif
+
 LOCAL_INCLUDES = -I$(srcdir)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
index 91209a494fe8..4201a69f74e8 100644
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -64,11 +64,8 @@ CPP_SOURCES += [
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CMMSRCS = [
-        'nsLocalHandlerAppMac.mm',
-        'nsMIMEInfoMac.mm',
-        'nsOSHelperAppService.mm',
-    ]
+    # TODO: CMMSRCS go here
+    pass
 else:
     CPP_SOURCES += [
         'nsOSHelperAppService.cpp',
diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in
index 060e070f1afc..9f67ef7664f9 100644
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -13,6 +13,8 @@ include $(DEPTH)/config/autoconf.mk
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
+CMMSRCS = webapprt.mm
+
 # Don't create a dependency on mozglue, which is impossible (difficult?)
 # to dynamically link into our executable, as we copy it to arbitrary locations.
 MOZ_GLUE_LDFLAGS =
diff --git a/webapprt/mac/moz.build b/webapprt/mac/moz.build
index c1f3f11e9abe..7e67568325de 100644
--- a/webapprt/mac/moz.build
+++ b/webapprt/mac/moz.build
@@ -6,6 +6,3 @@
 
 PROGRAM = 'webapprt-stub'
 
-CMMSRCS += [
-    'webapprt.mm',
-]
diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in
index 389322d93b42..719a566e5964 100644
--- a/widget/cocoa/Makefile.in
+++ b/widget/cocoa/Makefile.in
@@ -13,6 +13,52 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY = 1
 
+
+
+CMMSRCS = \
+  nsBidiKeyboard.mm \
+  nsClipboard.mm \
+  nsMenuX.mm \
+  nsMenuBarX.mm \
+  nsMenuItemX.mm \
+  nsMenuItemIconX.mm \
+  nsMenuUtilsX.mm \
+  nsMenuGroupOwnerX.mm \
+  nsFilePicker.mm \
+  nsDragService.mm \
+  nsToolkit.mm \
+  nsAppShell.mm \
+  nsCocoaFeatures.mm \
+  nsCocoaUtils.mm \
+  nsCocoaWindow.mm \
+  nsChildView.mm \
+  nsWindowMap.mm \
+  nsWidgetFactory.mm \
+  nsCursorManager.mm \
+  nsMacCursor.mm \
+  nsScreenCocoa.mm \
+  nsScreenManagerCocoa.mm \
+  nsSound.mm \
+  nsLookAndFeel.mm \
+  nsNativeThemeCocoa.mm \
+  nsDeviceContextSpecX.mm \
+  nsPrintDialogX.mm \
+  nsPrintOptionsX.mm \
+  nsPrintSettingsX.mm \
+  nsIdleServiceX.mm \
+  TextInputHandler.mm \
+  nsMacDockSupport.mm \
+  nsStandaloneNativeMenu.mm \
+  nsMacWebAppUtils.mm \
+  GfxInfo.mm \
+  WidgetTraceEvent.mm \
+  NativeKeyBindings.mm \
+  $(NULL)
+
+ifeq (x86_64,$(TARGET_CPU))
+CMMSRCS += ComplexTextInputPanel.mm
+endif
+
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build
index f0f702fa78a2..dea60daf5374 100644
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -21,46 +21,3 @@ EXPORTS += [
 
 LIBRARY_NAME = 'widget_mac'
 
-CMMSRCS += [
-    'GfxInfo.mm',
-    'TextInputHandler.mm',
-    'WidgetTraceEvent.mm',
-    'nsAppShell.mm',
-    'nsBidiKeyboard.mm',
-    'nsChildView.mm',
-    'nsClipboard.mm',
-    'nsCocoaFeatures.mm',
-    'nsCocoaUtils.mm',
-    'nsCocoaWindow.mm',
-    'nsCursorManager.mm',
-    'nsDeviceContextSpecX.mm',
-    'nsDragService.mm',
-    'nsFilePicker.mm',
-    'nsIdleServiceX.mm',
-    'nsLookAndFeel.mm',
-    'nsMacCursor.mm',
-    'nsMacDockSupport.mm',
-    'nsMacWebAppUtils.mm',
-    'nsMenuBarX.mm',
-    'nsMenuGroupOwnerX.mm',
-    'nsMenuItemIconX.mm',
-    'nsMenuItemX.mm',
-    'nsMenuUtilsX.mm',
-    'nsMenuX.mm',
-    'nsNativeThemeCocoa.mm',
-    'nsPrintDialogX.mm',
-    'nsPrintOptionsX.mm',
-    'nsPrintSettingsX.mm',
-    'nsScreenCocoa.mm',
-    'nsScreenManagerCocoa.mm',
-    'nsSound.mm',
-    'nsStandaloneNativeMenu.mm',
-    'nsToolkit.mm',
-    'nsWidgetFactory.mm',
-    'nsWindowMap.mm',
-]
-
-if CONFIG['TARGET_CPU'] == 'x86_64':
-    CMMSRCS += [
-        'ComplexTextInputPanel.mm',
-    ]