diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index d5fc98b85e..e79e2b9e41 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libX.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 498f6f8758..7bc75e8082 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libac.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index a81ebc7508..ce2a94717e 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmain.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 5a59ddd22f..d0589cdf4c 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libmath.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index a8b00144db..65d9faf514 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libshader.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 9633aaa4fa..e5075a34e1 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libswrast.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index 24960e10e3..e674223c17 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libss.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index cb4f1507e7..acebb46259 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libtnl.la
 
-INCLUDES = -I@mesadir@/include \
+INCLUDES = -I@MESA_SOURCE@/include \
            -I$(srcdir)/../X \
            -I$(srcdir)/../array_cache \
            -I$(srcdir)/../glapi \