--- a/chat/modules/Makefile.in
+++ b/chat/modules/Makefile.in
@@ -5,18 +5,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_PP_JS_MODULES = \
-	hiddenWindow.jsm \
-	imTextboxUtils.jsm \
-	$(NULL)
-
 ifdef ENABLE_TESTS
 TESTING_JS_MODULES := test/appInfoUtils.jsm
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/chat/modules/moz.build
+++ b/chat/modules/moz.build
@@ -10,8 +10,14 @@ EXTRA_JS_MODULES += [
     'imServices.jsm',
     'imSmileys.jsm',
     'imStatusUtils.jsm',
     'imThemes.jsm',
     'imXPCOMUtils.jsm',
     'jsProtoHelper.jsm',
     'socket.jsm',
 ]
+
+EXTRA_PP_JS_MODULES += [
+    'hiddenWindow.jsm',
+    'imTextboxUtils.jsm',
+]
+

--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -4,37 +4,20 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Include SearchIntegration.js on all platforms
-EXTRA_PP_JS_MODULES = \
-  SearchIntegration.js \
-  $(NULL)
-
-# If on Mac, build Spotlight integration
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_PP_JS_MODULES += \
-  SpotlightIntegration.js \
-  $(NULL)
-endif
-
 # If on Windows, build Windows Search integration
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
 LIBRARY_NAME = winsearch_s
 MODULE_NAME = nsMailWinSearchHelperModule
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 
-# Windows Search component
-EXTRA_PP_JS_MODULES += \
-  WinSearchIntegration.js \
-  $(NULL)
-
 FORCE_STATIC_LIB = 1
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -1,15 +1,21 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['mdimporter']
+    EXTRA_PP_JS_MODULES += ['SpotlightIntegration.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
     CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
+    EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
 
 MODULE = 'mailwinsearch'
 
 DIRS += ['public']
 
+EXTRA_PP_JS_MODULES += [
+    'SearchIntegration.js',
+]
+