diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 434800e4560..8f41174bb1f 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -15,13 +15,13 @@ env.MSVC2013Compat()
 env.Append(CPPPATH = [
     '../compiler/nir',  # for generated nir_opcodes.h, etc
     '#/src',
+    Dir('../mapi'), # src/mapi build path
     '#/src/mapi',
     '#/src/glsl',
+    Dir('.'), # src/mesa build path
     '#/src/mesa',
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
-    Dir('../mapi'), # src/mapi build path
-    Dir('.'), # src/mesa build path
 ])
 
 if env['platform'] == 'windows':
@@ -116,7 +116,7 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
         )
         # Add the dir containing the generated header (somewhere inside  the
         # build dir) to the include path
-        env.Append(CPPPATH = [matypes[0].dir])
+        env.Prepend(CPPPATH = [matypes[0].dir])
 
 
 def write_git_sha1_h_file(filename):