diff --git a/browser/components/feeds/src/Makefile.in b/browser/components/feeds/src/Makefile.in
deleted file mode 100644
index c82bbbac0f03..000000000000
--- a/browser/components/feeds/src/Makefile.in
+++ /dev/null
@@ -1,5 +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/.
-
-LOCAL_INCLUDES = -I$(srcdir)/../../build
diff --git a/browser/components/feeds/src/moz.build b/browser/components/feeds/src/moz.build
index 03cd8b944078..31639f793962 100644
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -22,3 +22,8 @@ FINAL_LIBRARY = 'browsercomps'
 
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
+
+LOCAL_INCLUDES += [
+    '../../build',
+]
+
diff --git a/build/stlport/Makefile.in b/build/stlport/Makefile.in
index e105f0af6835..8093271d4e91 100644
--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@@ -12,4 +12,3 @@ LIBRARY = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -fuse-cxa-atexit
-INCLUDES += -I$(srcdir)/stlport
diff --git a/build/stlport/moz.build b/build/stlport/moz.build
index 78c12f00bcbf..0a0be7c8be8f 100644
--- a/build/stlport/moz.build
+++ b/build/stlport/moz.build
@@ -47,3 +47,8 @@ SOURCES += [
 ]
 
 DEFINES['_GNU_SOURCE'] = True
+
+LOCAL_INCLUDES += [
+    'stlport',
+]
+
diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in
index dcdcc97adab8..1b2c1860f11a 100644
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -4,8 +4,6 @@
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += -I$(topsrcdir)/extensions/spellcheck/src
-
 ifdef MOZ_NATIVE_HUNSPELL
 # MOZ_HUNSPELL_CFLAGS is extracted through pkgconfig during configure,
 # even though the variable doesn't show up in configure.in.
diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build
index b8be90549401..bfcd874cef9d 100644
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -28,3 +28,8 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
     DEFINES['HUNSPELL_STATIC'] = True
 
 FINAL_LIBRARY = 'spellchecker'
+
+LOCAL_INCLUDES += [
+    '/extensions/spellcheck/src',
+]
+
diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in
deleted file mode 100644
index cbefcfba6247..000000000000
--- a/extensions/spellcheck/src/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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += \
-	-I$(srcdir)/../hunspell/src \
-	-I$(topsrcdir)/content/base/src \
-	-I$(topsrcdir)/editor/libeditor/base \
-	$(NULL)
diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build
index abe8e9f50edb..1de891847457 100644
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -18,3 +18,9 @@ UNIFIED_SOURCES += [
 LIBRARY_NAME = 'spellchecker'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../hunspell/src',
+    '/content/base/src',
+    '/editor/libeditor/base',
+]
diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in
deleted file mode 100644
index 99c200c230b2..000000000000
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ /dev/null
@@ -1,6 +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/.
-
-LOCAL_INCLUDES = -I$(srcdir)/../base
diff --git a/extensions/universalchardet/src/xpcom/moz.build b/extensions/universalchardet/src/xpcom/moz.build
index e36efe5bb0bf..b89d526a2128 100644
--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -12,3 +12,7 @@ UNIFIED_SOURCES += [
 LIBRARY_NAME = 'universalchardet'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../base',
+]
diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in
deleted file mode 100644
index 38bf1b4ba94a..000000000000
--- a/ipc/glue/Makefile.in
+++ /dev/null
@@ -1,13 +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/.
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_CONTENT_SANDBOX
-ifeq ($(OS_ARCH),WINNT)
-LOCAL_INCLUDES += -I$(topsrcdir)/security/sandbox/win/src/sandboxbroker
-endif
-endif
diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build
index f6dd043a26fa..4af751f6b5c4 100644
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -125,3 +125,12 @@ FINAL_LIBRARY = 'xul'
 
 for var in ('MOZ_CHILD_PROCESS_NAME', 'MOZ_CHILD_PROCESS_BUNDLE'):
     DEFINES[var] = '"%s"' % CONFIG[var]
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter',
+]
+
+if CONFIG['MOZ_CONTENT_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
+    LOCAL_INCLUDES += [
+        '/security/sandbox/win/src/sandboxbroker',
+    ]
diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in
deleted file mode 100644
index f4920440a76d..000000000000
--- a/js/ipc/Makefile.in
+++ /dev/null
@@ -1,12 +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/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/base \
-  -I$(topsrcdir)/js/ipc \
-  -I$(topsrcdir)/js/public \
-  -I$(topsrcdir)/js/xpconnect/src \
-  $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/js/ipc/moz.build b/js/ipc/moz.build
index dc3c6c0cd548..8f18ef6c2703 100644
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -22,3 +22,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+    '/js/ipc',
+    '/js/public',
+    '/js/xpconnect/src',
+]
+
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 084e2fb7db03..7d165fbc0772 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -344,8 +344,6 @@ DIST_GARBAGE = config.cache config.log config.status* \
 distclean::
 	$(RM) $(DIST_GARBAGE)
 
