Remove src/mesa and src/mesa/main from gallium source include paths.
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a828133..db18c61 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -4,6 +4,13 @@
 
 Import('*')
 
+env = env.Clone()
+
+# Includes
+env.Append(CPPPATH = [
+	'#/src/mesa',
+	'#/src/mesa/main',
+])
 
 #######################################################################
 # Core sources