diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in
deleted file mode 100644
index 5aa5764bee3f..000000000000
--- a/toolkit/components/filepicker/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# 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/.
-
-
-ifdef MOZ_XUL
-ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
-EXPORT_LIBRARY = 1
-endif
-endif
diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build
index fe19915a3d3f..395559969dc2 100644
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -7,6 +7,7 @@
 if CONFIG['MOZ_XUL'] and \
     CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
         LIBXUL_LIBRARY = True
+        EXPORT_LIBRARY = True
         MODULE = 'filepicker'
         LIBRARY_NAME = 'fileview'
         XPIDL_SOURCES += [
diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in
index 9819e67912cd..deb6de83a14b 100644
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -2,12 +2,5 @@
 # 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/.
 
-ifdef MOZ_PLACES
-EXPORT_LIBRARY = 1
-
-LOCAL_INCLUDES += -I$(srcdir)/../build
-
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build
index 1c6ae485f8e3..cd300426b74a 100644
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -11,8 +11,11 @@ XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
+MODULE = 'places'
+
 if CONFIG['MOZ_PLACES']:
     LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
     MSVC_ENABLE_PGO = True
     LIBRARY_NAME = 'places'
 
@@ -55,6 +58,10 @@ if CONFIG['MOZ_PLACES']:
         'Database.cpp',
     ]
 
+    LOCAL_INCLUDES += [
+        '../build',
+    ]
+
     EXTRA_JS_MODULES = [
         'BookmarkJSONUtils.jsm',
         'ClusterLib.js',
@@ -69,10 +76,6 @@ if CONFIG['MOZ_PLACES']:
         'PlacesUtils.jsm',
     ]
 
-MODULE = 'places'
-
-
-if CONFIG['MOZ_PLACES']:
     EXTRA_COMPONENTS += [
         'ColorAnalyzer.js',
         'PlacesCategoriesStarter.js',
diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in
deleted file mode 100644
index 9434ff95d7af..000000000000
--- a/tools/profiler/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#! gmake
-#
-# 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/.
-
-VPATH       = $(srcdir)
-ifdef MOZ_ENABLE_PROFILER_SPS
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/mozglue/linker \
-  -I$(topsrcdir)/ipc/chromium/src \
-  -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
-  $(NULL)
-
-# We need access to Breakpad's getcontext(3) which is suitable for Android
-ifeq ($(OS_TARGET),Android)
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include \
-  $(NULL)
-endif
-
-ifneq (,$(filter armeabi,$(ANDROID_CPU_ARCH)))
-DEFINES += -DARCH_ARMV6
-endif
-
-EXPORT_LIBRARY  = 1
-
-# Uncomment for better debugging in opt builds
-#MOZ_OPTIMIZE_FLAGS += -O0 -g
-
-endif
diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build
index 09ffe0747758..fcf92e5c70e7 100644
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -8,6 +8,7 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
     LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
 
     MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
@@ -68,6 +69,21 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
             'platform-win32.cc',
         ]
 
+    LOCAL_INCLUDES += [
+        '/ipc/chromium/src',
+        '/mozglue/linker',
+        '/toolkit/crashreporter/google-breakpad/src',
+    ]
+
+    # We need access to Breakpad's getcontext(3) which is suitable for Android
+    if CONFIG['OS_TARGET'] == 'Android':
+        LOCAL_INCLUDES += [
+            '/toolkit/crashreporter/google-breakpad/src/common/android/include',
+        ]
+
+    if CONFIG['ANDROID_CPU_ARCH'] == 'armeabi':
+        DEFINES['ARCH_ARMV6'] = True
+
 EXPORTS += [
     'GeckoProfiler.h',
 ]