diff --git a/Makefile b/Makefile
index b7aa397e1..584fe2a2e 100644
--- a/Makefile
+++ b/Makefile
@@ -108,4 +108,4 @@ distclean: clean
 	-rm -rf ./mapnik-packaging/osx/out/universal
 	-find ./mapnik-packaging/osx/out/packages -type d ! -name 'packages' -maxdepth 1 -exec rm -rf {} \;
 
-.PHONY: mbgl test linux
+.PHONY: mbgl test linux build/test/Makefile
diff --git a/mapboxgl.gyp b/mapboxgl.gyp
index aa40402ff..34908aec5 100644
--- a/mapboxgl.gyp
+++ b/mapboxgl.gyp
@@ -161,6 +161,11 @@
         'conditions': [
           ['OS == "mac"', {
             'xcode_settings': {
+              'OTHER_CPLUSPLUSFLAGS': [
+                '<@(uv_cflags)',
+                '<@(curl_cflags)',
+                '-I<(boost_root)/include',
+              ],
               'OTHER_LDFLAGS': [
                 '<@(png_libraries)',
                 '<@(uv_libraries)',
@@ -169,6 +174,11 @@
               ]
             }
           }, {
+            'cflags': [
+              '<@(uv_cflags)',
+              '<@(curl_cflags)',
+              '-I<(boost_root)/include',
+            ],
             'libraries': [
               '<@(png_libraries)',
               '<@(uv_libraries)',