diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
index 220f27d7e7d..3ad767d2125 100644
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -9,11 +9,6 @@ VPATH += $(srcdir)/src/compiler/preprocessor
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
-LOCAL_INCLUDES += \
-  -I$(srcdir)/include \
-  -I$(srcdir)/include/KHR \
-  -I$(srcdir)/src
-
 VPATH += $(srcdir)/src/compiler
 VPATH += $(srcdir)/src/compiler/depgraph
 VPATH += $(srcdir)/src/compiler/timing
diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
index d88b96a296d..74517727cba 100644
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -32,7 +32,6 @@ UNIFIED_SOURCES += ['src/compiler/preprocessor/' + src for src in [
     'Tokenizer.cpp',
 ]]
 
-
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
@@ -103,7 +102,6 @@ else:
         'src/compiler/ossource_posix.cpp',
     ]
 
-
 # Target: 'translator_glsl'
 #   Requires: 'translator_common'
 # src/compiler:
@@ -119,6 +117,12 @@ UNIFIED_SOURCES += ['src/compiler/' + src for src in [
 ]]
 MSVC_ENABLE_PGO = True
 
+LOCAL_INCLUDES += [
+    'include',
+    'include/KHR',
+    'src',
+]
+
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
index 6890bca08c4..2c91d5979e0 100644
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -19,13 +19,6 @@ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS)
 # Below is a transcription of the EGL target from build_angle.gypi.
 # Target: 'libEGL'
 #   Links with: 'libGLESv2'
-LOCAL_INCLUDES = \
-  -I$(srcdir)/../../include \
-  -I$(srcdir)/../../include/KHR \
-  -I$(srcdir)/.. \
-  -I$(srcdir)/../libGLESv2 \
-  -I"$(MOZ_DIRECTX_SDK_PATH)/include"
-
 # src/common:
 VPATH += $(srcdir)/../common
 # src/libEGL:
@@ -35,6 +28,8 @@ RCFILE  = $(srcdir)/libEGL.rc
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include"
+
 #OS_LIBS += $(call EXPAND_LIBNAME,dwmapi)
 
 ifdef GNU_CC
diff --git a/gfx/angle/src/libEGL/moz.build b/gfx/angle/src/libEGL/moz.build
index f5a380fd2f8..9d26a3f54cf 100644
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -26,6 +26,14 @@ LIBRARY_NAME = 'libEGL'
 
 FORCE_SHARED_LIB = True
 
+LOCAL_INCLUDES += [
+    '..',
+    '../../include',
+    '../../include/KHR',
+    '../libGLESv2',
+]
+
+
 for var in ('LIBEGL_EXPORTS', 'ANGLE_BUILD', 'NOMINMAX',
             '_CRT_SECURE_NO_DEPRECATE', 'ANGLE_DISABLE_TRACE'):
     DEFINES[var] = True
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
index fc0e98e5e3c..feaf3d9d3e3 100644
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -25,12 +25,6 @@ VPATH += $(srcdir)/../compiler/preprocessor
 
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
-LOCAL_INCLUDES += \
-  -I$(srcdir)/../../include \
-  -I$(srcdir)/../../include/KHR \
-  -I$(srcdir)/.. \
-  -I"$(MOZ_DIRECTX_SDK_PATH)/include"
-
 VPATH += $(srcdir)/renderer
 VPATH += $(srcdir)/..
 VPATH += $(srcdir)/../compiler
@@ -50,6 +44,8 @@ RCFILE  = $(srcdir)/libGLESv2.rc
 
 include $(topsrcdir)/config/rules.mk
 
+CXXFLAGS += -I"$(MOZ_DIRECTX_SDK_PATH)/include"
+
 ifdef GNU_CC
 
 TextureSSE2.$(OBJ_SUFFIX): CXXFLAGS+=-msse2
