Bug 937224 - Part e: Move LOCAL_INCLUDES to moz.build in layout/; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 28 Nov 2013 15:23:10 +0100
changeset 172629 6d2b1212727ef9dd96e8c2966ec81b2017789641
parent 172628 ea18e92d28d64961fc166a44eb9d51fcc216d081
child 172630 ed472e7df8d08b50266505b7e6ea159447b19bc5
push id3224
push userlsblakk@mozilla.com
push dateTue, 04 Feb 2014 01:06:49 +0000
treeherdermozilla-beta@60c04d0987f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs937224
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 937224 - Part e: Move LOCAL_INCLUDES to moz.build in layout/; r=mshal
layout/base/Makefile.in
layout/base/moz.build
layout/build/Makefile.in
layout/build/moz.build
layout/forms/Makefile.in
layout/forms/moz.build
layout/generic/Makefile.in
layout/generic/moz.build
layout/inspector/src/Makefile.in
layout/inspector/src/moz.build
layout/ipc/Makefile.in
layout/ipc/moz.build
layout/mathml/Makefile.in
layout/mathml/moz.build
layout/printing/Makefile.in
layout/printing/moz.build
layout/style/Makefile.in
layout/style/moz.build
layout/svg/Makefile.in
layout/svg/moz.build
layout/tables/Makefile.in
layout/tables/moz.build
layout/xul/base/src/Makefile.in
layout/xul/base/src/moz.build
layout/xul/grid/Makefile.in
layout/xul/grid/moz.build
layout/xul/tree/Makefile.in
layout/xul/tree/moz.build
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -1,29 +1,8 @@
 #
 # 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) \
-		-I$(srcdir)/../style \
-		-I$(srcdir)/../generic \
-		-I$(srcdir)/../forms \
-		-I$(srcdir)/../tables \
-		-I$(srcdir)/../printing \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../xul/tree/ \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../content/events/src \
-		-I$(srcdir)/../../content/xbl/src \
-		-I$(srcdir)/../../view/src \
-		-I$(srcdir)/../../dom/base \
-		-I$(srcdir)/../../content/html/content/src \
-		-I$(srcdir)/../../content/svg/content/src \
-		-I$(topsrcdir)/xpcom/ds \
-		-I$(srcdir)/../svg \
-		-I$(srcdir)/../mathml \
-		$(NULL)
-
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -109,11 +109,29 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/events/src',
+    '../../content/html/content/src',
+    '../../content/svg/content/src',
+    '../../content/xbl/src',
+    '../../dom/base',
+    '../../view/src',
+    '../forms',
+    '../generic',
+    '../mathml',
+    '../printing',
+    '../style',
+    '../svg',
+    '../tables',
+    '../xul/base/src',
+    '../xul/tree/',
     '/docshell/base',
+    '/xpcom/ds',
 ]
+
 FINAL_LIBRARY = 'gklayout'
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -3,117 +3,25 @@
 # 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/.
 
 # Solaris sh blows
 ifeq ($(OS_ARCH),SunOS)
 SHELL := ksh
 endif
 
