diff -acr a/glx/Makefile.am b/glx/Makefile.am
*** a/glx/Makefile.am	2008-12-11 17:08:29.000000000 -0600
--- b/glx/Makefile.am	2008-12-11 17:08:29.000000000 -0600
***************
*** 23,29 ****
  	-I$(top_srcdir)/hw/xfree86/common \
  	-I$(top_srcdir)/hw/xfree86/dri \
  	-I$(top_srcdir)/hw/xfree86/dri2 \
! 	-I$(top_srcdir)/mi
  
  glapi_sources =					\
  	indirect_dispatch.c			\
--- 23,29 ----
  	-I$(top_srcdir)/hw/xfree86/common \
  	-I$(top_srcdir)/hw/xfree86/dri \
  	-I$(top_srcdir)/hw/xfree86/dri2 \
! 	-I$(top_srcdir)/mi -I$(MESA_SOURCE)/include
  
  glapi_sources =					\
  	indirect_dispatch.c			\