diff --git a/gfx/angle/src/libGLESv2/moz.build b/gfx/angle/src/libGLESv2/moz.build
index 9b5014958c0..204b84bd66b 100644
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -20,7 +20,6 @@ SOURCES += ['../compiler/preprocessor/' + src for src in [
     'Tokenizer.cpp',
 ]]
 
-
 # Target: 'translator_common'
 #   Requires: 'preprocessor'
 # src/compiler:
@@ -88,7 +87,6 @@ else:
         '../compiler/ossource_posix.cpp',
     ]
 
-
 # Target: 'translator_hlsl'
 #   Requires: 'translator_common'
 # src/compiler:
@@ -102,7 +100,6 @@ SOURCES += ['../compiler/' + src for src in [
     'UnfoldShortCircuit.cpp',
 ]]
 
-
 # Target: 'libGLESv2'
 #   Requires: 'translator_hlsl'
 # src/common:
@@ -180,6 +177,13 @@ LIBRARY_NAME = 'libGLESv2'
 
 FORCE_SHARED_LIB = True
 
+LOCAL_INCLUDES += [
+    '..',
+    '../../include',
+    '../../include/KHR',
+]
+
+
 for var in ('LIBGLESV2_EXPORTS', 'ANGLE_BUILD', 'NOMINMAX',
             '_CRT_SECURE_NO_DEPRECATE', 'ANGLE_DISABLE_TRACE',
             'COMPILER_IMPLEMENTATION'):
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 0e6f456e45a..988951be5bb 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -21,8 +21,6 @@ ifdef MOZ_ENABLE_CAIRO_FT
 OS_INCLUDES += $(CAIRO_FT_CFLAGS)
 endif
 
-LOCAL_INCLUDES  += -I$(srcdir)
-
 INSTALL_TARGETS += cairo_features
 cairo_features_FILES := cairo-features.h
 cairo_features_DEST = $(DIST)/include/cairo
diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index 9af8995da28..94791343405 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -93,8 +93,6 @@ DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfpu=neon
 endif
 
-LOCAL_INCLUDES	+= -I$(srcdir) -I$(srcdir)/../../cairo/src
-
 include $(topsrcdir)/config/rules.mk
 
 # Disable spammy "missing initializer" GCC warning
diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build
index 6d54fc30535..503b3405dcf 100644
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -61,6 +61,10 @@ SOURCES += [
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
+LOCAL_INCLUDES += [
+    '../../cairo/src',
+]
+
 
 if CONFIG['MOZ_USE_PTHREADS']:
     DEFINES['HAVE_PTHREAD_SETSPECIFIC'] = True
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index 56409c55c0e..7d30e669be7 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -2,13 +2,12 @@
 # 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/.
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-LOCAL_INCLUDES = -I$(topsrcdir)/widget/gonk
-LOCAL_INCLUDES += -I$(ANDROID_SOURCE)/hardware/libhardware/include
-endif
-
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
+CXXFLAGS += -I$(ANDROID_SOURCE)/hardware/libhardware/include
+endif
+
 DEFINES := $(filter-out -DUNICODE,$(DEFINES))
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index e73d94c74ed..047edf24d9d 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -72,6 +72,7 @@ if CONFIG['MOZ_ENABLE_SKIA_GPU']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     UNIFIED_SOURCES += ['SharedSurfaceGralloc.cpp']
     EXPORTS += ['SharedSurfaceGralloc.h']
+    LOCAL_INCLUDES += ['/widget/gonk']
 
 if gl_provider == 'CGL':
     # This file includes Mac headers that are unfriendly to unified builds,
diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in
index 8d483293a90..b28584491f4 100644
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -24,9 +24,6 @@
 # Mozilla author(s): Jonathan Kew
 #
 
-LOCAL_INCLUDES  += -I$(srcdir) 
-
-
 include $(topsrcdir)/config/rules.mk
 
 # Cancel the effect of the -DDEBUG macro if present,
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index 7064c57b262..1a420580eaf 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -17,8 +17,7 @@ VPATH       = \
 
 include $(topsrcdir)/config/rules.mk
 
-LOCAL_INCLUDES += \
-        -I$(topsrcdir)/content/events/src \
+CXXFLAGS += \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright \
         -I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
         -I$(ANDROID_SOURCE)/frameworks/av/include/media/stagefright \
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 527bbf0489c..604bfa3bff7 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -294,6 +294,10 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'
 
+LOCAL_INCLUDES += [
+    '/content/events/src',
+]
+
 if CONFIG['MOZ_DEBUG']:
     DEFINES['D3D_DEBUG_INFO'] = True
 
diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in
index ebd09eb0e48..c14f1b8c356 100644
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -3,30 +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)/include/core \
-	-I$(srcdir)/include/config \
-	-I$(srcdir)/include/gpu \
-	-I$(srcdir)/include/pipe \
-	-I$(srcdir)/include/ports \
-	-I$(srcdir)/include/images \
-	-I$(srcdir)/include/lazy \
-	-I$(srcdir)/include/utils \
-	-I$(srcdir)/include/utils/mac \
-	-I$(srcdir)/include/utils/win \
-	-I$(srcdir)/include/views \
-	-I$(srcdir)/include/effects \
-	-I$(srcdir)/src/core \
-	-I$(srcdir)/src/image \
-	-I$(srcdir)/src/gpu \
-	-I$(srcdir)/src/gpu/effects \
-	-I$(srcdir)/src/gpu/gl \
-	-I$(srcdir)/src/lazy \
-	-I$(srcdir)/src/utils \
-	-I$(srcdir)/src/utils/android \
-	-I$(srcdir)/src/sfnt \
-	$(NULL)
-
 VPATH += \
 	$(srcdir)/src/core \
 	$(srcdir)/src/gpu \
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 815473271f5..d2c995dca16 100644
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -590,6 +590,30 @@ if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
+LOCAL_INCLUDES += [
+    'include/config',
+    'include/core',
+    'include/effects',
+    'include/gpu',
+    'include/images',
+    'include/lazy',
+    'include/pipe',
+    'include/ports',
+    'include/utils',
+    'include/utils/mac',
+    'include/utils/win',
+    'include/views',
+    'src/core',
+    'src/gpu',
+    'src/gpu/effects',
+    'src/gpu/gl',
+    'src/image',
+    'src/lazy',
+    'src/sfnt',
+    'src/utils',
+    'src/utils/android',
+]
+
 
 DEFINES['SK_A32_SHIFT'] = 24
 DEFINES['SK_R32_SHIFT'] = 16
diff --git a/gfx/tests/gtest/Makefile.in b/gfx/tests/gtest/Makefile.in
index 7244ab613af..d8e92514483 100644
--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -7,10 +7,4 @@ VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) 
 
 # Create a GTest library
-LOCAL_INCLUDES = \
-  -I$(topsrcdir)/gfx/layers \
-  -I$(topsrcdir)/gfx/2d \
-  -I$(topsrcdir)/gfx/2d/unittest \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build
index 8f20068ebe1..838b41db7ef 100644
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -42,3 +42,9 @@ EXPORT_LIBRARY = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+LOCAL_INCLUDES += [
+    '/gfx/2d',
+    '/gfx/2d/unittest',
+    '/gfx/layers',
+]
+
diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in
index 85d20c24d94..0b63545b3b3 100644
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -2,10 +2,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$(topsrcdir)/content/xml/document/src \
-	$(NULL)
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ACDEFINES +=	-UWIN32_LEAN_AND_MEAN
 endif
diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
index 010d23640e7..066ecbde196 100644
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -300,6 +300,10 @@ GENERATED_FILES = [
     'PremultiplyTables.h',
 ]
 
+LOCAL_INCLUDES += [
+    '/content/xml/document/src',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'qt'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True