-ifneq (,$(filter qt gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES	+= \
-	-I$(topsrcdir)/dom/system/unix \
-	$(NULL)
-else ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES	+= \
-	-I$(topsrcdir)/dom/system/windows \
-	$(NULL)
-else ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES	+= \
-	-I$(topsrcdir)/dom/system/mac \
-	$(NULL)
-else ifneq (,$(filter android,$(MOZ_WIDGET_TOOLKIT)))
-LOCAL_INCLUDES	+= \
-	-I$(topsrcdir)/dom/system/android \
-	-I$(topsrcdir)/dom/system \
-	$(NULL)
+include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_GSTREAMER
+CXXFLAGS += $(GSTREAMER_CFLAGS)
 endif
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-INCLUDES	+= \
-		-I$(srcdir)/../../base/src \
-		-I$(srcdir)/../../html/content/src \
-		-I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
-		-I$(ANDROID_SOURCE)/frameworks/base/include/ \
-		-I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
-		-I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
-		-I$(ANDROID_SOURCE)/frameworks/base/include/media/ \
-		-I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
-		-I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/include \
-		$(NULL)
+CXXFLAGS += \
+  -I$(ANDROID_SOURCE)/dalvik/libnativehelper/include/nativehelper \
+  -I$(ANDROID_SOURCE)/frameworks/base/include/ \
+  -I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
+  -I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
+  -I$(ANDROID_SOURCE)/frameworks/base/include/media/ \
+  -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
+  -I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/include \
+  $(NULL)
 endif
-
-LOCAL_INCLUDES  += \
-      -I$(srcdir)/../inspector/src \
-      $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	+= -I$(srcdir)/../base \
-		   -I$(srcdir)/../generic \
-		   -I$(srcdir)/../forms \
-		   -I$(srcdir)/../tables \
-		   -I$(srcdir)/../style \
-		   -I$(srcdir)/../xul/base/src \
-		   -I$(srcdir)/../mathml \
-		   -I$(topsrcdir)/content/base/src \
-		   -I$(topsrcdir)/content/canvas/src \
-		   -I$(topsrcdir)/content/html/content/src \
-		   -I$(topsrcdir)/content/html/document/src \
-		   -I$(topsrcdir)/content/xslt/src/base \
-		   -I$(topsrcdir)/content/xslt/src/xml \
-		   -I$(topsrcdir)/content/xslt/src/xpath \
-		   -I$(topsrcdir)/content/xslt/src/xslt \
-		   -I$(topsrcdir)/content/xul/content/src \
-		   -I$(topsrcdir)/content/xul/document/src \
-		   -I$(topsrcdir)/content/xul/templates/src \
-		   -I$(topsrcdir)/content/events/src \
-		   -I$(topsrcdir)/content/xbl/src \
-		   -I$(topsrcdir)/view/src \
-		   -I$(topsrcdir)/dom/base \
-		   -I$(topsrcdir)/dom/file \
-		   -I$(topsrcdir)/dom/src/json \
-		   -I$(topsrcdir)/dom/src/jsurl \
-		   -I$(topsrcdir)/dom/src/storage \
-		   -I$(topsrcdir)/dom/src/offline \
-		   -I$(topsrcdir)/dom/src/geolocation \
-		   -I$(topsrcdir)/dom/audiochannel \
-		   -I$(topsrcdir)/dom/telephony \
-		   -I$(topsrcdir)/dom/media \
-		   -I$(topsrcdir)/dom/speakermanager \
-		   -I. \
-		   -I$(topsrcdir)/editor/libeditor/base \
-		   -I$(topsrcdir)/editor/libeditor/text \
-		   -I$(topsrcdir)/editor/libeditor/html \
-		   -I$(topsrcdir)/editor/txmgr/src \
-		   -I$(topsrcdir)/editor/txtsvc/src \
-		   -I$(topsrcdir)/editor/composer/src \
-		   -I$(topsrcdir)/js/xpconnect/src \
-		   -I$(topsrcdir)/js/xpconnect/loader \
-		   -I$(topsrcdir)/caps/include \
-		   -I$(topsrcdir)/netwerk/base/src \
-		   -I$(topsrcdir)/content/svg/content/src \
-		   -I$(topsrcdir)/extensions/cookie \
-		   -I$(topsrcdir)/netwerk/cookie \
-		   $(NULL)
-
-ifdef MOZ_GSTREAMER
-LOCAL_INCLUDES	+= $(GSTREAMER_CFLAGS)
-endif
-
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/system/gonk
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/speakermanager
-endif #}
-
-ifdef MOZ_B2G_FM #{
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/fmradio
-endif #}
-
-ifdef MOZ_B2G_BT #{
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/bluetooth
-endif #}
-
-ifdef MOZ_WEBSPEECH #{
-LOCAL_INCLUDES	+= -I$(topsrcdir)/content/media/webspeech/synth
-endif #}
-
-LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/camera
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -25,11 +25,96 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
+    '../base',
+    '../forms',
+    '../generic',
+    '../inspector/src',
+    '../mathml',
+    '../style',
+    '../tables',
+    '../xul/base/src',
+    '/caps/include',
+    '/content/base/src',
+    '/content/canvas/src',
+    '/content/events/src',
+    '/content/html/content/src',
+    '/content/html/document/src',
+    '/content/svg/content/src',
+    '/content/xbl/src',
+    '/content/xslt/src/base',
+    '/content/xslt/src/xml',
+    '/content/xslt/src/xpath',
+    '/content/xslt/src/xslt',
+    '/content/xul/content/src',
+    '/content/xul/document/src',
+    '/content/xul/templates/src',
     '/docshell/base',
+    '/dom/audiochannel',
+    '/dom/base',
+    '/dom/camera',
+    '/dom/file',
+    '/dom/media',
+    '/dom/speakermanager',
+    '/dom/src/geolocation',
+    '/dom/src/json',
+    '/dom/src/jsurl',
+    '/dom/src/offline',
+    '/dom/src/storage',
+    '/dom/telephony',
+    '/editor/composer/src',
+    '/editor/libeditor/base',
+    '/editor/libeditor/html',
+    '/editor/libeditor/text',
+    '/editor/txmgr/src',
+    '/editor/txtsvc/src',
+    '/extensions/cookie',
+    '/js/xpconnect/loader',
+    '/js/xpconnect/src',
+    '/netwerk/base/src',
+    '/netwerk/cookie',
+    '/view/src',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
+    LOCAL_INCLUDES += [
+        '/dom/system/unix',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    LOCAL_INCLUDES += [
+        '/dom/system/windows',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    LOCAL_INCLUDES += [
+        '/dom/system/mac',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    LOCAL_INCLUDES += [
+        '/dom/system',
+        '/dom/system/android',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    LOCAL_INCLUDES += [
+        '/dom/system/gonk',
+    ]
+
+if CONFIG['MOZ_B2G_FM']:
+    LOCAL_INCLUDES += [
+        '/dom/fmradio',
+    ]
+
+if CONFIG['MOZ_B2G_BT']:
+    LOCAL_INCLUDES += [
+        '/dom/bluetooth',
+    ]
+
+if CONFIG['MOZ_WEBSPEECH']:
+    LOCAL_INCLUDES += [
+        '/content/media/webspeech/synth',
+    ]
+
 FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/layout/forms/Makefile.in
+++ /dev/null
@@ -1,17 +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 \
-		-I$(srcdir)/../generic \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../content/html/content/src \
-		-I$(srcdir)/../../editor/libeditor/base \
-		-I$(srcdir)/../../editor/libeditor/text \
-		-I$(srcdir)/../../editor/txmgr/src \
-		$(NULL)
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -36,8 +36,19 @@ UNIFIED_SOURCES += [
     'nsTextControlFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
+
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/html/content/src',
+    '../../editor/libeditor/base',
+    '../../editor/libeditor/text',
+    '../../editor/txmgr/src',
+    '../base',
+    '../generic',
+    '../xul/base/src',
+]
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -3,29 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += \
-		-I$(srcdir) \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../forms \
-		-I$(srcdir)/../style \
-		-I$(srcdir)/../tables \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../../content/xul/content/src \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../content/html/content/src \
-		-I$(srcdir)/../../dom/base \
-		-I$(srcdir)/../../dom/plugins/base \
-		-I$(srcdir)/../svg \
+CXXFLAGS += \
 		$(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) \
 		$(NULL)
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS += $(TK_CFLAGS)
 endif
 
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -101,8 +101,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
+
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/html/content/src',
+    '../../content/xul/content/src',
+    '../../dom/base',
+    '../../dom/plugins/base',
+    '../base',
+    '../forms',
+    '../style',
+    '../svg',
+    '../tables',
+    '../xul/base/src',
+]
deleted file mode 100644
--- a/layout/inspector/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/.
-
-LOCAL_INCLUDES	+= \
-		-I$(srcdir)/../../style \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/content/xbl/src \
-		$(NULL)
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -23,8 +23,14 @@ UNIFIED_SOURCES += [
 if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'inDOMView.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../style',
+    '/content/base/src',
+    '/content/xbl/src',
+]
+
deleted file mode 100644
--- a/layout/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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += \
-		-I$(topsrcdir)/content/base/src \
-		-I$(topsrcdir)/layout/base \
-		-I$(topsrcdir)/layout/generic \
-		-I$(topsrcdir)/layout/xul/base/src \
-		$(NULL)
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -19,8 +19,15 @@ IPDL_SOURCES = [
     'PRenderFrame.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
+
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/layout/base',
+    '/layout/generic',
+    '/layout/xul/base/src',
+]
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -1,24 +1,14 @@
 #!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/.
 
-LOCAL_INCLUDES = \
-	-I$(srcdir)/../style \
-	-I$(srcdir)/../base \
-	-I$(srcdir)/../generic \
-	-I$(srcdir)/../tables \
-	-I$(topsrcdir)/content/base/src \
-	-I$(topsrcdir)/content/mathml/content/src \
-	-I$(srcdir)/../xul/base/src \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 font_properties = \
 	mathfontMathJax_Main.properties \
 	mathfontUnicode.properties \
 	mathfontSTIXNonUnicode.properties \
 	mathfontSTIXSize1.properties \
 	mathfontSTIXSizeOneSym.properties \
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -27,8 +27,18 @@ UNIFIED_SOURCES += [
     'nsMathMLSelectedFrame.cpp',
     'nsMathMLsemanticsFrame.cpp',
     'nsMathMLTokenFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../base',
+    '../generic',
+    '../style',
+    '../tables',
+    '../xul/base/src',
+    '/content/base/src',
+    '/content/mathml/content/src',
+]
+
deleted file mode 100644
--- a/layout/printing/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
-
-LOCAL_INCLUDES += \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../../content/base/src \
-		$(NULL)
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -22,8 +22,13 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../base',
+]
+
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -9,27 +9,16 @@ endif
 
 INSTALL_TARGETS += structlist
 structlist_FILES := nsStyleStructList.h
 structlist_DEST = $(DIST)/include
 structlist_TARGET := export
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES	+= \
-		-I$(srcdir)/../base \
-		-I$(topsrcdir)/dom/base \
-		-I$(srcdir)/../generic \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../content/html/content/src \
-		-I$(srcdir)/../../content/xbl/src \
-		-I$(srcdir)/../../content/xul/document/src \
-		$(NULL)
-
 nsStyleStructList.h : $(srcdir)/generate-stylestructlist.py
 	$(PYTHON) $< > $@
 
 _FILES	= \
 	contenteditable.css \
 	designmode.css \
 	ImageDocument.css \
 	TopLevelImageDocument.css \
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -128,8 +128,19 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
+
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/html/content/src',
+    '../../content/xbl/src',
+    '../../content/xul/document/src',
+    '../base',
+    '../generic',
+    '../xul/base/src',
+    '/dom/base',
+]
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -1,19 +1,9 @@
 #
 # 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 \
-		-I$(srcdir)/../generic \
-		-I$(srcdir)/../style \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../../content/svg/content/src \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../widget \
-		$(NULL)
-
 libs::
 	$(INSTALL) $(srcdir)/svg.css $(DIST)/bin/res
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -44,8 +44,18 @@ UNIFIED_SOURCES += [
     'SVGFELeafFrame.cpp',
     'SVGFEUnstyledLeafFrame.cpp',
     'SVGViewFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/svg/content/src',
+    '../../widget',
+    '../base',
+    '../generic',
+    '../style',
+    '../xul/base/src',
+]
+
deleted file mode 100644
--- a/layout/tables/Makefile.in
+++ /dev/null
@@ -1,16 +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 \
-		-I$(srcdir)/../generic \
-		-I$(srcdir)/../style \
-		-I$(srcdir)/../xul/base/src \
-		-I$(srcdir)/../../content/html/content/src \
-		-I$(srcdir)/../../content/base/src \
-		-I$(srcdir)/../../intl/unicharutil/util \
-		$(NULL)
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -26,9 +26,19 @@ UNIFIED_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 
+LOCAL_INCLUDES += [
+    '../../content/base/src',
+    '../../content/html/content/src',
+    '../../intl/unicharutil/util',
+    '../base',
+    '../generic',
+    '../style',
+    '../xul/base/src',
+]
+
 DEFINES['DEBUG_TABLE_STRATEGY_off'] = True
deleted file mode 100644
--- a/layout/xul/base/src/Makefile.in
+++ /dev/null
@@ -1,14 +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) \
-		-I$(srcdir)/../../../base \
-		-I$(srcdir)/../../../../content/base/src \
-		-I$(srcdir)/../../../../content/events/src \
-		-I$(srcdir)/../../../generic \
-		-I$(srcdir)/../../../style \
-		$(NULL)
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -52,8 +52,16 @@ if CONFIG['MOZ_XUL']:
         'nsXULPopupManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../../../content/base/src',
+    '../../../../content/events/src',
+    '../../../base',
+    '../../../generic',
+    '../../../style',
+]
+
deleted file mode 100644
--- a/layout/xul/grid/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$(srcdir) \
-		-I$(srcdir)/../base/src \
-		-I$(srcdir)/../../generic \
-		-I$(srcdir)/../../style \
-		-I$(srcdir)/../../forms \
-		$(NULL)
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -26,8 +26,15 @@ UNIFIED_SOURCES += [
     'nsGridRowLayout.cpp',
     'nsGridRowLeafFrame.cpp',
     'nsGridRowLeafLayout.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../forms',
+    '../../generic',
+    '../../style',
+    '../base/src',
+]
+
deleted file mode 100644
--- a/layout/xul/tree/Makefile.in
+++ /dev/null
@@ -1,15 +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) \
-		-I$(topsrcdir)/content/events/src \
-		-I$(topsrcdir)/content/base/src \
-		-I$(srcdir)/../base/src \
-		-I$(srcdir)/../../base \
-		-I$(srcdir)/../../generic \
-		-I$(srcdir)/../../style \
-		-I$(srcdir)/../../forms \
-		$(NULL)
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -29,8 +29,18 @@ UNIFIED_SOURCES += [
     'nsTreeSelection.cpp',
     'nsTreeStyleCache.cpp',
     'nsTreeUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
+LOCAL_INCLUDES += [
+    '../../base',
+    '../../forms',
+    '../../generic',
+    '../../style',
+    '../base/src',
+    '/content/base/src',
+    '/content/events/src',
+]
+