-INCLUDES	+= -I$(srcdir)
-
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 # _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
 DEFINES         += -D_CRT_RAND_S
diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in
deleted file mode 100644
index cdcd75cc1b72..000000000000
--- a/js/xpconnect/loader/Makefile.in
+++ /dev/null
@@ -1,9 +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/.
-
-LOCAL_INCLUDES += \
-  -I$(srcdir)/../src \
-  -I$(srcdir)/../wrappers \
-  -I$(topsrcdir)/content/base/src \
-  $(NULL)
diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build
index 75dacdd34022..ff81926a6a85 100644
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -24,3 +24,10 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'xpconnect_s'
 
 DEFINES['JS_THREADSAFE'] = True
+
+LOCAL_INCLUDES += [
+    '../src',
+    '../wrappers',
+    '/content/base/src',
+]
+
diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in
index 82225734eede..6bdf31634ea3 100644
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@@ -5,10 +5,6 @@
 
 SDK_BINARY	= $(PROGRAM)
 
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/toolkit/xre \
-  $(NULL)
-
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(LIBXUL_LIBS) \
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index dded5baca886..3eed79f00f6c 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -26,4 +26,9 @@ if CONFIG['MOZ_CALLGRIND']:
 if CONFIG['MOZ_VTUNE']:
     DEFINES['MOZ_VTUNE'] = True
 
-include('/ipc/chromium/chromium-config.mozbuild')
\ No newline at end of file
+include('/ipc/chromium/chromium-config.mozbuild')
+
+LOCAL_INCLUDES += [
+    '/toolkit/xre',
+]
+
diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
index b45acbe3476f..494f1d29f655 100644
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -3,29 +3,6 @@
 # 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/.
 
-LOCAL_INCLUDES = \
-		-I$(srcdir)/../wrappers \
-		-I$(srcdir)/../loader \
-		-I$(topsrcdir)/caps/include \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/base/public \
-		-I$(topsrcdir)/content/events/src \
-		-I$(topsrcdir)/content/html/content/src \
-		-I$(topsrcdir)/content/html/document/src \
-		-I$(topsrcdir)/content/svg/content/src \
-		-I$(topsrcdir)/layout/style \
-		-I$(topsrcdir)/layout/base \
-		-I$(topsrcdir)/dom/base \
-		-I$(topsrcdir)/xpcom/ds \
-		-I$(topsrcdir)/js/ipc \
-		$(NULL)
-
-ifdef MOZ_B2G_BT
-LOCAL_INCLUDES += \
-    -I$(topsrcdir)/dom/bluetooth \
-    $(NULL)
-endif
-
 EXTRA_MDDEPEND_FILES = dom_qsgen.pp dictionary_helper_gen.pp event_impl_gen.pp
 
 INSTALL_TARGETS += extra_export_files
diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build
index f1319cb59cd7..412559790b3b 100644
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -91,3 +91,25 @@ DEFINES['JS_THREADSAFE'] = True
 
 if CONFIG['MOZ_JSDEBUGGER']:
     DEFINES['MOZ_JSDEBUGGER'] = True
