diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
index 46c73287585..8566f5b6cb8 100644
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -27,14 +27,10 @@ include $(topsrcdir)/config/config.mk
 # lib.
 FORCE_STATIC_LIB = 1
 
-EXPORTS = \
-	$(NULL)
-
-
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += 	\
-		-I$(srcdir)/../../../base/src \
-		$(NULL)
+INCLUDES += \
+  -I$(srcdir)/../../../base/src \
+  $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in
index b39a0566ac0..fcc6a384c76 100644
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -141,10 +141,10 @@ DEFINES	+= -DMOZ_ENABLE_D3D10_LAYER
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-EXPORTS_mozilla/layers += GLManager.h
-CPPSRCS += ShadowLayerUtilsMac.cpp \
-           GLManager.cpp \
-           $(NULL)
+CPPSRCS += \
+  ShadowLayerUtilsMac.cpp \
+  GLManager.cpp \
+  $(NULL)
 endif
 
 # NB: Gralloc is available on other platforms that use the android GL
diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build
index 1e3bb8c6d0e..b6a52ad82ff 100644
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -104,6 +104,11 @@ if CONFIG['MOZ_X11']:
         'ShadowLayerUtilsX11.h'
     ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXPORTS.mozilla.layers += [
+        'GLManager.h'
+    ]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXPORTS.mozilla.layers += [
         'ShadowLayerUtilsGralloc.h'