--- a/components/gnome/cogl/Makefile	Wed Nov 16 18:51:56 2016 -0800
+++ b/components/gnome/cogl/Makefile	Sat Nov 12 17:53:39 2016 -0800
@@ -50,6 +50,9 @@
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
+# Workaround build failures when /usr/include/GL points to Nvidia's headers
+COMPONENT_PREP_ACTION += $(SYMLINK) /usr/include/mesa $(@D)/GL ;
+
 CONFIGURE_OPTION += --disable-static
 # Required for other components.
 CONFIGURE_OPTIONS += --enable-glib

--- a/components/gnome/mutter/Makefile	Wed Nov 16 18:51:56 2016 -0800
+++ b/components/gnome/mutter/Makefile	Sat Nov 12 17:53:39 2016 -0800
@@ -45,6 +45,10 @@
 
 include $(WS_MAKE_RULES)/gnome-component.mk
 
+# Workaround build failures when /usr/include/GL points to Nvidia's headers
+COMPONENT_PREP_ACTION += $(SYMLINK) /usr/include/mesa $(@D)/GL ;
+CPPFLAGS += -I $(SOURCE_DIR)
+
 # Requires non-standard extensions.
 CFLAGS += -std=c99 -D__EXTENSIONS__