+
+LOCAL_INCLUDES += [
+    '../loader',
+    '../wrappers',
+    '/caps/include',
+    '/content/base/public',
+    '/content/base/src',
+    '/content/events/src',
+    '/content/html/content/src',
+    '/content/html/document/src',
+    '/content/svg/content/src',
+    '/dom/base',
+    '/js/ipc',
+    '/layout/base',
+    '/layout/style',
+    '/xpcom/ds',
+]
+
+if CONFIG['MOZ_B2G_BT']:
+    LOCAL_INCLUDES += [
+        '/dom/bluetooth',
+    ]
diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in
deleted file mode 100644
index 93c13e5d07fe..000000000000
--- a/js/xpconnect/wrappers/Makefile.in
+++ /dev/null
@@ -1,7 +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/.
-
-LOCAL_INCLUDES = \
-                -I$(srcdir)/../src \
-                -I$(srcdir)/../../../dom/base \
diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build
index 0166a091f40c..97597a43eb01 100644
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -27,3 +27,9 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpconnect_s'
+
+LOCAL_INCLUDES += [
+    '../../../dom/base',
+    '../src',
+]
+
diff --git a/media/libtremor/lib/Makefile.in b/media/libtremor/lib/Makefile.in
deleted file mode 100644
index abe61c311865..000000000000
--- a/media/libtremor/lib/Makefile.in
+++ /dev/null
@@ -1,5 +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/.
-
-LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor
diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build
index 0f4aba1b43c4..72a9fbe41db1 100644
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -26,3 +26,8 @@ if CONFIG['OS_ARCH'] == 'AIX':
 
 if CONFIG['TARGET_CPU'] == 'arm' and CONFIG['GNU_CC'] and not CONFIG['MOZ_THUMB2']:
     DEFINES['_ARM_ASSEM_'] = True
+
+LOCAL_INCLUDES += [
+    '/media/libtremor/include/tremor',
+]
+
diff --git a/media/omx-plugin/Makefile.in b/media/omx-plugin/Makefile.in
index dbfdc216adce..8314367653d2 100644
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@@ -25,17 +25,13 @@ ifdef GNU_CXX
 CXXFLAGS += -Wno-multichar
 endif
 
-INCLUDES        += \
-                -I$(srcdir)/../../content/media/plugins \
-                $(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
 EXTRA_DSO_LDOPTS += \
                -lutils -lstagefright -lmedia -lstagefright_omx -lbinder -lui \
                -lhardware -lcutils \
 		$(NULL)
 
-INCLUDES        += \
+CXXFLAGS += \
                 -I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
                 -I$(ANDROID_SOURCE)/frameworks/base/include/ \
                 -I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
@@ -56,9 +52,4 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/ics/libvideoeditorplayer \
 		-lvideoeditorplayer \
 		$(NULL)
-
-INCLUDES        += \
-                -I$(srcdir)/include/ics \
-                -I$(srcdir)/include/ics/media/stagefright/openmax \
-                $(NULL)
 endif
diff --git a/media/omx-plugin/froyo/Makefile.in b/media/omx-plugin/froyo/Makefile.in
index 06b60f9a465b..513a72d52a8f 100644
--- a/media/omx-plugin/froyo/Makefile.in
+++ b/media/omx-plugin/froyo/Makefile.in
@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/froyo \
-                -I$(srcdir)/../include/froyo/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/froyo/moz.build b/media/omx-plugin/froyo/moz.build
index fbf5c9d8218f..4d51ea03cd98 100644
--- a/media/omx-plugin/froyo/moz.build
+++ b/media/omx-plugin/froyo/moz.build
@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxpluginfroyo'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/froyo',
+    '../include/froyo/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/gb/Makefile.in b/media/omx-plugin/gb/Makefile.in
index d1212a98cbf1..1abcb1e6b02b 100644
--- a/media/omx-plugin/gb/Makefile.in
+++ b/media/omx-plugin/gb/Makefile.in
@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/gb \
-                -I$(srcdir)/../include/gb/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/gb/moz.build b/media/omx-plugin/gb/moz.build
index fbec7dac36da..ff7024bd69e4 100644
--- a/media/omx-plugin/gb/moz.build
+++ b/media/omx-plugin/gb/moz.build
@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxplugingb'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/gb',
+    '../include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/gb235/Makefile.in b/media/omx-plugin/gb235/Makefile.in
index 6008da2fb941..e29f122090a7 100644
--- a/media/omx-plugin/gb235/Makefile.in
+++ b/media/omx-plugin/gb235/Makefile.in
@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -33,7 +29,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright_color_conversion \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/gb \
-                -I$(srcdir)/../include/gb/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/gb235/moz.build b/media/omx-plugin/gb235/moz.build
index b91f67104ef5..7089c67931db 100644
--- a/media/omx-plugin/gb235/moz.build
+++ b/media/omx-plugin/gb235/moz.build
@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxplugingb235'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/gb',
+    '../include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/hc/Makefile.in b/media/omx-plugin/hc/Makefile.in
index 9df22624fd64..3d1bc934cc9c 100644
--- a/media/omx-plugin/hc/Makefile.in
+++ b/media/omx-plugin/hc/Makefile.in
@@ -20,10 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(srcdir)/../../../content/media/plugins \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
@@ -31,7 +27,3 @@ EXTRA_DSO_LDOPTS += \
 		-lstagefright \
 		$(NULL)
 
-INCLUDES        += \
-                -I$(srcdir)/../include/gb \
-                -I$(srcdir)/../include/gb/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/hc/moz.build b/media/omx-plugin/hc/moz.build
index c856e0c66e30..16d7b373f435 100644
--- a/media/omx-plugin/hc/moz.build
+++ b/media/omx-plugin/hc/moz.build
@@ -11,3 +11,10 @@ SOURCES += [
 LIBRARY_NAME = 'omxpluginhc'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../../content/media/plugins',
+    '../include/gb',
+    '../include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
index c0705d8d7a0d..69b2c01a00f6 100644
--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/froyo \
-                -I$(topsrcdir)/media/omx-plugin/include/froyo/media/stagefright/openmax \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
diff --git a/media/omx-plugin/lib/froyo/libstagefright/moz.build b/media/omx-plugin/lib/froyo/libstagefright/moz.build
index 29614f59d8df..9ea4c9e1fcdb 100644
--- a/media/omx-plugin/lib/froyo/libstagefright/moz.build
+++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/froyo',
+    '/media/omx-plugin/include/froyo/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/gb/libstagefright/Makefile.in b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
index a9197989075b..69b2c01a00f6 100644
--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/gb \
-                -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
diff --git a/media/omx-plugin/lib/gb/libstagefright/moz.build b/media/omx-plugin/lib/gb/libstagefright/moz.build
index 29614f59d8df..35374f1b479f 100644
--- a/media/omx-plugin/lib/gb/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/gb',
+    '/media/omx-plugin/include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
index 6fb9271dbcea..071f8d724c2b 100644
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/gb \
-                -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
-                $(NULL)
-
 # EXTRA_DSO_LDOPTS += \
 # 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 # 		-lutils \
diff --git a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
index 8cd6f238239f..b8ff7785dbc5 100644
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright_color_conversion'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/gb',
+    '/media/omx-plugin/include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/gb/libutils/Makefile.in b/media/omx-plugin/lib/gb/libutils/Makefile.in
index 63f28efe7887..9ae2db978413 100644
--- a/media/omx-plugin/lib/gb/libutils/Makefile.in
+++ b/media/omx-plugin/lib/gb/libutils/Makefile.in
@@ -18,9 +18,3 @@ STL_FLAGS =
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/gb \
-                -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/lib/gb/libutils/moz.build b/media/omx-plugin/lib/gb/libutils/moz.build
index a992d9f7c915..6fc8df848fa7 100644
--- a/media/omx-plugin/lib/gb/libutils/moz.build
+++ b/media/omx-plugin/lib/gb/libutils/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'utils'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/gb',
+    '/media/omx-plugin/include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
index a9197989075b..69b2c01a00f6 100644
--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/gb \
-                -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
diff --git a/media/omx-plugin/lib/gb235/libstagefright/moz.build b/media/omx-plugin/lib/gb235/libstagefright/moz.build
index 29614f59d8df..35374f1b479f 100644
--- a/media/omx-plugin/lib/gb235/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/gb',
+    '/media/omx-plugin/include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/hc/libstagefright/Makefile.in b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
index a9197989075b..69b2c01a00f6 100644
--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/gb \
-                -I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/gb/libutils \
 		-lutils \
diff --git a/media/omx-plugin/lib/hc/libstagefright/moz.build b/media/omx-plugin/lib/hc/libstagefright/moz.build
index 29614f59d8df..35374f1b479f 100644
--- a/media/omx-plugin/lib/hc/libstagefright/moz.build
+++ b/media/omx-plugin/lib/hc/libstagefright/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/gb',
+    '/media/omx-plugin/include/gb/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/ics/libstagefright/Makefile.in b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
index 88cbb59c1512..d00f15a5e3bf 100644
--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -20,11 +20,6 @@ USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/ics \
-                -I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
-                $(NULL)
-
 EXTRA_DSO_LDOPTS += \
 		-L$(DEPTH)/media/omx-plugin/lib/ics/libutils \
 		-lutils \
diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build
index 29614f59d8df..e629f4c66cb1 100644
--- a/media/omx-plugin/lib/ics/libstagefright/moz.build
+++ b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'stagefright'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/ics',
+    '/media/omx-plugin/include/ics/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/lib/ics/libutils/Makefile.in b/media/omx-plugin/lib/ics/libutils/Makefile.in
index 9101b7f79e6d..9ae2db978413 100644
--- a/media/omx-plugin/lib/ics/libutils/Makefile.in
+++ b/media/omx-plugin/lib/ics/libutils/Makefile.in
@@ -18,9 +18,3 @@ STL_FLAGS =
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES        += \
-                -I$(topsrcdir)/media/omx-plugin/include/ics \
-                -I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
-                $(NULL)
diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build
index a992d9f7c915..2fa0558fceda 100644
--- a/media/omx-plugin/lib/ics/libutils/moz.build
+++ b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -13,3 +13,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
 LIBRARY_NAME = 'utils'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '/media/omx-plugin/include/ics',
+    '/media/omx-plugin/include/ics/media/stagefright/openmax',
+]
+
diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build
index 7b85618dd523..9763d9730fa9 100644
--- a/media/omx-plugin/moz.build
+++ b/media/omx-plugin/moz.build
@@ -21,3 +21,15 @@ SOURCES += [
 LIBRARY_NAME = 'omxplugin'
 
 FORCE_SHARED_LIB = True
+
+LOCAL_INCLUDES += [
+    '../../content/media/plugins',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    pass
+else:
+    LOCAL_INCLUDES += [
+        'include/ics',
+        'include/ics/media/stagefright/openmax',
+    ]
diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in
deleted file mode 100644
index c0dbed78851f..000000000000
--- a/other-licenses/skia-npapi/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/.
-
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/dom/plugins/base \
-  -I$(topsrcdir)/dom/plugins/base/android \
-  -I$(topsrcdir)/gfx/skia/include/core \
-  -I$(topsrcdir)/gfx/skia/include/config \
-  -I$(topsrcdir)/gfx/gl \
-  $(NULL)
diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build
index 1eed76ecfd4a..785e0b264992 100644
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -19,3 +19,12 @@ UNIFIED_SOURCES += [
 FINAL_LIBRARY = 'xul'
 
 DEFINES['SK_BUILD_FOR_ANDROID_NDK'] = True
+
+LOCAL_INCLUDES += [
+    '/dom/plugins/base',
+    '/dom/plugins/base/android',
+    '/gfx/gl',
+    '/gfx/skia/include/config',
+    '/gfx/skia/include/core',
+]
+
diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in
deleted file mode 100644
index 2ed823acf9d6..000000000000
--- a/parser/html/Makefile.in
+++ /dev/null
@@ -1,9 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
-		-I$(srcdir)/../../content/base/src \
-		$(NULL)
diff --git a/parser/html/moz.build b/parser/html/moz.build
index aee4666e2206..de0611947a3c 100644
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -88,3 +88,8 @@ MSVC_ENABLE_PGO = True
 FINAL_LIBRARY = 'gklayout'
 
 # DEFINES['ENABLE_VOID_MENUITEM'] = True
+
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+]
+
diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in
deleted file mode 100644
index 507ea2ebbfa0..000000000000
--- a/rdf/build/Makefile.in
+++ /dev/null
@@ -1,12 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../base/src \
-		-I$(srcdir)/../content/src \
-		-I$(srcdir)/../datasource/src \
-		$(NULL)
diff --git a/rdf/build/moz.build b/rdf/build/moz.build
index 050b3f8262e3..bc1d5d5c3b24 100644
--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -15,3 +15,9 @@ SOURCES += [
 LIBRARY_NAME = 'rdf'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../base/src',
+    '../content/src',
+    '../datasource/src',
+]
diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in
deleted file mode 100644
index 18018946910d..000000000000
--- a/rdf/datasource/src/Makefile.in
+++ /dev/null
@@ -1,10 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
-# a first-class XPCOM interface.
-INCLUDES	+= -I$(srcdir)/../../base/src
diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build
index aecf7f7d14fb..1b58dcc7897f 100644
--- a/rdf/datasource/src/moz.build
+++ b/rdf/datasource/src/moz.build
@@ -10,3 +10,10 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = 'rdf'
+
+# "This is a dependency on rdfutil.h: it'll go away once that becomes
+# a first-class XPCOM interface."
+LOCAL_INCLUDES += [
+    '../../base/src',
+]
+
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
index 07914f614de0..c84a3dc47f54 100644
--- a/storage/test/Makefile.in
+++ b/storage/test/Makefile.in
@@ -3,10 +3,6 @@
 # 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/.
 
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../src \
-  $(NULL)
-
 LIBS = \
 	$(LIBS_DIR) \
 	$(MOZ_COMPONENT_LIBS) \
diff --git a/storage/test/moz.build b/storage/test/moz.build
index bcef6e1a47c7..7a2e51a7c3c5 100644
--- a/storage/test/moz.build
+++ b/storage/test/moz.build
@@ -27,3 +27,8 @@ if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'):
     CPP_UNIT_TESTS += [
         'test_deadlock_detector.cpp',
     ]
+
+LOCAL_INCLUDES += [
+    '../src',
+]
+
diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in
deleted file mode 100644
index 5739ba9bb665..000000000000
--- a/toolkit/components/build/Makefile.in
+++ /dev/null
@@ -1,27 +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/.
-
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../alerts \
-  -I$(srcdir)/../downloads \
-  -I$(srcdir)/../feeds \
-  -I$(srcdir)/../find \
-  -I$(srcdir)/../intl \
-  -I$(srcdir)/../jsdownloads/src \
-  -I$(srcdir)/../protobuf \
-  -I$(srcdir)/../startup \
-  -I$(srcdir)/../statusfilter \
-  -I$(srcdir)/../typeaheadfind \
-  -I$(srcdir)/../url-classifier \
-  -I$(srcdir)/../../xre \
-  $(NULL)
-
-ifndef MOZ_DISABLE_PARENTAL_CONTROLS
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-LOCAL_INCLUDES += \
-  -I$(srcdir)/../parentalcontrols \
-  $(NULL)
-endif
-endif
diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build
index 5a4ca05af3b4..93621eecaaeb 100644
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -15,3 +15,23 @@ SOURCES += [
 LIBRARY_NAME = 'toolkitcomps'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../../xre',
+    '../alerts',
+    '../downloads',
+    '../feeds',
+    '../find',
+    '../intl',
+    '../jsdownloads/src',
+    '../protobuf',
+    '../startup',
+    '../statusfilter',
+    '../typeaheadfind',
+    '../url-classifier',
+]
+
+if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    LOCAL_INCLUDES += [
+        '../parentalcontrols',
+    ]
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
deleted file mode 100644
index 24c357684342..000000000000
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/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/.
-
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
-  $(NULL)
-
-ifeq ($(OS_TARGET),Android)
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
-endif
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
index 7fb163eb5c2c..a7e2bcb1bec5 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
@@ -16,3 +16,12 @@ FINAL_LIBRARY = 'xulapp_s'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DEFINES['ELFSIZE'] = 32
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter/google-breakpad/src',
+]
+
+if CONFIG['OS_TARGET'] == 'Android':
+    LOCAL_INCLUDES += [
+        '/toolkit/crashreporter/google-breakpad/src/common/android/include',
+    ]
diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in
index e22c3029ace9..43315ac75af1 100644
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@@ -10,11 +10,3 @@ OS_LIBS = \
 	-liberty \
 	$(NULL)
 
-HELPER_SCRIPTS	= jprofsig
-HELPER_SCRIPTS	:= $(addprefix $(srcdir)/, $(HELPER_SCRIPTS))
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES += \
-	-I$(srcdir)/stub \
-	$(NULL)
diff --git a/tools/jprof/moz.build b/tools/jprof/moz.build
index 678f19b334d6..9f6bfbe9bc2a 100644
--- a/tools/jprof/moz.build
+++ b/tools/jprof/moz.build
@@ -16,3 +16,8 @@ SOURCES += [
     'leaky.cpp',
     'strset.cpp',
 ]
+
+LOCAL_INCLUDES += [
+    'stub',
+]
+
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index c06f5109cece..3b1e3118c10f 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -19,11 +19,6 @@ ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 endif
 
-LOCAL_INCLUDES += \
-		-I$(srcdir)/../build \
-		-I$(topsrcdir)/xpcom/ds \
-		$(NULL)
-
 # We generate ErrorListCxxDefines.h from ErrorList.h using regex.  The -n option
 # suppresses printing the pattern space, and the p at the end prints it anyway,
 # so we don't print lines that don't match the pattern to start with.
diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build
index 7768bc96dae0..24b5d7e53f49 100644
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -153,5 +153,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'
 
+LOCAL_INCLUDES += [
+    '../build',
+    '/xpcom/ds',
+]
+
+
 if CONFIG['MOZ_OPTIMIZE']:
     DEFINES['MOZ_OPTIMIZE'] = True
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
index cf27052af67b..3bec2c73e952 100644
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -6,10 +6,6 @@
 
 DIST_INSTALL	= 1
 
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../build \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
index 8df436e38a42..2b3746a91e3c 100644
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -109,5 +109,9 @@ if CONFIG['_MSC_VER']:
 if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
 
+LOCAL_INCLUDES += [
+    '../build',
+]
+
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']
diff --git a/xpcom/glue/nomozalloc/Makefile.in b/xpcom/glue/nomozalloc/Makefile.in
index 84043501d378..353543f7bfb7 100644
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -6,10 +6,6 @@
 
 DIST_INSTALL	= 1
 
-LOCAL_INCLUDES	= \
-		-I$(srcdir)/../../build \
-		$(NULL)
-
 # Pretend we're statically linking the CRT, even though we might not be: this
 # avoids "msvcrp" and assembly dependencies from creeping into the directives
 # for this library on Windows.
diff --git a/xpcom/glue/nomozalloc/moz.build b/xpcom/glue/nomozalloc/moz.build
index 866a646ef352..7ca0c9b17300 100644
--- a/xpcom/glue/nomozalloc/moz.build
+++ b/xpcom/glue/nomozalloc/moz.build
@@ -30,3 +30,8 @@ if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
 
 DEFINES['MOZ_NO_MOZALLOC'] = True
+
+LOCAL_INCLUDES += [
+    '../../build',
+]
+
diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
index ae5265823e14..08dfaf04ad52 100644
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -6,10 +6,6 @@
 
 DIST_INSTALL	= 1
 
-LOCAL_INCLUDES	= \
-	-I$(srcdir)/../../build \
-	$(NULL)
-
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
 STL_FLAGS	=
 
diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build
index 1abeca452e01..b50e16bb8287 100644
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -37,3 +37,8 @@ DEFINES['XPCOM_GLUE'] = True
 
 if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
+
+LOCAL_INCLUDES += [
+    '../../build',
+]
+
diff --git a/xpcom/glue/standalone/staticruntime/Makefile.in b/xpcom/glue/standalone/staticruntime/Makefile.in
index 89edca4a68d2..d2c6607e3e58 100644
--- a/xpcom/glue/standalone/staticruntime/Makefile.in
+++ b/xpcom/glue/standalone/staticruntime/Makefile.in
@@ -5,10 +5,6 @@
 
 DIST_INSTALL	= 1
 
-LOCAL_INCLUDES	= \
-	-I$(srcdir)/../../../build \
-	$(NULL)
-
 # Statically link to the CRT on Windows
 USE_STATIC_LIBS = 1
 
diff --git a/xpcom/glue/standalone/staticruntime/moz.build b/xpcom/glue/standalone/staticruntime/moz.build
index b38f972ecdda..f5898b49a663 100644
--- a/xpcom/glue/standalone/staticruntime/moz.build
+++ b/xpcom/glue/standalone/staticruntime/moz.build
@@ -29,3 +29,8 @@ DEFINES['XPCOM_GLUE'] = True
 
 if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
+
+LOCAL_INCLUDES += [
+    '../../../build',
+]
+
diff --git a/xpcom/glue/staticruntime/Makefile.in b/xpcom/glue/staticruntime/Makefile.in
index d530e193b6fd..468cdde0f02d 100644
--- a/xpcom/glue/staticruntime/Makefile.in
+++ b/xpcom/glue/staticruntime/Makefile.in
@@ -6,10 +6,6 @@
 
 DIST_INSTALL	= 1
 
-LOCAL_INCLUDES	= \
-	-I$(srcdir)/../../build \
-	$(NULL)
-
 # Statically link to the CRT on Windows
 USE_STATIC_LIBS = 1
 
diff --git a/xpcom/glue/staticruntime/moz.build b/xpcom/glue/staticruntime/moz.build
index d691cf3c1b59..0f519d918f1c 100644
--- a/xpcom/glue/staticruntime/moz.build
+++ b/xpcom/glue/staticruntime/moz.build
@@ -27,3 +27,8 @@ if CONFIG['_MSC_VER']:
 
 if CONFIG['TARGET_XPCOM_ABI']:
     DEFINES['TARGET_XPCOM_ABI'] = '"%s"' % CONFIG['TARGET_XPCOM_ABI']
+
+LOCAL_INCLUDES += [
+    '../../build',
+]
+
diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
index bfd197a92cfc..e2587554bae1 100644
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -4,11 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZILLA_INTERNAL_API = 1
-
-LOCAL_INCLUDES = \
-		-I$(srcdir)/../unix \
-		-I$(srcdir)/../../../../xptinfo/src \
-		$(NULL)
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	+= -I$(srcdir)/../..
diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build
index 3f4561636e68..6a95b6852952 100644
--- a/xpcom/reflect/xptcall/src/md/os2/moz.build
+++ b/xpcom/reflect/xptcall/src/md/os2/moz.build
@@ -12,3 +12,10 @@ SOURCES += [
 FINAL_LIBRARY = 'xpcom_core'
 
 DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True
+
+LOCAL_INCLUDES += [
+    '../..',
+    '../../../../xptinfo/src',
+    '../unix',
+]
+
diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 8811d2d8c288..4b80a6142a1a 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -96,11 +96,6 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += \
-	-I$(srcdir)/../.. \
-	-I$(srcdir)/../../../../xptinfo/src \
-	$(NULL)
-
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring mips, $(OS_TEST)))
 xptcstubs_asm_mips.o: $(DIST)/include/xptcstubsdef.inc
diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
index a50b587a2087..d5c86b7539aa 100644
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -309,4 +309,9 @@ if CONFIG['OS_ARCH'] == 'Linux':
 
 FINAL_LIBRARY = 'xpcom_core'
 
+LOCAL_INCLUDES += [
+    '../..',
+    '../../../../xptinfo/src',
+]
+
 NO_PGO = True
diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
index 6180ad7af8b8..e2587554bae1 100644
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -4,9 +4,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZILLA_INTERNAL_API = 1
-
-LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	+= -I$(srcdir)/../..
diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build
index 141d4cd01bae..51041ce2f749 100644
--- a/xpcom/reflect/xptcall/src/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/src/md/win32/moz.build
@@ -36,6 +36,11 @@ else:
 
 FINAL_LIBRARY = 'xpcom_core'
 
+LOCAL_INCLUDES += [
+    '../..',
+    '../../../../xptinfo/src',
+]
+
 if CONFIG['TARGET_CPU'] != 'x86_64':
     if not CONFIG['GNU_CXX']:
         # FIXME: bug 413019
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 3192a9c00ef9..fd778b1020f0 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -9,10 +9,6 @@ MOZ_DEBUG_SYMBOLS = 1
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES	= \
-                -I$(srcdir)/../ds \
-		$(NULL)
-
 libs::
 	$(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res
 ifneq (,$(SIMPLE_PROGRAMS))
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index 5b872d4505b5..35362bb0097d 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -117,3 +117,8 @@ if not CONFIG['MOZILLA_INTERNAL_API']:
     CPP_UNIT_TESTS += [
         'TestStringAPI.cpp',
     ]
+
+LOCAL_INCLUDES += [
+    '../ds',
+]
+
diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in
deleted file mode 100644
index 9cc702de21b7..000000000000
--- a/xpfe/components/build/Makefile.in
+++ /dev/null
@@ -1,6 +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/.
-
-LOCAL_INCLUDES += -I$(srcdir)/../directory
diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build
index bf611c453b75..6a45c055ffef 100644
--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -11,3 +11,7 @@ SOURCES += [
 LIBRARY_NAME = 'appcomps'
 
 FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../directory',
+]